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

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -303,7 +303,8 @@ export default {
       });
     },
     // 获取异常类型
-    getUnloadError(exceptionList = []) {
+    getUnloadError(exceptionList) {
+      if (!exceptionList) return exceptionList;
       const codes = this.getDictDatas(this.DICT_TYPE.ORDER_ERROR_TYPE);
       let errorLabels = [];
       exceptionList.forEach((item) => {

src/views/ecw/customer/edit.vue

@@ -672,7 +672,10 @@ export default {
           if(errors){
             return this.$message.error('有两条路线未选择目的地')
           }
-
+          //我的客户页面跳转直接，完善客户
+          if(this.isCustomerServiceConfirmed){
+            form.isCustomerServiceConfirmed = this.isCustomerServiceConfirmed;
+          }
           // 修改的提交
           if (this.form.id != null) {
             this.form.customerContacts.forEach(e => {
@@ -698,10 +701,6 @@ export default {
             return;
           }
           // 添加的提交
-          //我的客户页面跳转直接
-           if(this.isCustomerServiceConfirmed){
-             form.isCustomerServiceConfirmed = this.isCustomerServiceConfirmed;
-           }
           createCustomer(form).then(response => {
             this.$modal.msgSuccess(this.$t('新增成功'));
             this.open = false;

src/views/ecw/customerConfirm/index.vue

@@ -513,7 +513,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      this.$router.push('/customer/perfect/'+id);
+      this.$router.push({path:'/customer/perfect/'+id,query:{isCustomerServiceConfirmed:true,}});
       // getCustomer(id).then(response => {
       //   this.form = response.data;
       //   this.open = true;