From 9096ea7ff2f4df147eb7f2de72753fc3bcaeac8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 29 Oct 2020 11:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/addProduct/addProduct.html          |  5 +++
 .../components/goods/addProduct/addProduct.js | 36 +++++++++++++++++++
 .../goods/editProduct/editProduct.html        |  4 +++
 .../goods/editProduct/editProduct.js          | 26 ++++++++++++++
 .../goods/productManage/productManage.html    |  4 +--
 5 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/public/components/goods/addProduct/addProduct.html b/public/components/goods/addProduct/addProduct.html
index 09d002f34..a8075ba83 100644
--- a/public/components/goods/addProduct/addProduct.html
+++ b/public/components/goods/addProduct/addProduct.html
@@ -144,6 +144,11 @@
                     <button class="btn-white btn btn-xs"
                       v-on:click="_openDeleteProductSpec(productSpec)">删除</button>
                   </div>
+
+                  <div class="btn-group" v-if="productSpec.isDefault != 'T'">
+                    <button class="btn-white btn btn-xs"
+                      v-on:click="_doDefaultProductSpec(addProductInfo,productSpec)">默认规格</button>
+                  </div>
                 </td>
 
               </tr>
diff --git a/public/components/goods/addProduct/addProduct.js b/public/components/goods/addProduct/addProduct.js
index 3c3ef2b71..c5a000292 100644
--- a/public/components/goods/addProduct/addProduct.js
+++ b/public/components/goods/addProduct/addProduct.js
@@ -26,6 +26,14 @@
 
             }
         },
+        watch: {
+            "addProductInfo.productSpecs": {
+                deep: true,
+                handler: function () {
+                    
+                }
+            }
+        },
         _initMethod: function () {
             $that._listAddProductCategorys();
 
@@ -148,12 +156,31 @@
                 });
             },
             saveProductInfo: function () {
+                let hasDefault = false;
+                vc.component.addProductInfo.productSpecs.forEach(item =>{
+                    if(item.isDefault != 'T' && item.isDefault != 'F'){
+                        hasDefault = false;
+                        return ;
+                    }
+                    if(item.isDefault == 'T'){
+                        hasDefault = true;
+                    }
+                });
+
+                if(!hasDefault){
+                    vc.toast("未选择默认规格");
+
+                    return;
+                }
+
+
                 if (!vc.component.addProductValidate()) {
                     vc.toast(vc.validate.errInfo);
 
                     return;
                 }
 
+               
                 vc.component.addProductInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
                 if (vc.notNull($props.callBackListener)) {
@@ -302,6 +329,15 @@
                 if (index > -1) { 
                     _productSpecs.splice(index, 1); 
                 }
+            },
+            _doDefaultProductSpec:function(_product,_defaultProductSpec){
+
+                _product.productSpecs.forEach(item => {
+                    item.isDefault = "F";
+                });
+                _defaultProductSpec.isDefault="T";
+
+                $that.addProductInfo.productSpecs = JSON.parse(JSON.stringify(_product.productSpecs));
             }
         }
     });
diff --git a/public/components/goods/editProduct/editProduct.html b/public/components/goods/editProduct/editProduct.html
index 97ec5a149..61b57c9cf 100644
--- a/public/components/goods/editProduct/editProduct.html
+++ b/public/components/goods/editProduct/editProduct.html
@@ -144,6 +144,10 @@
                     <button class="btn-white btn btn-xs"
                       v-on:click="_openDeleteProductSpec(productSpec)">删除</button>
                   </div>
+                  <div class="btn-group" v-if="productSpec.isDefault != 'T'">
+                    <button class="btn-white btn btn-xs"
+                      v-on:click="_doEditDefaultProductSpec(editProductInfo,productSpec)">默认规格</button>
+                  </div>
                 </td>
 
               </tr>
diff --git a/public/components/goods/editProduct/editProduct.js b/public/components/goods/editProduct/editProduct.js
index b65b605a4..8f24aa763 100644
--- a/public/components/goods/editProduct/editProduct.js
+++ b/public/components/goods/editProduct/editProduct.js
@@ -145,6 +145,22 @@
                 });
             },
             _editProductInfo: function () {
+                let hasDefault = false;
+                vc.component.editProductInfo.productSpecs.forEach(item =>{
+                    if(item.isDefault != 'T' && item.isDefault != 'F'){
+                        hasDefault = false;
+                        return ;
+                    }
+                    if(item.isDefault == 'T'){
+                        hasDefault = true;
+                    }
+                });
+
+                if(!hasDefault){
+                    vc.toast("未选择默认规格");
+
+                    return;
+                }
                 if (!vc.component.editProductValidate()) {
                     vc.toast(vc.validate.errInfo);
 
@@ -183,6 +199,7 @@
 
                 let _productCategorys = $that.editProductInfo.productCategorys;
                 vc.component.editProductInfo = {
+                    productId: '',
                     categoryId: '',
                     prodName: '',
                     prodDesc: '',
@@ -338,6 +355,15 @@
                     }
                 );
             },
+            _doEditDefaultProductSpec:function(_product,_defaultProductSpec){
+
+                _product.productSpecs.forEach(item => {
+                    item.isDefault = "F";
+                });
+                _defaultProductSpec.isDefault="T";
+
+                $that.addProductInfo.editProductInfo = JSON.parse(JSON.stringify(_product.productSpecs));
+            }
         }
     });
 
diff --git a/public/pages/goods/productManage/productManage.html b/public/pages/goods/productManage/productManage.html
index 3c15abe39..f9e93eeec 100644
--- a/public/pages/goods/productManage/productManage.html
+++ b/public/pages/goods/productManage/productManage.html
@@ -63,7 +63,7 @@
                                 <th class="text-center">商品名称</th>
                                 <th class="text-center">销量</th>
                                 <th class="text-center">库存</th>
-                                <th class="text-center">产品条码</th>
+                                <th class="text-center">价格</th>
                                 <th class="text-center">排序</th>
                                 <th class="text-center">状态</th>
                                 <th class="text-right">操作</th>
@@ -80,7 +80,7 @@
                                 <td class="text-center">{{product.prodName}}</td>
                                 <td class="text-center">{{product.sales}}</td>
                                 <td class="text-center">{{product.stock}}</td>
-                                <td class="text-center">{{product.barCode}}</td>
+                                <td class="text-center">{{product.defaultSpecValue.price}}</td>
                                 <td class="text-center">{{product.sort}}</td>
                                 <th class="text-center">{{product.stateName}}</th>
                                 <td class="text-right">