1. 优化

src/views/distribution/personnelMr/index.vue

@@ -41,6 +41,15 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="入驻银联主体名称" label-width="150px">
+          <el-input
+            v-model="queryParams.unionName"
+            placeholder="请输入入驻银联主体名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -119,6 +128,7 @@
               <dict-tag :options="dict.type.persons_type" :value="scope.row.personsType"/>
             </template>
           </el-table-column>
+          <el-table-column label="入驻银联主体名称" align="center" prop="unionName" />
           <el-table-column label="佣金税率" align="center" prop="type">
             <template slot-scope="scope">
               <span>{{ scope.row.retailRate }}%</span>
@@ -489,6 +499,7 @@ export default {
       this.$set(this.queryParams, 'name', '');
       this.$set(this.queryParams, 'type', '');
       this.$set(this.queryParams, 'personsType', '');
+      this.$set(this.queryParams, 'unionName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

src/views/distribution/recordMr/index.vue

@@ -53,6 +53,26 @@
           <el-option v-for="dict in pagePerformTimeList" :key="dict.id" :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'" :value="dict.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="支付时间">
+          <el-date-picker
+            style="width: 230px;"
+            v-model="queryParams.time"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入驻银联主体名称" label-width="150px">
+          <el-input
+            v-model="queryParams.unionName"
+            placeholder="请输入入驻银联主体名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -83,6 +103,7 @@
           <dict-tag :options="dict.type.distribution_type" :value="scope.row.personType"/>
         </template>
       </el-table-column>
+      <el-table-column label="入驻银联主体名称" align="center" prop="unionName" />
       <el-table-column label="订单号" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="openDetails(scope.row)">{{ scope.row.orderId }}</el-button>
@@ -95,12 +116,15 @@
         </template>
       </el-table-column>
       <el-table-column label="购买人手机号" align="center" prop="memberMobile" />
-      <el-table-column label="购买数量(张)" align="center" prop="retailNum" />
+      <el-table-column label="票务名称" align="center" prop="goodsName" />
       <el-table-column label="佣金单价(元)" align="center" prop="brokeragePrice">
         <template slot-scope="scope">
           <span v-if="scope.row.brokeragePrice">￥{{ scope.row.brokeragePrice }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="实付金额" align="center" prop="realPrice" />
+      <el-table-column label="支付时间" align="center" prop="payTime" />
+      <el-table-column label="购买数量(张)" align="center" prop="retailNum" />
       <el-table-column label="已核销(张)" align="center" prop="usedNum" />
       <el-table-column label="获得佣金(元)" align="center" prop="brokeragePriceTotal">
         <template slot-scope="scope">
@@ -183,7 +207,16 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      let params = {...this.addDateRange(this.queryParams, this.dateRange)};
+      if(params.time){
+        params.payBeginTime = params.time[0];
+        params.payEndTime = params.time[1];
+      }else {
+        params.payBeginTime = null
+        params.payEndTime = null
+      }
+      delete params.time
+      pageList(params)
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;
@@ -208,6 +241,8 @@ export default {
       this.$set(this.queryParams, 'personType', '');
       this.$set(this.queryParams, 'performDate', '');
       this.$set(this.queryParams, 'performTimeId', '');
+      this.$set(this.queryParams, 'time', '');
+      this.$set(this.queryParams, 'unionName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },
@@ -228,14 +263,18 @@ export default {
       })
         .then(() => {
           this.handleExportLoading = true;
-          // const { pageNum, pageSize} = this.params;
-          let postMap = {}
-          for (let key in this.queryParams) {
-            if(key != 'pageNum' && key != 'pageSize'){
-              postMap[key] = this.queryParams[key]
-            }
+          let params = {...this.addDateRange(this.queryParams, this.dateRange)};
+          if(params.time){
+            params.payBeginTime = params.time[0];
+            params.payEndTime = params.time[1];
+          }else {
+            params.payBeginTime = null
+            params.payEndTime = null
           }
-          downTimeCountListXls(postMap)
+          delete params.time
+          delete params.pageNum
+          delete params.pageSize
+          downTimeCountListXls(params)
             .then((res) => {
               exportExcel(res, '分销记录', '.xlsx');
               this.handleExportLoading = false;

src/views/finance/flowingWaterMr/index.vue

@@ -55,6 +55,44 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="支付时间">
+          <el-date-picker
+            style="width: 230px;"
+            v-model="queryParams.time"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="场次时间" label-width="70px">
+          <el-date-picker
+            style="width: 250px;"
+            v-model="queryParams.performDate"
+            @change="pagePerformTimeListFun"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="场次" v-if="!multiPerformDate">
+          <el-select
+            v-model="queryParams.performTimeId"
+            placeholder="场次"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in pagePerformTimeList"
+              :key="dict.id"
+              :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -103,6 +141,13 @@
           <dict-tag :options="dict.type.order_form_type" :value="scope.row.source"/>
         </template>
       </el-table-column>
+      <el-table-column label="支付时间" align="center" prop="payTime" width="160" >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.payTime) }}</span>
+            </template>
+      </el-table-column>
+      <el-table-column label="场次时间" align="center" prop="performDate" />
+      <el-table-column label="场次" width="120" align="center" prop="performTime" />
       <el-table-column label="产生时间" align="center" prop="createTime" width="160" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -128,6 +173,8 @@
 import { pageList, downOrderListXls } from '@/api/financeMr/flowingWaterMr'
 import { exportExcel } from '@/utils/exportexcel'
 import detailsDia from "./dialog/details";
+import { pagePerformTimeList } from "@/api/schedulingMr/schedulingMr"
+import moment from "moment"
 export default {
   name: "agreement",
   dicts: ['agreement_type','order_form_type','pay_way_type'],
@@ -186,22 +233,48 @@ export default {
       visibleType: '',
       handleExportLoading: false,
       tableData: {},
+      pagePerformTimeList: [], // 场次列表
+      multiPerformDate: false,
     };
   },
   created() {
+    this.$set(this.queryParams,'performDate',[moment().format("yyyy-MM-DD"),moment().format("yyyy-MM-DD")])
+    this.pagePerformTimeListFun(this.queryParams.performDate)
     this.getList();
   },
   methods: {
+    moment,
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      let params = {...this.addDateRange(this.queryParams, this.dateRange)};
+      if(params.time){
+        params.payBeginTime = params.time[0];
+        params.payEndTime = params.time[1];
+      }else {
+        params.payBeginTime = null
+        params.payEndTime = null
+      }
+      if(params.performDate){
+        params.performBeginDate   = params.performDate[0];
+        params.performEndDate = params.performDate[1];
+      }else {
+        params.performBeginDate   = null
+        params.performEndDate = null
+      }
+      delete params.performDate
+      delete params.time
+      pageList(params)
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;
           this.loading = false;
         }
-      );
+      ).catch(()=>{
+        this.dataList = [];
+        this.total = 0;
+        this.loading = false;
+      })
     },
     // 取消按钮
     cancel() {
@@ -219,6 +292,9 @@ export default {
       this.$set(this.queryParams, 'businessType', '');
       this.$set(this.queryParams, 'incomeExpenses', '');
       this.$set(this.queryParams, 'payWay', '');
+      this.$set(this.queryParams, 'performDate', '');
+      this.$set(this.queryParams, 'time', '');
+      this.$set(this.queryParams, 'performTimeId', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },
@@ -240,13 +316,26 @@ export default {
         .then(() => {
           this.handleExportLoading = true;
           // const { pageNum, pageSize} = this.params;
-          let postMap = {}
-          for (let key in this.queryParams) {
-            if(key != 'pageNum' && key != 'pageSize'){
-              postMap[key] = this.queryParams[key]
-            }
+          let params = {...this.addDateRange(this.queryParams, this.dateRange)};
+          if(params.time){
+            params.payBeginTime = params.time[0];
+            params.payEndTime = params.time[1];
+          }else {
+            params.payBeginTime = null
+            params.payEndTime = null
           }
-          downOrderListXls(postMap)
+          if(params.performDate){
+            params.performBeginDate   = params.performDate[0];
+            params.performEndDate = params.performDate[1];
+          }else {
+            params.performBeginDate   = null
+            params.performEndDate = null
+          }
+          delete params.performDate
+          delete params.time
+          delete params.pageNum
+          delete params.pageSize
+          downOrderListXls(params)
             .then((res) => {
               exportExcel(res, '流水管理', '.xlsx');
               this.handleExportLoading = false;
@@ -263,6 +352,30 @@ export default {
     openDetails(row, type) {
       this.$refs["detailsDia"].openDialog("详情", row, type);
     },
+    async pagePerformTimeListFun(value) {
+      // console.log('value',value);
+      try {
+        this.pagePerformTimeList = []
+        this.$set(this.queryParams,'performTimeId',null)
+        if(!value){
+          return
+        }
+        if(value.length==2&&value[0]==value[1]){
+          this.multiPerformDate = false
+        }else{
+          this.multiPerformDate = true
+          return
+        }
+        let { data,code } = await pagePerformTimeList({
+          performDate: value[0],
+          pageNum: 1,
+          pageSize: 999
+        })
+        this.pagePerformTimeList = [].concat(data.rows)
+      } catch (error) {
+        
+      }
+    },
   }
 };
 </script>

src/views/marketing/activity/dialog/addAndEdit.vue

@@ -180,7 +180,7 @@ export default {
     };
   },
   created(){
-    this.getCouponList();
+    
   },
   methods: {
     /**
@@ -189,9 +189,10 @@ export default {
      * @param {any} obj
      * @returns {any}
      */
-    openDialog(title, obj) {
+    async openDialog(title, obj) {
       this.open = true;
       this.reset();
+      await this.getCouponList();
       if (obj){
         this.title = "编辑活动";
         this.$nextTick(() => {
@@ -309,12 +310,9 @@ export default {
       return isJPG;
     },
     /** 查询优惠券列表 */
-    getCouponList() {
-      couponPageList({pageNum:1,pageSize:999})
-      .then(response => {
-          this.couponList = response.data.rows;
-        }
-      );
+    async getCouponList() {
+      let response = await couponPageList({pageNum:1,pageSize:999})
+      this.couponList = response.data.rows;
     },
     dateChange(e){
       console.log('useStartDateChange',e);

src/views/marketing/activity/index.vue

@@ -254,6 +254,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.$set(this.queryParams, 'activityName', '');
       this.$set(this.queryParams, 'templateName', '');
       this.$set(this.queryParams, 'status', '');
       this.queryParams.pageNum = 1;