Parcourir la source

ota 优化修改

LaveyD il y a 1 semaine
Parent
commit
f3eedb7991

+ 63 - 4
src/views/goodsCenter/priceList.vue

@@ -74,6 +74,9 @@
         <el-button
           type="primary"
           @click="getList">搜索</el-button>
+        <el-button
+          type="primary"
+          @click="reportExport">导出</el-button>
         <el-button
           type="primary"
           plain
@@ -166,10 +169,10 @@
                   prop="batchConfigName"
                   label="场次名称"
                 ></el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                   prop="marketPrice"
                   label="市场价"
-                ></el-table-column>
+                ></el-table-column> -->
                 <el-table-column
                   prop="mtPrice"
                   label="美团价"
@@ -232,6 +235,7 @@
         </el-table-column>
         <el-table-column
           label="产品ID"
+          width="150"
           prop="id">
           <template
             slot="header">
@@ -254,7 +258,7 @@
         <el-table-column
           width="80"
           prop="salePrice"
-          label="价">
+          label="售卖价">
         </el-table-column>
         <el-table-column
           width="80"
@@ -287,12 +291,22 @@
         </el-table-column>
         <el-table-column
           width="170"
-          label="游玩日期"
+          label="使用日期"
         >
           <template slot-scope="scope">
             {{ scope.row.useDateStart | formatDate }} 至 {{ scope.row.useDateEnd | formatDate }}
           </template>
         </el-table-column>
+        <el-table-column
+          prop="soledNums"
+          width="80"
+          label="已售">
+          <template
+            slot="header">
+            已售
+            <Tip msg="不包含退票"></Tip>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="totalStock"
           label="总库存">
@@ -302,11 +316,19 @@
         </el-table-column>
         <el-table-column
           prop="xcRealNameType"
+          width="150"
           label="携程出行人模板">
           <template slot-scope="scope">
             {{ scope.row.xcRealNameType | formatXCProductName }}
           </template>
         </el-table-column>
+        <el-table-column
+          prop="realNameType"
+          label="实名制购票">
+          <template slot-scope="scope">
+            <span>{{ scope.row.realNameType === 0 ? '不限' : scope.row.realNameType === 1 ? '一证一人' : '一证多人' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           width="110"
           label="状态">
@@ -611,6 +633,43 @@ export default {
         const batch = this.batchConfigList.find(v => v.id === id)
         return batch ? batch.name : ''
       }
+    },
+    reportExport () {
+      this.$confirm(`是否要导出明细数据`, '确认提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning'
+      }).then(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: true
+        })
+      }).catch(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: false
+        })
+      })
+    },
+    handelExport (params) {
+      this.form.export = true
+      getOTATicketSaleList(params).then(res => {
+        this.$confirm('导出成功,是否去下载页', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$router.push('/queryReport/reportExport')
+        }).catch(() => {})
+      }, () => {
+        this.$notify.error({
+          title: '提示',
+          message: '导出失败'
+        })
+      })
+      this.form.export = false
     }
   }
 }

+ 4 - 0
src/views/queryReport/cancelReport.vue

@@ -128,6 +128,10 @@
           prop="cancelPrice"
           label="退票金额">
         </el-table-column>
+        <el-table-column
+          prop="cancelSettlementPrice"
+          label="结算价">
+        </el-table-column>
       </el-table>
       <el-pagination
         background

+ 5 - 5
src/views/queryReport/checkAndPrintReport.vue

@@ -124,19 +124,19 @@
         </el-table-column>
         <el-table-column
           prop="checkCount"
-          label="检票次数">
+          label="核销张数">
         </el-table-column>
         <el-table-column
           prop="checkPrice"
-          label="检票金额">
+          label="核销金额">
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="checkMarketPrice"
           label="检票市场金额">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="checkSettlementPrice"
-          label="检票结算金额">
+          label="结算价">
         </el-table-column>
       </el-table>
     </div>

+ 7 - 2
src/views/queryReport/orderList.vue

@@ -169,7 +169,8 @@
                   <div class=""><span>票号:</span>{{ scope.row.ticketNo }}</div>
                   <div class=""><span>票种:</span>{{ scope.row.ticketTypeName }}</div>
                   <div class=""><span>产品ID:</span>{{ scope.row.otaProductId }}</div>
-                  <div class=""><span>金额:</span>{{ scope.row.price }}</div>
+                  <div class=""><span>售卖价:</span>{{ scope.row.price }}</div>
+                  <div class=""><span>结算价:</span>{{ scope.row.settlementPrice }}</div>
                   <div class=""><span>状态:</span>
                     <el-tag :type="ticketStatus[scope.row.status]&&ticketStatus[scope.row.status].color">
                       {{ ticketStatus[scope.row.status]&&ticketStatus[scope.row.status].label }}
@@ -297,8 +298,12 @@
         </el-table-column>
         <el-table-column
           prop="price"
-          width="70"
+          width="140"
           label="订单总价">
+          <template slot-scope="scope">
+            <div>售卖价:{{ scope.row.price }}</div>
+            <div>结算价:{{ scope.row.settlementPrice }}</div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="createTime"

+ 12 - 0
src/views/queryReport/salesReport.vue

@@ -124,6 +124,10 @@
           prop="salePrice"
           label="售票金额">
         </el-table-column>
+        <el-table-column
+          prop="settlementPrice"
+          label="售票结算价">
+        </el-table-column>
         <el-table-column
           prop="cancelNum"
           label="退票张数">
@@ -132,6 +136,10 @@
           prop="cancelPrice"
           label="退票金额">
         </el-table-column>
+        <el-table-column
+          prop="cancelSettlementPrice"
+          label="退票结算价">
+        </el-table-column>
         <el-table-column
           prop="actualNum"
           label="实售数量">
@@ -140,6 +148,10 @@
           prop="actualPrice"
           label="实售金额">
         </el-table-column>
+        <el-table-column
+          prop="actualSettlementPrice"
+          label="实售结算价">
+        </el-table-column>
         <!-- <el-table-column
           width="260"
           fixed="right"