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

src/api/ecw/customerContacts.js

@@ -71,9 +71,13 @@ export function exportCustomerContactsExcel(query) {
 
 // 根据客户ID获得联系人列表
 export function getCustomerContactsListByCustomer(query) {
-  return request({
-    url: '/ecw/customer-contacts/list-by-customer',
-    method: 'get',
-    params: query
-  })
+  if(query.customerId){
+    return request({
+      url: '/ecw/customer-contacts/list-by-customer',
+      method: 'get',
+      params: query
+    })
+  }else {
+    return Promise.resolve()
+  }
 }

src/views/ecw/customer/edit.vue

@@ -587,9 +587,10 @@ export default {
     this.reset()
     // this.getUserMemberUserFn()
     if(this.customerId !== '0') {
+      let customerId = this.customerId
       // 编辑客户
       this.getCustomer(this.customerId).then(() => {
-        getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
+        getCustomerContactsListByCustomer({customerId: customerId}).then(r => {
           this.form.customerContacts = r.data
           let list = this.form.customerContacts.map(item => item.userid);
           if(list.length >0){
@@ -604,16 +605,15 @@ export default {
          }
         })
 
-        // 打开重泡货开关
-        if(this.form.weightUnit){
-          this.showZhong = true
-        }
-        if(this.form.lightUnit){
-          this.showPao = true
-        }
-
+          // 打开重泡货开关
+          if(this.form.weightUnit){
+            this.showZhong = true
+          }
+          if(this.form.lightUnit){
+            this.showPao = true
+          }
         // 获取重泡货路线
-        getCustomerLines(this.customerId).then(res => {
+        getCustomerLines(customerId).then(res => {
           this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
           this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
           if(this.zhongLines.length)this.showZhong1 = true

src/views/ecw/order/associatedOrder.vue

@@ -20,7 +20,7 @@
        {{$t('已加入关联订单列表')}}
      </h1>
        <div style="flex: 1;margin-left: 20px;">
-         <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button>
+         <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:e.orderId,relateOrderId:e.relateOrderId})))" >{{$t('批量移出')}}</el-button>
        </div>
      <div>
         <el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">{{$t('添加关联订单')}}</el-button>
@@ -69,7 +69,7 @@
      </el-table-column>
      <el-table-column :label="$t('操作')">
        <template v-slot:default='scope'>
-         <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.orderId)">
+         <el-button type="text"  @click ="guanlianOrderByOrderId({orderId:scope.row.orderId,relateOrderId:scope.row.relateOrderId})">
            {{$t('移出')}}
          </el-button>
        </template>
@@ -147,8 +147,8 @@ export default {
         }
       })
     },
-    guanlianOrderByOrderId(id){
-      deleteGuanlianOrderByOrderId({orderId:this.orderId,relateOrderId:id}).then(r =>{
+    guanlianOrderByOrderId(params){
+      deleteGuanlianOrderByOrderId(params).then(r =>{
         if(r.code === 0){
           this.getList()
           this.$message.success(this.$t('操作成功'));