更新

src/views/pay/payAgentUser/payAgentDivideDetail.vue

@@ -35,8 +35,8 @@
             <el-option v-for="(item, i) in userLevType" :key="i" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="统计方式" prop="userLev">
+        <el-form-item label="统计方式" prop="countScope">
-          <el-select v-model="queryParams.Lev" placeholder="请选择统计方式" clearable size="medium">
+          <el-select v-model="queryParams.countScope" placeholder="请选择统计方式" clearable size="medium">
             <el-option v-for="(item, i) in sortLevType" :key="i" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -180,7 +180,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         userLev:null,
-        Lev:null,
+        countScope:null,
         name:null,
         storeName:null,
       },

src/views/pay/payOrder/orderReport.vue

@@ -15,7 +15,7 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
         class="flex form" style="padding:0 20px">
         <el-form-item label="交易时间">
-          <my-date-picker @change="onDateRangeChange" />
+          <my-date-picker @change="onDateRangeChange" ref="child" />
         </el-form-item>
         <el-form-item label="商户名称" prop="storeName">
                     <el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@@ -204,8 +204,9 @@ methods: {
   /** 重置按钮操作 */
   resetQuery() {
     this.dateRange = [];
+    this.$refs.child.dateRange=[] //修改子组件data
     this.resetForm("queryForm");
-    this.queryForm = {
+    this.queryParams = {
       beginTime: undefined,
       endTime: undefined,
     };

src/views/pay/payOrder/paySettleWater.vue

@@ -215,12 +215,14 @@ export default {
                 orderStatus: null,
                 auditStatus: null,
                 auditStep: null,
+                storeNo:null,
                 payeeAcctName: null,
                 payeeAcctId: null,
                 payeeBankName: null,
                 acctName: null,
                 acctId: null,
                 bankName: null,
+                settleCode:null
             },
 
             // 表单参数