From 84f3eaea10605b7343452d59237768e820001afd Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 24 Jun 2021 16:41:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/goods-seller/goodsOperation.vue     | 39 ++++++-------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index e1f6549b..e55795d9 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -405,11 +405,9 @@
         <Button type="primary" @click="save" :loading="submitLoading" v-if="activestep === 1">
           {{ this.goodsId ? "保存" : "保存商品" }}
         </Button>
-        <Button type="primary" @click="saveToDraft('TEMPLATE')" v-if="activestep === 1">
+        <Button type="primary" @click="saveToDraft" v-if="activestep === 1">
           保存为模版
         </Button>
-        <!-- <Button type="primary" @click="saveToDraft('DRAFT')" v-if="activestep === 1 && !isOperationGoods">保存至草稿箱
-        </Button> -->
       </ButtonGroup>
 
     </div>
@@ -1286,7 +1284,6 @@ export default {
         });
         cloneTemp.splice(0, 1);
         result = this.specIterator(result, cloneTemp);
-        // result = this.defaultParams(result);
         this.skuTableData = result;
       }
     },
@@ -1297,7 +1294,8 @@ export default {
             if(res.length) {
               res.forEach(e => {
                 this.skuData.push(e.specName)
-                this.skuVals.push(e.specValue ? e.specValue.split(',') : []) 
+                const vals = e.specValue ? e.specValue.split(',') : []
+                this.skuVals.push(Array.from(new Set(vals)))
               })
             }
           }
@@ -1306,14 +1304,9 @@ export default {
     },
     /** 自动完成表单所需方法*/
     filterMethod(value, option) {
-        return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
     },
-    /**
-     * 添加固有属性
-     */
-    // defaultParams(tableData) {
-    //   return tableData;
-    // },
+
     /**
      * 迭代属性，形成表格
      * result 渲染的数据
@@ -1324,7 +1317,6 @@ export default {
       if (cloneTemp.length > 0) {
         let table = [];
         result.forEach((resItem) => {
-          let tableItem = [];
           cloneTemp[0].spec_values.forEach((valItem) => {
             let obj = cloneObj(resItem);
             obj[valItem.name] = valItem.value;
@@ -1560,29 +1552,22 @@ export default {
       });
     },
     /** 保存为模板 */
-    saveToDraft(saveType) {
-      let showType = saveType === "TEMPLATE" ? "模版" : "草稿";
+    saveToDraft() {
       this.baseInfoForm.skuList = this.skuTableData;
       if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
         this.baseInfoForm.goodsGalleryList =
           this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
       }
       this.baseInfoForm.categoryName = [];
-      this.baseInfoForm.saveType = saveType;
+      this.baseInfoForm.saveType = 'TEMPLATE';
 
       if (this.draftId) {
         this.baseInfoForm.id = this.draftId;
         this.$Modal.confirm({
-          title: "当前" + showType + "已存在",
-          content:
-            "当前" +
-            showType +
-            "已存在，是否保存为新" +
-            showType +
-            "或替换原" +
-            showType,
-          okText: "保存新" + showType,
-          cancelText: "替换旧" + showType,
+          title: "当前模板已存在",
+          content: "当前模板已存在，保存为新模板或替换原模板",
+          okText: "保存新模板",
+          cancelText: "替换旧模板",
           closable: true,
           onOk: () => {
             delete this.baseInfoForm.id;
@@ -1598,7 +1583,7 @@ export default {
       }
 
       this.$Modal.confirm({
-        title: "保存" + showType,
+        title: "保存模板",
         content: "是否确定保存",
         okText: "保存",
         closable: true,

From e0a7bb86a621f14be574000dae9179e3f9ecc4f9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 24 Jun 2021 17:13:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/goods/goods-seller/goodsOperation.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index e55795d9..2d39f1a4 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -67,8 +67,7 @@
         <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
       </p>
       <template v-if="!$route.query.id && draftId">
-        <Divider>已选商品模版:{{goodsTemplates.find(item=>{return item.id == draftId}).goodsName}}</Divider>
-
+        <Divider>已选商品模版:{{checkedTemplate()}}</Divider>
       </template>
     </div>
 
@@ -727,7 +726,8 @@ export default {
         this.logisticsTemplate = res.result;
       }
     })
-    //编辑商品
+   
+    // 编辑商品
     if (this.$route.query.id) {
       this.activestep = 1;
       this.goodsId = this.$route.query.id;
@@ -735,7 +735,7 @@ export default {
       this.selectGoodsType = false;
       
     }
-    //编辑模版
+    // 编辑模板
     else if (this.$route.query.draftId) {
       this.draftId = this.$route.query.draftId;
       this.activestep = 1;
@@ -776,7 +776,14 @@ export default {
       this.GET_GoodsTemplate();
       this.GET_NextLevelCategory();
     },
-
+     // 获取已选模板
+    checkedTemplate () {
+      if(this.goodsTemplates.length) {
+        return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
+      } else {
+        return ""
+      }
+    },
     // 选择商品模板
     handleClickGoodsTemplate(val) {
       this.draftId = val.id;