Browse Source

切换分支

bding 5 months ago
parent
commit
7283b647d3

+ 9 - 9
src/views/contract_manage/paymentRecords.vue

@@ -33,7 +33,7 @@
         <el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payInfo" placeholder="付款项目" clearable>
         <el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payInfo" placeholder="付款项目" clearable>
           <el-option v-for="item in paymentProjectList" :key="item" :label="item" :value="item"> </el-option>
           <el-option v-for="item in paymentProjectList" :key="item" :label="item" :value="item"> </el-option>
         </el-select>
         </el-select>
-         <el-select v-if="tabs_index == 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="vipType" placeholder="会员类型" clearable>
+        <el-select v-if="tabs_index == 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="vipType" placeholder="会员类型" clearable>
           <el-option v-for="item in vipTypeList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
           <el-option v-for="item in vipTypeList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
         </el-select>
         </el-select>
         <el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="paymentType" placeholder="支付渠道" clearable>
         <el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="paymentType" placeholder="支付渠道" clearable>
@@ -144,11 +144,10 @@ export default {
       dialogVisible: false, // 退款的弹框
       dialogVisible: false, // 退款的弹框
       refundTextarea: "", // 退款原因
       refundTextarea: "", // 退款原因
       orderRefundCode: "",
       orderRefundCode: "",
-      vipType:'',
-      vipTypeList:[
-        { lable: "小程序", key: 1 },
-        { lable: "PC", key: 2 },
-        { lable: "H5", key: 3 },
+      vipType: "",
+      vipTypeList: [
+        { lable: "日卡", key: "日卡" },
+        { lable: "月卡", key: "月卡" },
       ],
       ],
     };
     };
   },
   },
@@ -201,8 +200,8 @@ export default {
         PageSize: this.page_size,
         PageSize: this.page_size,
         CurrentIndex: this.page_no,
         CurrentIndex: this.page_no,
         AdminId: salesArr.join(","),
         AdminId: salesArr.join(","),
-        StartDate: this.timeRange.length ? this.timeRange[0] : "",
-        EndDate: this.timeRange.length ? this.timeRange[1] : "",
+        StartDate: this.timeRange && this.timeRange.length ? this.timeRange[0] : "",
+        EndDate: this.timeRange && this.timeRange.length ? this.timeRange[1] : "",
         OrderType: this.tabs_index,
         OrderType: this.tabs_index,
         PaymentProject: this.payInfo,
         PaymentProject: this.payInfo,
         OrderCode: this.orderNumber,
         OrderCode: this.orderNumber,
@@ -210,15 +209,16 @@ export default {
         OrderStatus: this.payStatus,
         OrderStatus: this.payStatus,
         ShareId: salesArrRai.join(","),
         ShareId: salesArrRai.join(","),
         PaymentType: this.paymentType,
         PaymentType: this.paymentType,
+        PaymentProject: this.vipType,
       });
       });
       if (res.Ret === 200) {
       if (res.Ret === 200) {
         this.tableOrderData = res.Data.List;
         this.tableOrderData = res.Data.List;
         this.total = res.Data.Paging.Totals || 0;
         this.total = res.Data.Paging.Totals || 0;
       }
       }
-      console.log(res);
     },
     },
     tabActive(item) {
     tabActive(item) {
       if (this.tabs_index == item.key) return;
       if (this.tabs_index == item.key) return;
+      this.vipType = "";
       this.tableColums = tableColums(item.key);
       this.tableColums = tableColums(item.key);
       this.tabs_index = item.key;
       this.tabs_index = item.key;
       this.handleSelectChange();
       this.handleSelectChange();

+ 2 - 2
src/views/contract_manage/refundRecord.vue

@@ -189,8 +189,8 @@ export default {
         PageSize: this.page_size,
         PageSize: this.page_size,
         CurrentIndex: this.page_no,
         CurrentIndex: this.page_no,
         AdminId: salesArr.join(","),
         AdminId: salesArr.join(","),
-        StartDate: this.timeRange.length ? this.timeRange[0] : "",
-        EndDate: this.timeRange.length ? this.timeRange[1] : "",
+        StartDate: this.timeRange && this.timeRange.length ? this.timeRange[0] : "",
+        EndDate: this.timeRange && this.timeRange.length ? this.timeRange[1] : "",
         OrderType: this.tabs_index,
         OrderType: this.tabs_index,
         PaymentProject: this.payInfo,
         PaymentProject: this.payInfo,
         OrderCode: this.orderNumber,
         OrderCode: this.orderNumber,