From 0477d04bbd885c8e21b3a834de59a5b38ad40d24 Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Wed, 21 Aug 2024 17:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=20?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E7=BC=96=E7=A0=81=E5=8D=B3=E4=B8=BA=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E7=BC=96=E7=A0=81=0D=E7=BC=96=E8=BE=91=E5=95=86?=
 =?UTF-8?q?=E5=95=86=E5=93=81=20=20=E8=A7=84=E6=A0=BC=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=BA=E6=9C=80=E7=BB=88=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?;=20=E7=BC=96=E8=BE=91=E5=95=86=E5=93=81=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99;=0D=E7=BB=84=E5=90=88=E5=95=86=E5=93=81=20?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=97=20=E6=94=B9=E4=B8=BA=20=E5=8F=AF?=
 =?UTF-8?q?=E5=94=AE=E5=BA=93=E5=AD=98=EF=BC=9B=E7=BB=84=E5=90=88=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F,=E4=B8=BB=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA(=E4=B9=9F=E5=B0=B1=E6=98=AF=E4=BB=80?=
 =?UTF-8?q?=E4=B9=88=E9=83=BD=E4=B8=8D=E6=98=BE=E7=A4=BA),children=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/goods/addgoods/addgoods.vue     |  6 +++---
 resources/frontend/src/views/goods/combination.vue     | 10 +++++++---
 resources/frontend/src/views/goods/editgoods.vue       |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/frontend/src/views/goods/addgoods/addgoods.vue b/resources/frontend/src/views/goods/addgoods/addgoods.vue
index f75724a..a6caccf 100644
--- a/resources/frontend/src/views/goods/addgoods/addgoods.vue
+++ b/resources/frontend/src/views/goods/addgoods/addgoods.vue
@@ -72,8 +72,8 @@
             <el-input v-model="item.sale_stock" placeholder="可售库存">
             </el-input>
           </el-form-item>
-          <el-form-item label="规格编码：">
-            <el-input v-model="item.sku_code" placeholder="不输入自动生成"></el-input>
+          <el-form-item label="最终编码：">
+            <el-input v-model="item.external_sku_id" placeholder="不输入自动生成"></el-input>
           </el-form-item>
           <el-button type="danger" @click="handleDelete(i)" icon="el-icon-delete">删除</el-button>
         </div>
@@ -222,7 +222,7 @@
       handleAdd() {
         let sku = {
           title: "",
-          sku_code: "",
+          external_sku_id: "",
           status: "0",
           num: "0",
           cost: "0",
diff --git a/resources/frontend/src/views/goods/combination.vue b/resources/frontend/src/views/goods/combination.vue
index d865f6c..1aa3c1d 100644
--- a/resources/frontend/src/views/goods/combination.vue
+++ b/resources/frontend/src/views/goods/combination.vue
@@ -40,7 +40,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="num" label="组合数量"></el-table-column>
+        <el-table-column label="实际库存">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.children">{{ scope.row.stock }}</span>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="reference_price" label="售价"></el-table-column> -->
         <!-- <el-table-column sortable label="今日7点以后订单">
             <template slot-scope="scope">
@@ -60,8 +64,8 @@
             </template>
         </el-table-column> -->
         <!-- <el-table-column sortable prop="total_orders_num" label="累计订单"></el-table-column> -->
-        <el-table-column sortable prop="stock" label="库存"></el-table-column>
-        <el-table-column prop="status" label="状态"> </el-table-column>
+        <el-table-column sortable prop="sale_stock" label="可售库存"></el-table-column>
+        <el-table-column prop="status" label="状态"></el-table-column>
         <el-table-column label="操作" width="130">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row.id)">编辑</el-button>
diff --git a/resources/frontend/src/views/goods/editgoods.vue b/resources/frontend/src/views/goods/editgoods.vue
index f7aff3b..3e219e8 100644
--- a/resources/frontend/src/views/goods/editgoods.vue
+++ b/resources/frontend/src/views/goods/editgoods.vue
@@ -49,8 +49,8 @@
                     <el-form-item label="规格名称：">
                         <el-input placeholder="规格名称" v-model="goodsData.title"></el-input>
                     </el-form-item>
-                    <el-form-item label="规格编码：">
-                        <el-input v-model="goodsData.sku_code" placeholder="规格编码" disabled></el-input>
+                    <el-form-item label="最终编码：">
+                        <el-input v-model="goodsData.external_sku_id" placeholder="规格编码" disabled></el-input>
                     </el-form-item>
                     <el-form-item label="商品状态：">
                         <el-select v-model="goodsData.status">
@@ -124,7 +124,7 @@ export default {
                 num: "",
                 cost: "",
                 sale_stock: '',
-                sku_code: "",
+                external_sku_id: "",
                 thumb_url: [],
                 goods: {
                     img_url: "",
@@ -238,7 +238,7 @@ export default {
             };
             let sku = {
                 title: this.goodsData.title,
-                sku_code: this.goodsData.sku_code,
+                external_sku_id: this.goodsData.external_sku_id,
                 status: this.goodsData.status,
                 num: this.goodsData.num,
                 cost: this.goodsData.cost,