Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/product.js

@@ -9,6 +9,15 @@ export function createProduct(data) {
   })
 }
 
+// 创建产品
+export function addProduct(data) {
+  return request({
+    url: '/ecw/product/add',
+    method: 'post',
+    data: data
+  })
+}
+
 // 更新产品
 export function updateProduct(data) {
   return request({

src/components/ProductSelector/index.vue

@@ -14,8 +14,12 @@
         <el-option
         v-for="(item, index) in list"
         :key="item.id"
-        :label="item['title' + lang] + (item.auditStatus === 2 ? '' : `(${$t('审核中')})`)"
+        :label="item['title' + lang] + (item.auditStatus === 2 ? '' : `(${lang === 'Zh' ? '待确定' : 'To be determined'})`)"
         :value="index">
+          <span style="float: left">{{ item['title' + lang] }}</span>
+          <span style="float: right; color: #c76e6e; font-size: 13px">
+            {{ item.auditStatus === 2 ? '' : (lang === 'Zh' ? '待确定' : 'To be determined') }}
+          </span>
         </el-option>
     </el-select>
 </template>

src/views/ecw/customer/edit.vue

@@ -17,6 +17,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('客户英文名称')">
+                <el-input v-model="form.nameEn" :placeholder="$t('请输入客户英文名称')"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('付款人姓名')">
+                <el-input v-model="form.payerName" :placeholder="$t('请输入付款人姓名')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('客户等级')" prop="level">
                 <el-select v-model="form.level" :placeholder="$t('请选择客户等级')" disabled>
@@ -70,7 +80,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-
               <el-form-item :label="$t('客户生日')" prop="birthday">
                 <el-date-picker
                   v-model="form.birthday"
@@ -80,6 +89,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('公司英文名称')">
+                <el-input v-model="form.companyEn" :placeholder="$t('请输入客户英文名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('主营类别')" prop="productType">
                 <el-row :gutter="10">
@@ -268,6 +282,16 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+              <el-table-column>
+                <template slot="header">
+                  {{$t('联系人英文名称')}}
+                </template>
+                <template v-slot="{row, cellValue, $index}">
+                  <el-form-item label="">
+                    <el-input v-model="row.nameEn" :placeholder="$t('请输入联系人英文名称')" size="mini"/>
+                  </el-form-item>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="areaCode"
                 :label="$t('区号')"
@@ -873,12 +897,15 @@ export default {
         id: undefined,
         number: undefined,
         name: undefined,
+        nameEn: undefined,
         level: 1,
         country: undefined,
         type: undefined,
         transportType:[],
         agentId: undefined,
         company: undefined,
+        companyEn: undefined,
+        payerName:undefined,
         address: undefined,
         productType: undefined,
         productId: undefined,
@@ -948,6 +975,7 @@ export default {
         "social": undefined,
         "socialNumber": "",
         "userid": undefined,
+         "nameEn":"",
         // "username": ""
       })
     },

src/views/ecw/customer/index.vue

@@ -105,7 +105,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
         <template slot-scope="{row}">
-          {{row.name}} <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
+          {{$l(row, 'name')}} <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
         </template>
       </el-table-column>
 

src/views/ecw/customer/indirectCustomer.vue

@@ -44,7 +44,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="scope">
         <router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
-          <span>{{ scope.row.name }}</span>
+          <span>{{ $l(scope.row,'name') }}</span>
         </router-link>
         </template>
       </el-table-column>

src/views/ecw/customer/query.vue

@@ -15,7 +15,7 @@
         <el-card style="margin-top: 15px;">
           <el-descriptions :column="4" border>
             <el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('客户名称')">{{ customer.name }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户名称')">{{ $l( customer, 'name') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
@@ -77,6 +77,9 @@
               prop="name"
               :label="$t('联系人')"
             >
+               <template v-slot="{row}">
+                 {{$l(row, 'name')}}
+               </template>
             </el-table-column>
             <el-table-column
               prop="phoneNew"
@@ -231,6 +234,11 @@
 <!--                    <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />-->
 <!--                  </template>-->
                 </el-table-column>
+                <el-table-column :label="$t('入仓时间')">
+                  <template v-slot="{row}">
+                    {{parseTime(row.rucangTime)}}
+                  </template>
+                </el-table-column>
                 </el-table>
               <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows"  :total="orderTotal" ></pagination>
             </el-card>

src/views/ecw/customerConfirm/index.vue

@@ -85,7 +85,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/customerToBeAssigned/index.vue

@@ -96,7 +96,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/myCustomerService/index.vue

@@ -85,7 +85,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/oceanCustomer/index.vue

@@ -90,7 +90,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/order/components/warehouseDetails.vue

@@ -130,6 +130,16 @@
     <div>
       {{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
     </div>
+    <p>{{$t('退仓图片')}}</p>
+    <div>
+      <el-image
+        v-for="(item, index) in (FeeDetails.details.imgUrl || '').split(',')"
+        :key = 'index'
+        style="width: 100px; height: 100px;margin:10px;"
+        :src="item"
+        :preview-src-list="(FeeDetails.details.imgUrl || '').split(',')">
+      </el-image>
+    </div>
   </div>
   <div v-if="type === 4">
     <p>{{ $t('申请理由') }}</p>

src/views/ecw/order/edit.vue

@@ -31,7 +31,7 @@
                     </div>
                 </el-form-item>
                  <!-- v1.7新增 -->
-                <el-form-item :label="$t('发货人英文名称')" prop="consignorContactsId" >
+                <el-form-item :label="$t('发货人英文名称')" prop="consignorNameEn" >
                     <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
                     <div class="contact">
                         <el-input v-model="form.consignorNameEn" placeholder="" :disabled2="inWarehouse"/>
@@ -62,7 +62,7 @@
                     </div>
                 </el-form-item>
                  <!-- v1.7新增 -->
-                <el-form-item :label="$t('收货人英文名称')" prop="consigneeContactsId">
+                <el-form-item :label="$t('收货人英文名称')" prop="consigneeNameEn">
                     <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
                     <div class="contact">
                         <el-input v-model="form.consigneeNameEn" placeholder="" :disabled2="inWarehouse"/>

src/views/ecw/order/prepayDeal.vue

@@ -334,7 +334,7 @@
             </el-form-item>
         </el-row>
         <!-- v1.7新增商品异常 -->
-        <div v-show="shopData&&orderExceptionData.orderExceptionType=='goods_add_exception'&&handlerParams.orderExceptionHandlerResult=='goods_exists'">
+        <div v-if="shopData&&orderExceptionData.orderExceptionType=='goods_add_exception'&&handlerParams.orderExceptionHandlerResult=='goods_exists'">
           <el-row :gutter="24">
             <el-col :span="6">
               <el-form-item :label="$t('新增品名中文')+':'" >
@@ -572,7 +572,7 @@
           if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&!this.handlerParams.productId){
             this.handlerParams.productId = this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId).prodId
           }
-
+          console.log(this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId))
           return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
         }
       }

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -451,7 +451,7 @@ import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
 import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
-import {createProduct} from "@/api/ecw/product"
+import {addProduct} from "@/api/ecw/product"
 
 export default {
   name: "Warehouse",
@@ -934,7 +934,7 @@ export default {
         //商品特性转字符串
         this.productForm.attrId = this.productForm.attrArray.join(',')
         // 添加的提交
-        createProduct(this.productForm).then(response => {
+        addProduct(this.productForm).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"))
           if (this.activeName === 'first') {
             this.form.prodId = response.data

src/views/ecw/order/withdrawal.vue

@@ -13,6 +13,9 @@
         <el-form-item :label="$t('退仓原因')">
           <el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('图片')">
+          <image-and-video-upload   :file-type="['png' , 'jpg', 'jpeg']" :fileSize="50" :isShowTip="true" v-model="params.imgUrl" ></image-and-video-upload>
+        </el-form-item>
       </el-form>
       <el-divider></el-divider>
       <h2>{{$t('审批流程')}}</h2>
@@ -37,6 +40,7 @@ import {
   warehouseApprovalCancel
 } from "@/api/ecw/batchSingleApplication";
 import workFlow from "@/components/WorkFlow";
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
 
 export default {
   name: "withdrawal",
@@ -45,6 +49,7 @@ export default {
     dialogVisible:Boolean
   },
   components:{
+    ImageAndVideoUpload,
     workFlow
   },
   data(){
@@ -55,6 +60,7 @@ export default {
         orderNo:undefined,
         reason:'',
         copyUserId:[],
+        imgUrl:[]
       },
       isExamine:true,
       details:{},
@@ -82,6 +88,7 @@ export default {
     submit(){
       this.params.orderId =  this.orderDetails.orderId;
       this.params.orderNo =this.orderDetails.orderNo;
+      this.params.imgUrl =  this.params.imgUrl.join(',')
       orderWarehouseInDelete(this.params).then(r => {
        if(r.code === 0){
          this.$message.success(this.$t('退仓成功'));