dct hai 4 meses
pai
achega
199e9c315f

+ 1 - 0
src/components/GlobalComponents/OrderDetail.vue

@@ -148,6 +148,7 @@
                 <div class=""><span>退款金额:</span>{{ scope.row.cancelPrice }}</div>
                 <div class=""><span>退款申请时间:</span>{{ scope.row.cancelSubmitTime }}</div>
                 <div class=""><span>退款完成时间:</span>{{ scope.row.cancelCompleteTime }}</div>
+                <div class=""><span>是否强制取消:</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
               </template>
             </el-table-column>
             <el-table-column width="160" prop="playDateBegin" label="游玩时间">

+ 9 - 5
src/pages/queryReport/salesQuery.vue

@@ -782,6 +782,7 @@
             <div class=""><span>退款金额:</span>{{ scope.row.cancelPrice }}</div>
             <div class=""><span>退款申请时间:</span>{{ scope.row.cancelSubmitTime }}</div>
             <div class=""><span>退款完成时间:</span>{{ scope.row.cancelCompleteTime }}</div>
+            <div class=""><span>是否强制取消:</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
           </template>
         </el-table-column>
         <el-table-column width="160" prop="playDateBegin" label="游玩时间">
@@ -930,6 +931,7 @@
             <div class=""><span>退款金额:</span>{{ scope.row.cancelPrice }}</div>
             <div class=""><span>退款申请时间:</span>{{ scope.row.cancelSubmitTime }}</div>
             <div class=""><span>退款完成时间:</span>{{ scope.row.cancelCompleteTime }}</div>
+            <div class=""><span>是否强制取消:</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
           </template>
         </el-table-column>
         <el-table-column width="160" prop="playDateBegin" label="游玩时间">
@@ -1072,6 +1074,7 @@
             <div class=""><span>退款金额:</span>{{ scope.row.cancelPrice }}</div>
             <div class=""><span>退款申请时间:</span>{{ scope.row.cancelSubmitTime }}</div>
             <div class=""><span>退款完成时间:</span>{{ scope.row.cancelCompleteTime }}</div>
+            <div class=""><span>是否强制取消:</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
           </template>
         </el-table-column>
         <el-table-column width="160" prop="playDateBegin" label="游玩时间">
@@ -1225,6 +1228,7 @@
             <div class=""><span>退款金额:</span>{{ scope.row.cancelPrice }}</div>
             <div class=""><span>退款申请时间:</span>{{ scope.row.cancelSubmitTime }}</div>
             <div class=""><span>退款完成时间:</span>{{ scope.row.cancelCompleteTime }}</div>
+            <div class=""><span>是否强制取消:</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
           </template>
         </el-table-column>
         <el-table-column width="160" prop="playDateBegin" label="游玩时间">
@@ -1752,11 +1756,11 @@ export default {
         })
 
         this.tableData = res.data.records
-        this.tableData.forEach(v => {
-          if (v.price === 0 && v.payChannel === '现金') {
-            v.payChannel = '免票'
-          }
-        })
+        // this.tableData.forEach(v => {
+        //   if (v.price === 0 && v.payChannel === '现金') {
+        //     v.payChannel = '免票'
+        //   }
+        // })
 
         console.log(this.tableData, 'tableData')
       }).finally(() => {