修改前端界面

src/views/ldt_bills/balancebills.vue

@@ -37,6 +37,20 @@
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"></avue-date>
       </template>
+      <template slot-scope="{type,size}" slot="payStatusSearch">
+        <el-radio-group v-model="query.payStatus" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='payStatus';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
+      <template slot-scope="{type,size}" slot="typeSearch">
+        <el-radio-group v-model="query.type" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='type';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
       <template slot-scope="{type,size}" slot="keySearch">
         <el-input type="text" placeholder="订单ID" v-model="query.key" :size="size"
                   style="width: 300px;margin: 1px 5px 1px 0;">
@@ -83,6 +97,8 @@
         query: {
           createTime: -1,
           createTimeRange: [],
+          type: -1,
+          payStatus: -1,
         },
         censusPrice:{},
         loading: true,
@@ -187,10 +203,15 @@
             },
             {
               label: "交易状态",
-              search: false,
               prop: "payStatus",
-              type: "select",
+              search: true,
+              searchslot: true,
+              searchSpan: 24,
+              searchOrder: 3,
               dicData:[{
+                label:"全部",
+                value: -1
+              },{
                 label:"待付款",
                 value:"待付款"
               },{
@@ -211,10 +232,15 @@
             },
             {
               label: "交易类型",
-              search: false,
               prop: "type",
-              type: "select",
+              search: true,
+              searchslot: true,
+              searchSpan: 24,
+              searchOrder: 4,
               dicData:[{
+                label:"全部",
+                value: -1
+              },{
                 label:"用户付款",
                 value:"PAY_CONSUMER"
               },{
@@ -255,7 +281,7 @@
               hide: true,
               search: true,
               searchslot: true,
-              searchOrder: 1,
+              searchOrder: 5,
               searchSpan: 24,
               editDisplay: false,
             },
@@ -449,21 +475,13 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
-        const {createTime} = this.query;
         let values = {
           ...params,
         };
-        if (createTime) {
-          values = {
-            ...params,
-            createTimeStart: createTime[0],
-            createTimeEnd: createTime[1],
-            ...this.query
-          };
-          values.createTime = null;
-        }
+        values.createTime = null;
+        values.createTimeRange = null;
         this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, values)).then(res => {
+        getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
@@ -513,7 +531,7 @@
           FileUtil.download(res.data,{
             type: "application/vnd.ms-excel"
           },`生成余额账单-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-        }).finally(_=>{
+        }).finally(()=>{
           this.loading = false;
         });
       },

src/views/ldt_bills/bills.vue

@@ -37,6 +37,20 @@
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"></avue-date>
       </template>
+      <template slot-scope="{type,size}" slot="typeSearch">
+        <el-radio-group v-model="query.type" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='type';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
+      <template slot-scope="{type,size}" slot="payStatusSearch">
+        <el-radio-group v-model="query.payStatus" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='payStatus';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
       <template slot-scope="{type,size}" slot="keySearch">
         <el-input type="text" placeholder="订单ID" v-model="query.key" :size="size"
                   style="width: 300px;margin: 1px 5px 1px 0;">
@@ -92,6 +106,8 @@
         query: {
           createTime: -1,
           createTimeRange: [],
+          payStatus: -1,
+          type: -1,
         },
         loading: true,
         censusPrice:{},
@@ -203,8 +219,14 @@
             {
               label: "交易类型",
               prop: "type",
-              type: "select",
+              search: true,
+              searchSpan: 24,
+              searchslot: true,
+              searchOrder: 1,
               dicData:[{
+                label: "全部",
+                value: -1
+              },{
                 label:"用户付款",
                 value:"USER_PAY"
               },{
@@ -256,7 +278,14 @@
               label: "支付状态",
               prop: "payStatus",
               type: "select",
+              search: true,
+              searchSpan: 24,
+              searchslot: true,
+              searchOrder: 2,
               dicData:[{
+                label: "全部",
+                value: -1
+              },{
                 label:"待付款",
                 value:"待付款"
               },{
@@ -395,7 +424,7 @@
               hide: true,
               search: true,
               searchslot: true,
-              searchOrder: 1,
+              searchOrder: 5,
               searchSpan: 24,
               editDisplay: false,
             },
@@ -580,19 +609,11 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
-        const {createTime} = this.query;
         let values = {
           ...params,
         };
-        if (createTime) {
-          values = {
-            ...params,
-            createTimeStart: createTime[0],
-            createTimeEnd: createTime[1],
-            ...this.query
-          };
-          values.createTime = null;
-        }
+        values.createTime = null;
+        values.createTimeRange = null;
         this.loading = true;
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
@@ -644,7 +665,7 @@
           FileUtil.download(res.data,{
             type: "application/vnd.ms-excel"
           },`生成付款账单-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-        }).finally(_=>{
+        }).finally(()=>{
           this.loading = false;
         });
       },

src/views/ldt_bills/platformbills.vue

@@ -38,6 +38,13 @@
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"></avue-date>
       </template>
+      <template slot-scope="{type,size}" slot="typeSearch">
+        <el-radio-group v-model="query.type" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='type';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
       <template slot-scope="{type,size}" slot="keySearch">
         <el-input type="text" placeholder="订单ID" v-model="query.key" :size="size"
                   style="width: 300px;margin: 1px 5px 1px 0;">
@@ -84,6 +91,7 @@
         query: {
           createTime: -1,
           createTimeRange: [],
+          type: -1
         },
         censusPrice:{},
         loading: true,
@@ -160,8 +168,14 @@
             {
               label: "交易类型",
               prop: "type",
-              type: "select",
+              search: true,
+              searchslot: true,
+              searchSpan: 24,
+              searchOrder: 1,
               dicData:[{
+                label: "全部",
+                value: -1
+              },{
                 label:"用户付款",
                 value:"USER_PAY"
               },{
@@ -223,7 +237,7 @@
               hide: true,
               search: true,
               searchslot: true,
-              searchOrder: 1,
+              searchOrder: 5,
               searchSpan: 24,
               editDisplay: false,
             },
@@ -408,19 +422,11 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
-        const {createTime} = this.query;
         let values = {
           ...params,
         };
-        if (createTime) {
-          values = {
-            ...params,
-            createTimeStart: createTime[0],
-            createTimeEnd: createTime[1],
-            ...this.query
-          };
-          values.createTime = null;
-        }
+        values.createTime = null;
+        values.createTimeRange = null;
         this.loading = true;
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
@@ -472,7 +478,7 @@
           FileUtil.download(res.data,{
             type: "application/vnd.ms-excel"
           },`生成平台账单-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-        }).finally(_=>{
+        }).finally(()=>{
           this.loading = false;
         });
       },

src/views/ldt_bills/pointbills.vue

@@ -37,6 +37,34 @@
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"></avue-date>
       </template>
+      <template slot-scope="{type,size}" slot="isCheakSearch">
+        <el-radio-group v-model="query.isCheak" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='isCheak';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
+      <template slot-scope="{type,size}" slot="payStatusSearch">
+        <el-radio-group v-model="query.payStatus" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='payStatus';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
+      <template slot-scope="{type,size}" slot="typeSearch">
+        <el-radio-group v-model="query.type" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='type';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
+      <template slot-scope="{type,size}" slot="isCheakSearch">
+        <el-radio-group v-model="query.isCheak" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='isCheak';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
       <template slot-scope="{type,size}" slot="keySearch">
         <el-input type="text" placeholder="订单ID" v-model="query.key" :size="size"
                   style="width: 300px;margin: 1px 5px 1px 0;">
@@ -106,6 +134,9 @@ export default {
       query: {
         createTime: -1,
         createTimeRange: [],
+        payStatus: -1,
+        isCheak: -1,
+        type: -1
       },
       loading: true,
       censusPrice: {},
@@ -182,9 +213,14 @@ export default {
           {
             label: "交易状态",
             prop: "payStatus",
-            search: false,
-            type: "select",
+            search: true,
+            searchslot: true,
+            searchOrder: 1,
+            searchSpan: 24,
             dicData: [{
+              label: "全部",
+              value: -1
+            },{
               label: "待付款",
               value: "待付款"
             }, {
@@ -224,9 +260,14 @@ export default {
           {
             label: "交易类型",
             prop: "type",
-            search: false,
-            type: "select",
+            search: true,
+            searchslot: true,
+            searchOrder: 2,
+            searchSpan: 24,
             dicData: [{
+              label: "全部",
+              value: -1
+            },{
               label: "用户付款",
               value: "PAY_CONSUMER"
             }, {
@@ -284,12 +325,17 @@ export default {
             }]
           },
           {
-            label: "是否已经核销",
+            label: "是否核销",
             prop: "isCheak",
-            labelWidth: "120",
-            type: "switch",
+            search: true,
+            searchslot: true,
+            searchOrder: 3,
+            searchSpan: 24,
             dicData: [
               {
+                label: "全部",
+                value: -1
+              },{
                 label: "否",
                 value: 0
               },
@@ -329,7 +375,7 @@ export default {
             hide: true,
             search: true,
             searchslot: true,
-            searchOrder: 1,
+            searchOrder: 5,
             searchSpan: 24,
             editDisplay: false,
           },
@@ -546,19 +592,11 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      const {createTime} = this.query;
       let values = {
         ...params,
       };
-      if (createTime) {
-        values = {
-          ...params,
-          createTimeStart: createTime[0],
-          createTimeEnd: createTime[1],
-          ...this.query
-        };
-        values.createTime = null;
-      }
+      values.createTime = null;
+      values.createTimeRange = null;
       this.loading = true;
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
@@ -608,7 +646,7 @@ export default {
         FileUtil.download(res.data,{
           type: "application/vnd.ms-excel"
         },`生成积分账单-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-      }).finally(_=>{
+      }).finally(()=>{
         this.loading = false;
       });
     },

src/views/ldt_bills/transferrec.vue

@@ -37,6 +37,13 @@
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"></avue-date>
       </template>
+      <template slot-scope="{type,size}" slot="transferStatusSearch">
+        <el-radio-group v-model="query.transferStatus" :size="size" @change="searchStateChange">
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='transferStatus';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
+        </el-radio-group>
+      </template>
       <template slot-scope="{type,size}" slot="keySearch">
         <el-input type="text" placeholder="订单ID" v-model="query.key" :size="size"
                   style="width: 300px;margin: 1px 5px 1px 0;">
@@ -60,7 +67,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/ldt_bills/transferrec";
+  import {getList, getDetail, add, update, remove,generateList} from "@/api/ldt_bills/transferrec";
   import {mapGetters} from "vuex";
   import moment from "moment";
   import FileUtil from "@/util/fileUtil";
@@ -72,6 +79,7 @@
         query: {
           createTime: -1,
           createTimeRange: [],
+          transferStatus: -1
         },
         loading: true,
         page: {
@@ -90,6 +98,10 @@
           index: true,
           viewBtn: true,
           selection: true,
+          searchBtn: false,
+          emptyBtn: false,
+          addBtn: false,
+          delBtn: false,
           dialogClickModal: false,
           column: [
             {
@@ -147,8 +159,26 @@
               }]
             },
             {
-              label: "转账状态： 转账申请中，转账成功，转账失败",
+              label: "转账状态",
               prop: "transferStatus",
+              dicData:[
+                {
+                  label: "全部",
+                  value: -1
+                },
+                {
+                  label:"转账申请中",
+                  value: "REQUEST_RECEIVE"
+                },
+                {
+                  label: "转账已完成",
+                  value: "DONE",
+                },
+                {
+                  label: "转账失败",
+                  value: "FAIL",
+                }
+              ],
               rules: [{
                 required: true,
                 message: "请输入转账状态： 转账申请中，转账成功，转账失败",
@@ -156,8 +186,11 @@
               }]
             },
             {
-              label: "转账渠道：yeePay(易宝支付)",
+              label: "转账渠道",
               prop: "channel",
+              dicData: [
+
+              ],
               rules: [{
                 required: true,
                 message: "请输入转账渠道：yeePay(易宝支付)",
@@ -425,8 +458,13 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
+        let values = {
+          ...params,
+        };
+        values.createTime = null;
+        values.createTimeRange = null;
         this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
@@ -469,7 +507,7 @@
           FileUtil.download(res.data,{
             type: "application/vnd.ms-excel"
           },`生成转账记录-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-        }).finally(_=>{
+        }).finally(()=>{
           this.loading = false;
         });
       },

src/views/ldt_bills/withdrawrec.vue

@@ -48,16 +48,16 @@
       </template>
       <template slot-scope="{type,size}" slot="withdrawStatusSearch">
         <el-radio-group v-model="query.withdrawStatus" :size="size" @change="searchStateChange">
-          <el-radio-button :label="-1">全部</el-radio-button>
-          <el-radio-button :label="1">待确定</el-radio-button>
-          <el-radio-button :label="2">已到账</el-radio-button>
-          <el-radio-button :label="3">失败</el-radio-button>
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='withdrawStatus';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
         </el-radio-group>
       </template>
       <template slot-scope="{type,size}" slot="channelSearch">
         <el-radio-group v-model="query.channel" :size="size" @change="searchStateChange">
-          <el-radio-button :label="-1">全部</el-radio-button>
-          <el-radio-button label="yeePay">易宝</el-radio-button>
+          <el-radio-button :label="select.value" v-for="(select,index) in option.column.find(ele=>{
+            return ele.prop==='channel';
+          }).dicData" :key="index">{{ select.label }}</el-radio-button>
         </el-radio-group>
       </template>
       <template slot-scope="{type,size}" slot="keySearch">
@@ -129,7 +129,6 @@ export default {
         viewBtn: true,
         selection: true,
         searchBtn: false,
-        menu: false,
         emptyBtn: false,
         dialogClickModal: false,
         column: [
@@ -209,6 +208,9 @@ export default {
             searchSpan: 24,
             searchOrder: 1,
             dicData: [{
+              label: "全部",
+              value: -1,
+            },{
               label: "待确定",
               value: "1"
             }, {
@@ -241,6 +243,16 @@ export default {
             search: true,
             searchSpan: 24,
             searchOrder: 2,
+            dicData: [
+              {
+                label: "全部",
+                value: -1,
+              },
+              {
+                label: "易宝",
+                value: "yeePay"
+              }
+            ],
             rules: [{
               required: true,
               message: "请输入提现渠道：yeePay(易宝支付)",
@@ -565,7 +577,7 @@ export default {
         FileUtil.download(res.data,{
           type: "application/vnd.ms-excel"
         },`生成提现记录-${moment().format("yyyy-MM-DD HH:mm:ss")}.xls`);
-      }).finally(_=>{
+      }).finally(()=>{
         this.loading = false;
       });
     },