From 5608d7569bf306477faa8c8701c100b3429e0e25 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Sat, 12 Oct 2024 10:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/components/stockHistory.vue | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/product/components/stockHistory.vue b/src/views/product/components/stockHistory.vue
index af12121..9fbdbbf 100644
--- a/src/views/product/components/stockHistory.vue
+++ b/src/views/product/components/stockHistory.vue
@@ -17,7 +17,7 @@
                             {{ scope.row.leftNumber + scope.row.stockNumber }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="销量" prop="saleNumber"></el-table-column>
+                    <el-table-column label="销量" prop="stockNumber"></el-table-column>
                     <el-table-column label="订单编号" prop="orderNo">
                         <template v-slot="scope">
                             <router-link
@@ -45,9 +45,8 @@
                             {{ `${scope.row.leftNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="手动减少" prop="subNumber"></el-table-column>
-                    <el-table-column label="销售量" prop="saleNumber"></el-table-column>
-                    <el-table-column label="报损" prop="lossNumber"></el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
                     <el-table-column label="操作人" prop="operator"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作时间" prop="updatedAt">
@@ -69,7 +68,8 @@
                             {{ `${scope.row.leftNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="手动减少" prop="subNumber"></el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
                     <el-table-column label="操作人" prop="operator"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作时间" prop="updatedAt">
@@ -91,7 +91,7 @@
                             {{ `${scope.row.leftNumber + scope.row.stockNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="报损数量" prop="lossNumber"></el-table-column>
+                    <el-table-column label="报损数量" prop="stockNumber"></el-table-column>
                     <el-table-column label="报损人" prop="operator"></el-table-column>
                     <el-table-column label="图片" prop="coverImg">
                         <template v-slot="scope">
@@ -122,8 +122,8 @@
                             {{ `${scope.row.leftNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="手动增加" prop="addNumber"></el-table-column>
-                    <el-table-column label="退货" prop="refundNumber"></el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
                     <el-table-column label="操作人" prop="operator"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作时间" prop="updatedAt">
@@ -145,7 +145,8 @@
                             {{ `${scope.row.leftNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="手动增加" prop="addNumber"></el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
                     <el-table-column label="操作人" prop="operator"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作时间" prop="updatedAt">
@@ -167,7 +168,15 @@
                             {{ `${scope.row.leftNumber}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="退货" prop="refundNumber"></el-table-column>
+                    <el-table-column label="退货数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="订单编号" prop="orderNo">
+                        <template v-slot="scope">
+                            <router-link
+                                :to="{ path: '/order_manage/order_list', query: { orderNo: scope.row.orderNo } }">
+                                <el-link type="primary">{{ scope.row.orderNo }}</el-link>
+                            </router-link>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作人" prop="operator"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作时间" prop="updatedAt">