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

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/financial/receivable.vue

@@ -290,8 +290,7 @@ export default {
     };
   },
   activated(){
-    console.log(11)
-    this.handleQuery()
+    this.getList();
   },
   created() {
     let that = this;

src/views/ecw/financial/voucher.vue

@@ -259,7 +259,7 @@ export default {
     };
   },
   activated(){
-    this.handleQuery()
+    this.getList();
   },
   created() {
     let that = this;
@@ -271,7 +271,7 @@ export default {
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = { ...this.params };
+      let params = { ...this.queryParams };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
       getReceiptList(params).then((response) => {
@@ -331,7 +331,7 @@ export default {
         this.queryParams.endCreateTime = ''
       }
 
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       for(var key in this.queryParams){
           if(this.queryParams[key]){
             this.params[key] = this.queryParams[key]

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

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