Merge branch 'master' of http://120.27.146.32:8888/wangfulong/shop-new

src/views/system/goods/add/index.vue

@@ -15,7 +15,7 @@
         :options="option"
         v-model="SSQLists"
         :props='propsOptions'
-        @change="searchChange" 
+        @change="searchChange"
         style="width:300px;"
         filterable></el-cascader>
       </div>
@@ -57,7 +57,7 @@
             </p>
             <GoodsSpecifications v-show="radioguide==2" ref="goodsspecifications" :specificationsdata="specificationsdata" @calcSpeTable="calcSpeTable"/>
             <!--            <keep-alive>-->
-            <GoodsParameter :key="keyvalue" ref="goodsparameter" :parameterdata="parameterdata"/> 
+            <GoodsParameter :key="keyvalue" ref="goodsparameter" :parameterdata="parameterdata"/>
             <!--            </keep-alive>-->
           </div>
         </div>
@@ -252,7 +252,7 @@
             arr[2] = res.data.category_three_id;
             this.goodsinfodata.categoryList = arr;
 
-            
+
 
             // console.log(260,this.goodsinfodata.producing_area_id_list,this.goodsinfodata.deliver_area_id_list)
 
@@ -646,8 +646,8 @@
           } else if( Number(slingleSpeObj['js_price'])> Number(slingleSpeObj['price'])) {
                 goodsPriceMsg = '[ 商品售价 ]中，销售指导价不能低于供货结算价'
                 isGoodsPrice = false;
-            
-          }else if( Number(itemObj['sc_price'])< Number(itemObj['js_price'])) {
+
+          }else if( Number(slingleSpeObj['sc_price'])< Number(slingleSpeObj['js_price'])) {
                 goodsPriceMsg = '[ 商品售价 ]中，市场划线价价不能低于供货结算价'
                 isGoodsPrice = false;
               }else {
@@ -825,11 +825,11 @@ debugger
           delete this.goodsAllData.stock;
           delete this.goodsAllData.weight;
         }else {
-          this.goodsAllData.sc_price = Number(this.cal.accMul(this.goodsAllData.sc_price,100)) 
+          this.goodsAllData.sc_price = Number(this.cal.accMul(this.goodsAllData.sc_price,100))
           this.goodsAllData.price = Number(this.cal.accMul(this.goodsAllData.price,100))
           this.goodsAllData.js_price = Number(this.cal.accMul(this.goodsAllData.js_price,100))
           debugger
-          this.goodsAllData.prime_cost = Number(this.cal.accMul(this.goodsAllData.prime_cost,100)) 
+          this.goodsAllData.prime_cost = Number(this.cal.accMul(this.goodsAllData.prime_cost,100))
           this.goodsAllData.stock = Number(this.goodsAllData.stock);
           this.goodsAllData.stock_warning = Number(this.goodsAllData.stock_warning);
           this.goodsAllData.bar_code = Number(this.goodsAllData.bar_code);