MONSTER-ygh il y a 7 mois
Parent
commit
17df6d31c4

+ 3 - 9
src/views/tourism/membershipManagement/equityCard/detailsBox/equityCardAllocationDetails.vue

@@ -55,12 +55,9 @@
             </el-checkbox-group>
           </el-form-item> -->
           <div class="form-title"><span>权益规则</span></div>
-          <el-form-item label="门票折扣权益:">
-            <div style="display: flex;align-items: center;">
-              <el-form-item label="基本折扣:" prop="benefitList" label-width="100px">
-                <span>{{ form.benefitList }}</span>
-                <span style="padding-bottom: 15px;">%</span>
-              </el-form-item>
+          <el-form-item label="门票免费:">
+            <div v-if="form.benefitList">
+              <el-tag style="margin-right: 10px;" v-for="(item,index) in form.benefitList" :key="index">{{ item.projectName }}</el-tag>
             </div>
           </el-form-item>
           <el-form-item label="持卡须知:" prop="remark">
@@ -148,9 +145,6 @@ export default {
             ...res.data,
             activateType: res.data.activateType?res.data.activateType.split('|'):[]
           }
-          if(res.data.benefitList && res.data.benefitList.length>0) {
-            obj['benefitList'] = res.data.benefitList[0].benefitValue
-          }
           this.$set(this, 'form', JSON.parse(JSON.stringify(obj)))
           this.radioInputs(obj.validityDay)
           this.formStatus = 1

+ 7 - 5
src/views/tourism/statisticalReports/ticketDailyReport.vue

@@ -15,7 +15,7 @@
                 </el-date-picker>
             </el-form-item>
             <el-form-item label="订单来源" prop="ticketOrderSource">
-                <el-select v-model="queryParams.ticketOrderSource" clearable placeholder="请选择订单来源">
+                <el-select v-model="queryParams.ticketOrderSource" multiple collapse-tags clearable placeholder="请选择订单来源">
                 <el-option
                     v-for="dict in dict.type.ticket_order_source"
                     :key="dict.value"
@@ -51,10 +51,11 @@
             <el-table-column label="订单张数(张)" align="center" key="orderBuyNum" prop="orderBuyNum" v-if="columns[2].visible" :show-overflow-tooltip="true" />
             <el-table-column label="订单人数(人)" align="center" key="totalPeopleNum" prop="totalPeopleNum" v-if="columns[3].visible" :show-overflow-tooltip="true" />
             <el-table-column label="销售金额(元)" align="center" key="orderPrice" prop="orderPrice" v-if="columns[4].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="验票金额(元)" align="center" key="usePrice" prop="usePrice" v-if="columns[5].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="退票人数(人)" align="center" key="backPeopleNum" prop="backPeopleNum" v-if="columns[6].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="退票金额(元)" align="center" key="backPrice" prop="backPrice" v-if="columns[7].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="实际销售金额(元)" align="center" key="realOrderPrice" prop="realOrderPrice" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="验票人数(人)" align="center" key="usePeopleNum" prop="usePeopleNum" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="验票金额(元)" align="center" key="usePrice" prop="usePrice" v-if="columns[6].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="退票人数(人)" align="center" key="backPeopleNum" prop="backPeopleNum" v-if="columns[7].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="退票金额(元)" align="center" key="backPrice" prop="backPrice" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="实际销售金额(元)" align="center" key="realOrderPrice" prop="realOrderPrice" v-if="columns[9].visible" :show-overflow-tooltip="true" />
           </el-table>
   
           <pagination
@@ -120,6 +121,7 @@
           { key: 2, label: `订单张数(张)`, visible: true },
           { key: 3, label: `订单人数(人)`, visible: true },
           { key: 4, label: `销售金额(元)`, visible: true },
+          { key: 5, label: `验票人数(人)`, visible: true },
           { key: 6, label: `验票金额(元)`, visible: true },
           { key: 7, label: `退票人数(人)`, visible: true },
           { key: 8, label: `退票金额(元)`, visible: true },