Merge branch 'master' into sit

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -165,6 +165,7 @@
                 clearable
                 :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"
                 style="width: 100%"
+                @change="stock_change"
                 placeholder="是否库存品"
               >
                 <el-option
@@ -394,7 +395,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-show="ruleForm.is_stock === '1'">
             <el-form-item label="备库起订量" prop="stock_moq" label-width="95px">
               <digital-input
                 :values="ruleForm.stock_moq"
@@ -1141,12 +1142,16 @@ export default {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
       await this.get_all_fee();
+      this.stock_change();
     },
     openEdit(index, sitem) {
       this.modelIndex = index;
       this.sitem = sitem;
       this.showModel = true;
     },
+    stock_change() {
+      this.rulesThis.stock_moq[0].required = this.ruleForm.is_stock === "1";
+    },
     openCostEdit(index, sitem) {
       // const { is_step } = this.ruleForm;
       // if (index === -1 && is_step === "0" && this.ladder_tableData.length > 0) {
@@ -1214,18 +1219,21 @@ export default {
               is_step,
               is_gold_price,
               stock_moq,
+              is_stock,
             } = this.ruleForm;
-            let min = parseInt(this.ladder_tableData[0].min_num),
-              smoq = parseInt(stock_moq);
-            this.ladder_tableData.forEach((si) => {
-              let n = parseInt(si.min_num);
-              min = n < min ? n : min;
-            });
-            console.log(smoq, min, smoq < min);
-            if (smoq < min) {
-              this.$message.warning("备库起订量不能低于成本最低起订量！");
-              this.loading = false;
-              return;
+            if (is_stock === "1") {
+              let min = parseInt(this.ladder_tableData[0].min_num),
+                smoq = parseInt(stock_moq);
+              this.ladder_tableData.forEach((si) => {
+                let n = parseInt(si.min_num);
+                min = n < min ? n : min;
+              });
+              console.log(smoq, min, smoq < min);
+              if (smoq < min) {
+                this.$message.warning("备库起订量不能低于成本最低起订量！");
+                this.loading = false;
+                return;
+              }
             }
             // if (is_step === "0" && this.ladder_tableData.length > 1) {
             //   this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");