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

src/views/ecw/customer/edit.vue

@@ -469,7 +469,7 @@ export default {
       productList: [],
       showZhong: false,
       showZhong1: false,
-      showPao: false,
+      showPao: true,
       showPao1: false,
       warehouseList: [], // 仓库列表
       importCityList: [], // 进口地址
@@ -514,6 +514,8 @@ export default {
             // this.getList();
             const obj = { path: "/customer/customer" };
             this.$tab.closeOpenPage(obj);
+          }).catch(e => {
+            this.$modal.msgError(e.msg || '添加客户失败，请联系管理员')
           });
           return;
         }
@@ -522,6 +524,10 @@ export default {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           // this.getList();
+          const obj = { path: "/customer/customer" };
+          this.$tab.closeOpenPage(obj);
+        }).catch(e => {
+          this.$modal.msgError(e.msg || '添加客户失败，请联系管理员')
         });
       });
     },