From 57e44a6d6a7690091c5606f070e7fcfaf0182e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Thu, 26 May 2022 10:41:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sales/product.js     | 12 ++++++++++++
 src/views/sales/product/form/step1.vue | 13 ++++++-------
 src/views/sales/product/form/step2.vue | 16 +++++++---------
 vite.config.js                         |  3 ++-
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/store/modules/sales/product.js b/src/store/modules/sales/product.js
index d5159be..ad9b843 100644
--- a/src/store/modules/sales/product.js
+++ b/src/store/modules/sales/product.js
@@ -112,6 +112,18 @@ const actions = {
         if (data.limit === 0) {
             delete data.singleBuyLimit;
         }
+        data.virtualProductModifyDTOList = [
+            ...data.fileList.map((item) => {
+                return {
+                    shipType: 1,
+                    shipContent: item,
+                };
+            }),
+            {
+                shipType: 2,
+                shipContent: data.autoSend,
+            },
+        ];
         let res = await save(data);
         if (res) {
             ElMessage.success('保存成功');
diff --git a/src/views/sales/product/form/step1.vue b/src/views/sales/product/form/step1.vue
index ce653db..70e7843 100644
--- a/src/views/sales/product/form/step1.vue
+++ b/src/views/sales/product/form/step1.vue
@@ -17,7 +17,7 @@
                     />
                 </el-form-item>
                 <el-form-item label="商品类型" prop="productType">
-                    <el-radio-group v-model="form.productType" :opts="opts.type" />
+                    <el-radio-group v-model="form.productType" :disabled="!!form.id" :opts="opts.type" />
                 </el-form-item>
                 <el-form-item label="商品名称" prop="name">
                     <el-input v-model="form.name" maxlength="50" />
@@ -36,12 +36,7 @@
                     <el-radio-group v-model="form.postage" :opts="opts.postage" />
                     <el-input-number v-show="form.postage === 0" v-model="form.remoteAreaPostage" :min="0" />
                 </el-form-item>
-                <el-form-item
-                    v-if="form.productType === 2"
-                    label="自动发货内容"
-                    prop="virtualProductModifyDTOList"
-                    required="true"
-                >
+                <el-form-item v-if="form.productType === 2" label="自动发货内容" prop="virtualProductModifyDTOList">
                     <el-upload-file
                         v-model="form.fileList"
                         config-id="product"
@@ -132,6 +127,10 @@
                 if (id && id !== state.form.id) {
                     let res = await store.dispatch('product/detail', id);
                     res.pictureList = res.pictureList || [res.mainPicture];
+                    res.fileList = res.virtualProductVOList
+                        ?.filter((item) => item.shipType === 1)
+                        .map((item) => item.shipContent);
+                    res.autoSend = res.virtualProductVOList?.find((item) => item.shipType === 2)?.shipContent;
                     Object.assign(state.form, res);
                 }
             };
diff --git a/src/views/sales/product/form/step2.vue b/src/views/sales/product/form/step2.vue
index dcffa29..57259e2 100644
--- a/src/views/sales/product/form/step2.vue
+++ b/src/views/sales/product/form/step2.vue
@@ -1,7 +1,7 @@
 <template>
     <div v-loading="loading" class="step-container">
         <el-scrollbar class="step-content">
-            <el-form>
+            <el-form v-if="form.productType === 1">
                 <el-form-item label="属性规格">
                     <el-input v-model="skuName" placeholder="如：尺寸、颜色等" style="width: 200px">
                         <template #append>
@@ -64,16 +64,14 @@
                 </el-table-column>
                 <el-table-column align="center" header-align="center" label="增减库存" prop="stockChange" width="160px">
                     <template #default="{ row }">
-                        <el-input-number v-model="row.stockChange" @change="handleStockChange(row)" />
+                        <el-input-number v-if="row.id" v-model="row.stockChange" @change="handleStockChange(row)" />
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" header-align="center" label="改后库存" prop="stockAfter" width="160px">
+                    <template #default="{ row }">
+                        {{ row.id ? stockAfter : row.stock }}
                     </template>
                 </el-table-column>
-                <el-table-column
-                    align="center"
-                    header-align="center"
-                    label="改后库存"
-                    prop="stockAfter"
-                    width="160px"
-                />
                 <el-table-column
                     align="center"
                     header-align="center"
diff --git a/vite.config.js b/vite.config.js
index 0147676..2f4b2a2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -24,8 +24,9 @@ export default (configEnv) => {
                     // target: 'http://192.168.10.5:4500', // 高玉
                     // target: 'http://192.168.10.67:8090', // 罗战
                     // target: 'http://192.168.10.93:8090', // 周渺
+                    target: 'http://192.168.10.124:8090', // 舒梦娇
                     // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
-                    target: 'https://you-gateway.mashibing.com', // 生产环境
+                    // target: 'https://you-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),
                 },