feat:1.销售添加是否生产 2.生产订单添加备注

liding

2026-04-10 c05b81c7f50df80ab247a05f9f92af2d799e77cd

 src/views/inventoryManagement/stockManagement/New.vue

@@ -31,17 +31,40 @@
        </el-form-item>

        <el-form-item
            label="料号"
            prop="materialCode"
        >
          <el-input v-model="formState.materialCode"  disabled />
        </el-form-item>

        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>

        <el-form-item label="批号" prop="batchNo">
          <el-input
            v-model="formState.batchNo"
            clearable
            placeholder="可输入批号，留空将自动生成"
          />
        </el-form-item>

        <el-form-item
            label="数量"
            label="库存数量"
            prop="qualitity"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="0" style="width: 100%" />
          <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
        </el-form-item>

        <el-form-item
            v-if="type === 'qualified'"
            label="库存预警数量"
            prop="warnNum"
        >
          <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
        </el-form-item>

        <el-form-item label="备注" prop="remark">
@@ -69,11 +92,18 @@
import {ref, computed, getCurrentInstance} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";

const props = defineProps({
  visible: {
    type: Boolean,
    required: true,
  },

  type: {
    type: String,
    required: true,
    default: 'qualified',
  },
});

@@ -85,8 +115,11 @@
  productModelId: undefined,
  productName: "",
  productModelName: "",
  materialCode: "",
  unit: "",
  batchNo: "",
  qualitity: 0,
  warnNum: 0,
  remark: '',
});

@@ -110,7 +143,12 @@
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    materialCode: "",
    unit: "",
    batchNo: "",
    qualitity: 0,
    warnNum: 0,
    remark: "",
  };
  isShow.value = false;
};
@@ -119,12 +157,12 @@
const handleProductSelect = async (products) => {
  if (products && products.length > 0) {
    const product = products[0];
    console.log(product)
    formState.value.productId = product.productId;
    formState.value.productName = product.productName;
    formState.value.productModelName = product.model;
    formState.value.productModelId = product.id;
    formState.value.unit = product.unit;
    formState.value.materialCode = product.materialCode;
    showProductSelectDialog.value = false;
    // 触发表单验证更新
    proxy.$refs["formRef"]?.validateField('productModelId');
@@ -143,13 +181,28 @@
        proxy.$modal.msgError("请选择规格");
        return;
      }
      createStockInventory(formState.value).then(res => {
        // 关闭模态框
        isShow.value = false;
        // 告知父组件已完成
        emit('completed');
        proxy.$modal.msgSuccess("提交成功");
      })
      const payload = { ...formState.value };
      const bn = (payload.batchNo || "").trim();
      payload.batchNo = bn;

      if (props.type === 'qualified') {
        createStockInventory(payload).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      } else {
        createStockUnInventory(payload).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      }

    }
  })
};