报表时间

operationSupport/src/views/payService/ChargebackRecord.vue

@@ -116,8 +116,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0] + " 00:00:00";
-            this.mixins_query.endTime = arr[1]+ " 23:59:59";;
+            this.mixins_query.startTime = arr[0] + ' 00:00:00';
+            this.mixins_query.endTime = arr[1] + ' 23:59:59';
         }
     }
 };

operationSupport/src/views/payService/expenseReport/Electricity.vue

@@ -125,6 +125,8 @@ export default {
         this.mixins_query.accountType = 3;
         this.mixins_query.paymentType = 1;
         Object.assign(this.mixins_query, this.$parent.mixins_query);
+        this.mixins_query.startTime = '';
+        this.mixins_query.endTime = '';
         this.getSun(1);
         this.getSun(2);
         this.mixins_search();

operationSupport/src/views/payService/expenseReport/Water.vue

@@ -125,6 +125,8 @@ export default {
         this.mixins_query.accountType = 2;
         this.mixins_query.paymentType = 1;
         Object.assign(this.mixins_query, this.$parent.mixins_query);
+        this.mixins_query.startTime = '';
+        this.mixins_query.endTime = '';
         this.getSun(1);
         this.getSun(2);
         this.mixins_search();

operationSupport/src/views/payService/expenseReport/index.vue

@@ -11,6 +11,17 @@
                     <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
                 </el-select>
                 <el-date-picker
+                    v-if="accountType == 1"
+                    v-model="times"
+                    value-format="yyyy-MM"
+                    type="monthrange"
+                    range-separator="至"
+                    start-placeholder="选择开始日期"
+                    end-placeholder="选择结束日期"
+                    @change="effectiveDateToggle"
+                ></el-date-picker>
+                <el-date-picker
+                    v-else
                     v-model="times"
                     value-format="yyyy-MM-dd"
                     type="daterange"
@@ -19,6 +30,7 @@
                     end-placeholder="选择结束日期"
                     @change="effectiveDateToggle"
                 ></el-date-picker>
+
                 <el-button type="primary" class="search-btn" @click="changeMixins" icon="el-icon-search">查询 </el-button>
                 <div class="search-icon">
                     <el-tooltip class="item" effect="light" placement="bottom" content="导出">
@@ -102,7 +114,7 @@ export default {
             ],
             accountType: 1,
             mixins_post: 'post',
-            times: '',
+            times: [],
             thisItem: {},
             communityArr: []
         };
@@ -115,6 +127,9 @@ export default {
     mounted() {},
     methods: {
         changeRadio() {
+            this.mixins_query.startTime = '';
+            this.mixins_query.endTime = '';
+            this.times = '';
             if (this.accountType == 1) {
                 this.mixins_search();
             }
@@ -161,8 +176,13 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.startTime = arr[0];
-            this.mixins_query.endTime = arr[1];
+            if (this.accountType == 1) {
+                this.mixins_query.startTime = arr[0];
+                this.mixins_query.endTime = arr[1];
+            } else {
+                this.mixins_query.startTime = arr[0] + ' 00:00:00';
+                this.mixins_query.endTime = arr[1] + ' 23:59:59';
+            }
         }
     }
 };

operationSupport/vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
                 viewportWidth: 1920,//传参
             })
         // 配置每次打包浏览器缓存文件名的随机性
-        const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
-        config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename)
+        // const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
+        // config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename)
     },
     // 配置全局样式变量
     css: {