From 14e466918cbc6d028464a5626e46e9b21298bef4 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Fri, 22 Sep 2023 15:49:19 +0800
Subject: [PATCH] submit

---
 pages/order-goods/index.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 03b917a..0ca3867 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -4,7 +4,7 @@
       <template #left>
         <u-action-sheet
             :show="show"
-            :actions="this.statusValue.map(x=>({name:x.label,value:x.value}))"
+            :actions="statusValue.map(x=>({name:x.label,value:x.value}))"
             title="请选择状态"
             @close="show = false"
             @select="statusSelect"
@@ -49,24 +49,24 @@
             <div class="wrap1_2_1">{{item.artworkName}}</div>
             <div class="wrap1_2_2">订单号:{{item.artworkName}}</div>
             <div class="wrap1_2_3">{{item.artworkSquareSize}}平尺</div>
-            <div class="wrap1_2_4">{{item.startAt.replaceAll('-','.')}}-{{item.endAt.replaceAll('-','.')}}</div>
+            <div class="wrap1_2_4">{{item.startAt}}-{{item.endAt}}</div>
           </div>
-          <div class="wrap1_3" :class="[`status${item.status}`]">
-            <div class="wrap1_3_1" v-if="item.status===4">
+          <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
+            <div class="wrap1_3_1" v-if="item.artworkStatus===4">
               <div class="wrap1_3_1_1">2023.09.28</div>
               <div class="wrap1_3_1_2">已超时</div>
               <div class="wrap1_3_1_3">点击补款</div>
             </div>
-            <div class="wrap1_3_3" v-if="item.status!==4">
-              <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.status).label }}</div>
+            <div class="wrap1_3_3" v-if="item.artworkStatus!==4">
+              <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
             </div>
             <div class="wrap1_3_2">
               <div class="wrap1_3_2_1">货架号:</div>
-              <div class="wrap1_3_2_2">12-02-13</div>
+              <div class="wrap1_3_2_2">{{item.shelvesNum}}</div>
             </div>
           </div>
 
-          <div class="wrap1_4" v-if="item.isRight&&item.status===5">
+          <div class="wrap1_4" v-if="item.isRight&&item.artworkStatus===5">
             <image style="width: 80rpx;height: 80rpx" src="../../static/zu154@3x.png"></image>
           </div>
         </div>
@@ -90,7 +90,7 @@ export default {
       startX: 0,
       windowWidth: 0,
       page: 1,
-      status: 0,
+      artworkStatus: 0,
       pageSize: 999,
       mainList: [],
       statusValue: [{label: '全部状态', value: 0}, {label: '未入库', value: 1}, {
@@ -118,7 +118,7 @@ export default {
       this.getData()
     },
     statusSelect(data) {
-      this.status = data.value
+      this.artworkStatus = data.value
       this.getData()
     },
     openStatus() {
@@ -131,7 +131,7 @@ export default {
       const data = {
         page: this.page, //分页
         pageSize: this.pageSize, //每页数据量
-        status: this.status, //状态(1-未入库  2-已入库 3-即将到期 4-超时 5-已取货)
+        artworkStatus: this.artworkStatus, //状态(1-未入库  2-已入库 3-即将到期 4-超时 5-已取货)
         mobileKey: this.mobileKey
       }
       const res = await postDataByParams('/api/warehouse/list', data)