修改

src/components/GlobalComponents/OrderDetail.vue

@@ -33,19 +33,13 @@
         {{ orderData.payChannel }}
       </el-form-item>
       <el-form-item label="支付状态">
-        <el-tag
-          :type="getPayStatus(orderData.payStatus, 'type')"
-          size="normal"
-        >
-          <!-- {{ getPayStatus(orderData.payStatus) }} -->
-             <!-- 由于支付状态较多，且接口返回的状态码不固定，所以这里直接列出所有状态，避免遗漏 -->
-          <div v-if="getPayStatus(orderData.payStatus) == 'CREATE'">已创建</div>
-          <div v-if="getPayStatus(orderData.payStatus) == 'SUBMIT'">已提交</div>
-          <div v-if="getPayStatus(orderData.payStatus) == 'PAYED'">已支付</div>
-          <div v-if="getPayStatus(orderData.payStatus) == 'REFUNDED'">已退款</div>
-          <div v-if="getPayStatus(orderData.payStatus) == 'CLOSED'">订单关闭</div>
-          <div v-if="getPayStatus(orderData.payStatus) == 'FAILED'">支付失败</div>
-        </el-tag>
+        <!-- 由于支付状态较多，且接口返回的状态码不固定，所以这里直接列出所有状态，避免遗漏 -->
+        <div v-if="orderData.payStatus == 'CREATE'">已创建</div>
+        <div v-if="orderData.payStatus == 'SUBMIT'">已提交</div>
+        <div v-if="orderData.payStatus == 'PAYED'">已支付</div>
+        <div v-if="orderData.payStatus == 'REFUNDED'">已退款</div>
+        <div v-if="orderData.payStatus == 'CLOSED'">订单关闭</div>
+        <div v-if="orderData.payStatus == 'FAILED'">支付失败</div>
       </el-form-item>
       <el-form-item label="支付时间">
         {{ orderData.payTime | formatTime }}
@@ -124,26 +118,26 @@
                 </el-table>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketNo')"
-                width="160"
-                prop="ticketNo"
-                label="票号">
+            <el-table-column
+              v-if="isColumnVisible('ticketNo')"
+              width="160"
+              prop="ticketNo"
+              label="票号">
               <template slot-scope="scope">
                 <div class="">{{ scope.row.ticketNo }}</div>
                 <img v-if="scope.row.ticketNoImg" :src="scope.row.ticketNoImg || ''" style="width: 130px;height: 130px;" alt="">
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketTypeName')"
-                width="100"
-                prop="ticketTypeName"
-                label="票种"> </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('unitPrice')"
-                width="80"
-                prop="price"
-                label="单价(￥)">
+            <el-table-column
+              v-if="isColumnVisible('ticketTypeName')"
+              width="100"
+              prop="ticketTypeName"
+              label="票种"> </el-table-column>
+            <el-table-column
+              v-if="isColumnVisible('unitPrice')"
+              width="80"
+              prop="price"
+              label="单价(￥)">
               <template slot-scope="scope">
                 <div class="">{{ scope.row.checkNum ? scope.row.price / scope.row.checkNum : scope.row.price }}</div>
                 <div v-if="scope.row.discountPrice" style="color: #bbb">原价：{{ scope.row.originalPrice }}</div>
@@ -151,26 +145,26 @@
                 <div v-if="scope.row.price !== scope.row.settlementPrice" style="color: #0080ff">结算价：{{ scope.row.settlementPrice }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('subtotal')"
-                width="80"
-                prop="price"
-                label="小计"></el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('status')"
-                width="100"
-                prop="status"
-                label="状态">
+            <el-table-column
+              v-if="isColumnVisible('subtotal')"
+              width="80"
+              prop="price"
+              label="小计"></el-table-column>
+            <el-table-column
+              v-if="isColumnVisible('status')"
+              width="100"
+              prop="status"
+              label="状态">
               <template slot-scope="scope">
                 <!-- 组件新增功能是否向左浮动展示，默认为false不浮动 -->
                 <TicketStatusTag :float-left="true"  :value="scope.row.status"></TicketStatusTag>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('guestInfo')"
-                width="210"
-                prop="guestInfo"
-                label="游客信息">
+            <el-table-column
+              v-if="isColumnVisible('guestInfo')"
+              width="210"
+              prop="guestInfo"
+              label="游客信息">
               <template slot-scope="scope">
                 <div class=""><span>姓名：</span>{{ scope.row.guestName }}</div>
                 <div class=""><span>手机号：</span>{{ scope.row.guestPhone }}</div>
@@ -178,11 +172,11 @@
                 <div class=""><span>证件号码：</span>{{ scope.row.guestIdentify }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketCheckInfo')"
-                width="260"
-                prop="ticketCheckInfo"
-                label="检票信息">
+            <el-table-column
+              v-if="isColumnVisible('ticketCheckInfo')"
+              width="260"
+              prop="ticketCheckInfo"
+              label="检票信息">
               <template slot-scope="scope">
                 <div class=""><span>检票人数：</span>{{ scope.row.checkNum }}</div>
                 <div class=""><span>首次检票时间：</span>{{ scope.row.firstCheckTime }}</div>
@@ -190,11 +184,11 @@
                 <div class=""><span>最近一次检票设备：</span>{{ scope.row.checkerName }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketPrintInfo')"
-                width="260"
-                prop="ticketPrintInfo"
-                label="取票信息">
+            <el-table-column
+              v-if="isColumnVisible('ticketPrintInfo')"
+              width="260"
+              prop="ticketPrintInfo"
+              label="取票信息">
               <template slot-scope="scope">
                 <div class=""><span>取票状态：</span>
                   <el-tag :type="scope.row.isPrint ? 'success' : 'info'">
@@ -206,11 +200,11 @@
                 <div class=""><span>取票自助机：</span>{{ scope.row.printTermName }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketRefundInfo')"
-                width="260"
-                prop="ticketRefundInfo"
-                label="退票信息">
+            <el-table-column
+              v-if="isColumnVisible('ticketRefundInfo')"
+              width="260"
+              prop="ticketRefundInfo"
+              label="退票信息">
               <template slot-scope="scope">
                 <div class=""><span>退款操作人：</span>{{ scope.row.cancelAdminName }}</div>
                 <div class=""><span>退款金额：</span>{{ scope.row.cancelPrice }}</div>
@@ -219,20 +213,20 @@
                 <div class=""><span>是否强制取消：</span>{{ scope.row.isForceCancel ? '是' : '否' }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('playDate')"
-                width="160"
-                prop="playDateBegin"
-                label="游玩时间">
+            <el-table-column
+              v-if="isColumnVisible('playDate')"
+              width="160"
+              prop="playDateBegin"
+              label="游玩时间">
               <template slot-scope="scope">
                 <div v-if="scope.row.batchConfigName"><span>场次：</span>{{ scope.row.batchConfigName || '' }}</div>
                 {{ scope.row.playDateBegin || scope.row.playDateEnd ? `${scope.row.playDateBegin || ''} - ${scope.row.playDateEnd || ''}` : "无限制" }}
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('checkScenic')"
-                min-width="180"
-                label="检票景点">
+            <el-table-column
+              v-if="isColumnVisible('checkScenic')"
+              min-width="180"
+              label="检票景点">
               <template slot-scope="scope">
                 {{ scope.row.ticketCheckScenicList.map(item => item.scenicName).join(',') }}
               </template>
@@ -240,7 +234,7 @@
 
             <!-- 新增功能 -->
             <el-table-column width="240" prop="billingInformation" label="开票信息">
-             <template slot-scope="scope">
+              <template slot-scope="scope">
                 <div class=""><span>开票状态：</span>
                   <el-tag :type="scope.row.isInvoice ? 'success' : 'info'">
                     {{ scope.row.isInvoice ? "已开票" : "未开票" }}
@@ -250,11 +244,11 @@
               </template>
             </el-table-column>
 
-              <el-table-column
-                v-if="isColumnVisible('ticketCardInfo')"
-                width="240"
-                prop="ticketCardInfo"
-                label="卡信息">
+            <el-table-column
+              v-if="isColumnVisible('ticketCardInfo')"
+              width="240"
+              prop="ticketCardInfo"
+              label="卡信息">
               <template slot-scope="scope" v-if="scope.row.card">
                 <div class=""><span>卡片编号：</span>{{ scope.row.card.cardNo }}</div>
                 <div class=""><span>有效时间：</span>{{ scope.row.card.validDateStart }} - {{ scope.row.card.validDateEnd }}</div>
@@ -264,11 +258,11 @@
                 <div class="" v-if="scope.row.card.status === 2"><span>挂失时间：</span>{{ scope.row.card.repealTime }}</div>
               </template>
             </el-table-column>
-              <el-table-column
-                v-if="isColumnVisible('ticketFaceInfo')"
-                width="240"
-                prop="ticketFaceInfo"
-                label="人脸信息">
+            <el-table-column
+              v-if="isColumnVisible('ticketFaceInfo')"
+              width="240"
+              prop="ticketFaceInfo"
+              label="人脸信息">
               <template slot-scope="scope" v-if="scope.row.face">
                 <div class=""><span>有效时间：</span>{{ scope.row.face.validDateStart }} - {{ scope.row.face.validDateEnd }}</div>
                 <div class=""><span>卡片状态：</span>{{ scope.row.face.status === 0 ? '可用' : '不可用' }}</div>
@@ -327,7 +321,7 @@
           </el-table>
 
           <!-- 新增功能：工行分账信息，但if判断需要后续改动 -->
-        <div class="title" v-if="orderData.payContext != null" style="display: flex;justify-content: space-between;margin: 10px 0;">
+          <div class="title" v-if="orderData.payContext != null" style="display: flex;justify-content: space-between;margin: 10px 0;">
             工行分账明细
           </div>
           <el-table v-if="orderData.payContext != null" border :data="checkLogList" :max-height="200">
@@ -356,7 +350,6 @@
             <el-table-column prop="refundCode" label="退款错误代码"> </el-table-column>
             <el-table-column prop="refundMsg" label="退款错误信息"> </el-table-column>
           </el-table>
-
         </el-tab-pane>
         <el-dialog
           title="选择显示列"
@@ -376,7 +369,7 @@
           </el-form-item>
           <template v-if="orderData.payContext">
             <div class="title">支付信息列表</div>
-            <el-table border :data="orderData.payContext.payList">
+            <el-table border :data="orderData.payContext.payList || []">
               <el-table-column prop="orderNo" label="支付订单号">
               </el-table-column>
               <el-table-column prop="payStatus" label="支付状态">
@@ -397,18 +390,13 @@
               </el-table-column>
             </el-table>
             <div class="title">退款信息</div>
-            <el-table border :data="orderData.payContext.payRefundList">
+            <el-table border :data="orderData.payContext.payRefundList || []">
               <el-table-column prop="status" label="退款状态">
                 <!-- 转义 -->
-                <el-tag
-                 :type="getPayStatus(orderData.payContext.payRefundList.status, 'type')"
-                  size="normal">
-          <!-- {{ getPayStatus(orderData.payStatus) }} -->
-          <div v-if="getPayStatus(orderData.payContext.payRefundList.status) == 'SUBMIT'">已提交</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundList.status) == 'UNKNOWN'">未知</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundList.status) == 'SUCCESS'">成功</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundList.status) == 'FAILURE'">失败</div>
-        </el-tag>
+                <div v-if="orderData.payContext.payRefundList.status == 'SUBMIT'">已提交</div>
+                <div v-if="orderData.payContext.payRefundList.status == 'UNKNOWN'">未知</div>
+                <div v-if="orderData.payContext.payRefundList.status == 'SUCCESS'">成功</div>
+                <div v-if="orderData.payContext.payRefundList.status == 'FAILURE'">失败</div>
               </el-table-column>
               <el-table-column prop="refundFee" label="退款金额">
               </el-table-column>
@@ -424,20 +412,17 @@
               </el-table-column>
             </el-table>
             <div class="title">退款明细</div>
-            <el-table border :data="orderData.payContext.payRefundTaskList">
+            <el-table
+              border
+              :data="orderData.payContext.payRefundTaskList || []">
               <el-table-column prop="status" label="退款明细状态">
                 <!-- 转义 -->
-                  <el-tag
-                 :type="getPayStatus(orderData.payRefundTaskList.status, 'type')"
-                  size="normal">
-          <!-- {{ getPayStatus(orderData.payStatus) }} -->
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'CREATE'">已创建</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'NEED_RETRY'">待重试</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'UNKNOWN'">未知</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'REFUND_SUCCESS'">退款成功</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'SUCCESS'">退款完成</div>
-          <div v-if="getPayStatus(orderData.payContext.payRefundTaskList.status) == 'FAILURE'">失败</div>
-        </el-tag>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'CREATE'">已创建</div>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'NEED_RETRY'">待重试</div>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'UNKNOWN'">未知</div>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'REFUND_SUCCESS'">退款成功</div>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'SUCCESS'">退款完成</div>
+                <div v-if="orderData.payContext.payRefundTaskList.status == 'FAILURE'">失败</div>
               </el-table-column>
               <el-table-column prop="refundFee" label="退款金额">
               </el-table-column>