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

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