Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customerCommission/index.vue

@@ -4,8 +4,19 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="客户名称" prop="customerId" >
-        <el-input v-model="queryParams.customerId" placeholder="请选择客户id" clearable size="small">
-        </el-input>
+        <el-select
+          clearable
+          filterable
+          v-model="queryParams.customerId"
+          placeholder="请输入关键词">
+          <el-option
+            v-for="(item, index) in customeList"
+            :key="index"
+            :value="item.id"
+            :label="item.name"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="type">
         <el-input v-model="queryParams.defaultContactPhone" placeholder="请输入电话" clearable size="small">
@@ -128,6 +139,7 @@
 import {deleteCustomerCommission, getCustomerCommissionPage, exportCustomerCommissionExcel } from "@/api/ecw/customerCommission";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {getTradeCityList} from "@/api/ecw/region";
+import {customerDropDownList} from "@/api/ecw/customerCommissionInfo";
 
 export default {
   name: "CustomerCommission",
@@ -173,7 +185,8 @@ export default {
         customerId: [{ required: true, message: "客户id不能为空", trigger: "change" }],
         type: [{ required: true, message: "佣金类型不能为空", trigger: "change" }],
         darkReturnType: [{ required: true, message: "暗佣类型 1产品2达标不能为空", trigger: "change" }],
-      }
+      },
+      customeList:[],
     };
   },
   computed:{
@@ -187,8 +200,14 @@ export default {
     },
   },
   created() {
+    customerDropDownList().then(res => {
+      console.log(res);
+      if (res.code === 0) {
+        this.customeList = res.data
+      }
+    })
     if(this.$route.query.customerId){
-      this.queryParams.customerId = this.$route.query.customerId
+        this.queryParams.customerId = Number(this.$route.query.customerId)
     }
     this.getList();
     getTradeCityList().then(res => {

src/views/ecw/order/batchSingleApplication.vue

@@ -32,7 +32,9 @@
           </template>
         </el-table-column>
         <el-table-column label="入仓时间" prop="rucangTime">
-
+           <template v-slot="{row}">
+             {{parseTime(row.rucangTime)}}
+           </template>
         </el-table-column>
         <el-table-column label="运输方式">
           <template v-slot={row}>

src/views/ecw/order/mutexOrder.vue

@@ -68,8 +68,8 @@
           }}</template>
       </el-table-column>
       <el-table-column label="操作">
-        <template v-slot:default='scope'>
-          <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.orderId)">
+        <template v-slot='{row}'>
+          <el-button type="text"  @click ="guanlianOrderByOrderId(row)">
             移出
           </el-button>
         </template>
@@ -136,8 +136,8 @@ export default {
         }
       })
     },
-    guanlianOrderByOrderId(id){
-      deleteGuanlianOrderByOrderId({orderId:this.orderId,mutualOrderId:id}).then(r =>{
+    guanlianOrderByOrderId(row){
+      deleteGuanlianOrderByOrderId({orderId:this.orderId,mutualOrderId:row.mutualOrderId}).then(r =>{
         if(r.code === 0){
           this.getList()
           this.$message.success('操作成功');

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

@@ -390,12 +390,12 @@ export default {
         recordMode: undefined
       },
       tableFormRules: {
-        cartonsNum: [{required: true, message: "箱数不能为空", trigger: "blur"}],
-        boxGauge1: [{required: true, message: "货物长不能为空", trigger: "blur"}],
-        boxGauge2: [{required: true, message: "货物宽不能为空", trigger: "blur"}],
-        boxGauge3: [{required: true, message: "货物高不能为空", trigger: "blur"}],
-        volume: [{required: true, message: "体积不能为空", trigger: "blur"}],
-        weight: [{required: true, message: "重量不能为空", trigger: "blur"}],
+        cartonsNum: [{required: true, message: this.$t("箱数不能为空"), trigger: "blur"}],
+        boxGauge1: [{required: true, message: this.$t("货物长不能为空"), trigger: "blur"}],
+        boxGauge2: [{required: true, message: this.$t("货物宽不能为空"), trigger: "blur"}],
+        boxGauge3: [{required: true, message: this.$t("货物高不能为空"), trigger: "blur"}],
+        volume: [{required: true, message: this.$t("体积不能为空"), trigger: "blur"}],
+        weight: [{required: true, message: this.$t("重量不能为空"), trigger: "blur"}],
         quantityAll: [{required: true, message: "数量不能为空", trigger: "blur"}]
       },
       form1: {
@@ -533,7 +533,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,
-              cartonsNum: this.warehousing.num,
+              num: this.warehousing.num,
               volume: this.warehousing.volume.toFixed(2),
               weight: this.warehousing.weight.toFixed(2),
               prodId: this.warehousing.prodId,