Merge branch 'M_2.5_1122' into test

src/views/system/goods/add/components/goodsparameter.vue

@@ -20,7 +20,6 @@
         </el-table-column>
         <el-table-column align="center" prop="sl_price" label="结算价">
           <template slot-scope="scope">
-<!--            <span class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>-->
             <span>{{ settleSLPriceFormatter(scope.row.js_price) }}</span>
           </template>
         </el-table-column>
@@ -90,9 +89,7 @@
         </el-table-column>
         <el-table-column align="center" prop="sl_price" label="结算价">
           <template slot-scope="scope">
-            <!--              <el-input size="mini" style="width:90%" v-model="scope.row.hh2" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
-            <span
-              class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
+            <span class="sl-price-span-input">{{ settleSLPriceFormatter(scope.row.js_price) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="price" label="指导价">
@@ -219,8 +216,6 @@ export default {
   },
   created() {
     this.cateFee = this.$store.state.user.cateFee;
-    console.log("刚加载：",this.cateFee);
-    console.log(1111,this.$store.state.user.cateFee)
   },
   mounted() {
     if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
@@ -392,36 +387,25 @@ export default {
 
     /** 结算价格计算 */
     settleSLPriceFormatter(jsPriceVal) {
-      // debugger
+      this.cateFee = this.$store.state.user.cateFee ? this.$store.state.user.cateFee : 0;
+
       let slPriceNum = ""
-      if (jsPriceVal == 0) {
-        jsPriceVal = 0
-      }
-      if (jsPriceVal == "") {
-        jsPriceVal = ''
-      }
-      if (jsPriceVal > 0 && this.cateFee == 0) {
+
+      if (jsPriceVal > 0) {
+        if (this.cateFee == 0) {
           slPriceNum = jsPriceVal
         }
-      if (jsPriceVal > 0 && this.cateFee > 0) {
-        console.log("动态：",this.cateFee);
+        if (this.cateFee > 0) {
           slPriceNum = (10000 - this.cateFee) * jsPriceVal /10000
         }
+      }else if (jsPriceVal == 0) {
+        slPriceNum = 0;
+      }else {
+        slPriceNum = ''
+      }
 
       return slPriceNum
     },
-    settleSLPrice(row,index) {
-      // debugger
-      // let slPriceNum = '';
-      // if (row.js_price > 0) {
-      //   row.sl_price = 0;
-      //   row.sl_price = (10000 - this.cateFee) * row.js_price /10000
-      //   this.$set(this.singleSpecTable,index,row)
-      // }
-      // row.sl_price = (row.js_price * 1000 - this.cateFee)/1000
-      //
-    }
-
   } // methods end
 }
 </script>