Răsfoiți Sursa

盲票销售订单新增订单状态

hwb0 3 ani în urmă
părinte
comite
56f741822f

+ 9 - 5
src/views/order/userTicket/detail.vue

@@ -19,6 +19,10 @@
           </div>
         </div>
         <div class="info-item-content">
+          <div class="info-item-content-one">
+            <div class="title">订单状态:</div>
+            <div class="txt">{{ info.status && JSON.parse(info.status).desc }}</div>
+          </div>
           <div class="info-item-content-one">
             <div class="title">优惠金额:</div>
             <div class="txt">{{ $numberFormat(info.discountAmt) }}元</div>
@@ -80,7 +84,7 @@
         </div>
       </div>
     </div>
-    <div class="info">
+    <div class="info" v-if="info.ticketDetailList instanceof Array && info.ticketDetailList.length > 0 && info.ticketDetailList[0] instanceof Object">
       <table border="1" class="table" bordercolor="#CCC">
         <tr width="20%">
           <th>盲票序列号</th>
@@ -89,10 +93,10 @@
           <th>奖品</th>
         </tr>
         <tr v-for="(item, index) in info.ticketDetailList" :key="index">
-          <td>{{ item.serialNo }}</td>
-          <td>{{ item.status && JSON.parse(item.status).desc }}</td>
-          <td>{{ item.prizeGrade }}</td>
-          <td>{{ item.prizeTitle }}</td>
+          <td>{{ item && item.serialNo }}</td>
+          <td>{{ item && item.status && JSON.parse(item.status).desc }}</td>
+          <td>{{ item && item.prizeGrade }}</td>
+          <td>{{ item && item.prizeTitle }}</td>
         </tr>
       </table>
     </div>

+ 18 - 2
src/views/order/userTicket/index.vue

@@ -87,8 +87,11 @@
       ></right-toolbar>
     </el-row>
     <!-- 订单状态 -->
-    <el-tabs type="card" v-model="state">
-      <el-tab-pane label="全部" name="null"></el-tab-pane>
+    <el-tabs type="card" v-model="state" @tab-click="handleClick">
+      <el-tab-pane label="全部订单" name="null"></el-tab-pane>
+      <el-tab-pane label="待付款" name="0"></el-tab-pane>
+      <el-tab-pane label="已完成" name="1"></el-tab-pane>
+      <el-tab-pane label="已取消" name="-1"></el-tab-pane>
     </el-tabs>
 
     <!-- 列表 -->
@@ -112,6 +115,8 @@
           <div>{{ $numberFormat(row.salePrice) }}</div>
         </template>
       </el-table-column>
+      <el-table-column label="数量" prop="ticketNum" min-width="60" />
+      <el-table-column label="订单状态" prop="status" min-width="95" />
       <el-table-column label="实付金额(元)" min-width="95">
         <template slot-scope="{ row }">
           <div>{{ $numberFormat(row.payAmt) }}</div>
@@ -198,6 +203,7 @@ export default {
             this.list = res.rows;
             this.list.forEach((item) => {
               item.boxType = item.boxType && JSON.parse(item.boxType).desc;
+              item.status = item.status && JSON.parse(item.status).desc;
             });
           }
         })
@@ -206,6 +212,16 @@ export default {
         });
     },
 
+    // 订单切换
+    handleClick(e) {
+      if (e.name == "null") {
+        this.queryParams.status = "";
+      } else {
+        this.queryParams.status = Number(e.name);
+      }
+      this.getList();
+    },
+
     //搜索
     handleQuery() {
       this.pageParams.pageNum = 1;