build

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

@@ -1184,10 +1184,7 @@ export default {
     async submitForm() {
       this.sch_is_noble();
       this.good_type_change();
-      if (this.is_support_stock + "" === "0") {
-        this.$message.warning("该商品为供应商退货业务创建的，不允许改为非库存品！");
-        return;
-      }
+
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (!this.loading) {
@@ -1202,6 +1199,11 @@ export default {
               stock_moq,
               is_stock,
             } = this.ruleForm;
+            if (this.is_support_stock + "" === "0" && is_stock === "0") {
+              this.$message.warning("该商品为供应商退货业务创建的，不允许改为非库存品！");
+              loading = false;
+              return;
+            }
             if (is_stock === "0") {
               const { scode, sdata, smsg } = await this.getSupplerPower();
               if (scode === 0) {