瀏覽代碼

1. 优化

MONSTER-ygh 2 月之前
父節點
當前提交
55be88cb39
共有 2 個文件被更改,包括 40 次插入3 次删除
  1. 19 0
      src/views/order/groupBuyingMr/index.vue
  2. 21 3
      src/views/order/orderMr/dialog/details.vue

+ 19 - 0
src/views/order/groupBuyingMr/index.vue

@@ -77,6 +77,22 @@
           </el-select>
           <span @click="clearQuery('status')" class="query_clear"><i class="el-icon-circle-close"></i></span>
         </el-form-item>
+        <el-form-item v-if="queryShow.payWay" label="支付方式">
+          <el-select
+            v-model="queryParams.payWay"
+            placeholder="支付方式"
+            clearable
+            style="width: 100%"
+          >
+              <el-option
+                v-for="dict in dict.type.pay_way_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+          </el-select>
+          <span @click="clearQuery('payWay')" class="query_clear"><i class="el-icon-circle-close"></i></span>
+        </el-form-item>
         <el-form-item v-if="queryShow.time" label="支付时间">
           <el-date-picker
             v-model="queryParams.time"
@@ -169,6 +185,7 @@
               <el-dropdown-item command="teamTypeId">团队类型</el-dropdown-item>
               <el-dropdown-item command="ifSuccessInvoice">是否成功开票</el-dropdown-item>
               <el-dropdown-item command="status">订单状态</el-dropdown-item>
+              <el-dropdown-item command="payWay">支付方式</el-dropdown-item>
               <el-dropdown-item command="time">支付时间</el-dropdown-item>
               <el-dropdown-item command="paymentId">支付单号</el-dropdown-item>
               <el-dropdown-item command="performDate">场次时间/场次</el-dropdown-item>
@@ -545,6 +562,7 @@ export default {
         salerPerson: false,
         teamTypeId: false,
         ifSuccessInvoice: false,
+        payWay: false,
         status: false,
         time: false,
         paymentId: false,
@@ -649,6 +667,7 @@ export default {
       this.$set(this.queryParams, 'time', '');
       this.$set(this.queryParams, 'performDate', '');
       this.$set(this.queryParams, 'performTimeId', '');
+      this.$set(this.queryParams, 'payWay', '');
       this.$set(this.queryParams, 'invoiceTime', '');
       this.$set(this.queryParams, 'salerPerson', '');
       this.$set(this.queryParams, 'refundPaymentId', '');

+ 21 - 3
src/views/order/orderMr/dialog/details.vue

@@ -254,8 +254,27 @@ export default {
         this.loading_seta =  true //  加载座位
         const id = row.id
         let res = await getSelectById(id)
-        this.seatSelectList = res.data.viewersList
-        this.$set(this, "form", res.data)
+        let list = []
+        res.data.viewersList.forEach((item,index)=>{
+          let list1 = item.seatIds.split(',')
+          let nameList = item.seatName.split(',')
+          let idcardList = item.idcardList.split(',')
+          let mobileList = item.mobileList.split(',')
+          list1.forEach((item1,index1)=>{
+            list.push({
+              ...item,
+              mobile: mobileList[index1],
+              seatName: nameList[index1],
+              idcard: idcardList[index1],
+              seatIds: item1
+            })
+          })
+        })
+        this.seatSelectList = list
+        this.$set(this, "form", {
+          ...res.data,
+          viewersList: list
+        })
         this.loading_form =  false//  加载表单
         let res1 = await querySeatList({
           auditoriumId: res.data.auditoriumId,
@@ -347,7 +366,6 @@ export default {
       }
     },
     setIsSelect(item) {
-      console.log("item===",item)
       if (!this.seatSelectList || this.seatSelectList.length == 0) {
         return false
       }