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

src/views/ecw/customer/edit.vue

@@ -681,6 +681,22 @@ export default {
             return
           }
 
+            // 重货标准和泡货标准，未打开就不传，提交前清空一下
+            if(!this.showZhong) {
+              this.form.weightUnit = null
+              this.zhongLines = []
+            }
+            if (!this.showZhong1) {
+              this.zhongLines = []
+            }
+            if(!this.showPao) {
+              this.form.lightUnit = null
+              this.paoLines = []
+            }
+            if (!this.showPao1) {
+              this.paoLines = []
+            }
+            this.updateCustomerLines()
           const form = {...this.form, type: this.form.type?.join(','), transportType: (this.form.transportType || [])?.join(','), taxRate: Number(this.form.taxRate)}
 
           // 检查路线是否启用了但是没选择目的仓

src/views/ecw/order/exception/index.vue

@@ -289,6 +289,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.page = 1
       this.getList();
     },
     handEdit(id){