huminmin
7 小时以前 08e38ede28f7cf8c971f84bff3a03102882a8a4b
增加料号显示
已修改6个文件
67 ■■■■ 文件已修改
src/views/basicData/product/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/New.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/Subtract.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/nonconformingManagement/components/formDia.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/index.vue
@@ -140,10 +140,10 @@
      >
        <el-row>
          <el-col :span="24">
            <el-form-item label="物料编号:" prop="materialCode">
            <el-form-item label="料号:" prop="materialCode">
              <el-input
                  v-model="modelForm.materialCode"
                  placeholder="请输入物料编号"
                  placeholder="请输入料号"
                  clearable
                  @keydown.enter.prevent
              />
@@ -214,7 +214,7 @@
const expandedKeys = ref([]);
const tableColumn = ref([
  {
    label: "物料编号",
    label: "料号",
    prop: "materialCode",
  },
  {
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -83,8 +83,14 @@
        </el-col>
      </el-row>
      <el-row v-if="isInventoryApproval">
        <el-col :span="24">
        <el-col :span="12">
          <el-form-item label="料号:">
            <el-tag type="info">
              {{ currentStockIn.materialCode || '-' }}
            </el-tag>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="生产订单号:">
            <el-tag type="info">
              {{ currentStockIn.npsNo || '-' }}
@@ -206,6 +212,7 @@
                <el-table :data="currentPurchase.productData || []" border style="width: 100%">
                  <el-table-column prop="productCategory" label="产品名称" />
                  <el-table-column prop="specificationModel" label="规格型号" />
                  <el-table-column prop="materialCode" label="料号" />
                  <el-table-column prop="unit" label="单位" />
                  <el-table-column prop="quantity" label="数量" />
                  <el-table-column prop="taxInclusiveUnitPrice" label="含税单价">
src/views/inventoryManagement/stockManagement/New.vue
@@ -31,6 +31,13 @@
        </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"
        >
@@ -100,6 +107,7 @@
  productModelId: undefined,
  productName: "",
  productModelName: "",
  materialCode: "",
  unit: "",
  qualitity: 0,
  warnNum: 0,
@@ -140,6 +148,7 @@
    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');
src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -31,6 +31,13 @@
        </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"
        >
@@ -111,6 +118,7 @@
  productModelId: undefined,
  productName: "",
  model: "",
  materialCode: "",
  unit: "",
  qualitity: 0,
  remark: '',
@@ -151,6 +159,7 @@
    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');
src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -43,6 +43,11 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="料号:" prop="materialCode">
              <el-input v-model="form.materialCode" placeholder="请输入" disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="单位:" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" clearable/>
            </el-form-item>
@@ -52,8 +57,7 @@
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员:" prop="checkName">
              <el-select v-model="form.checkName" placeholder="请选择" clearable style="width: 100%">
@@ -74,8 +78,7 @@
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="不合格现象:" prop="defectivePhenomena">
              <el-input v-model="form.defectivePhenomena" placeholder="请输入" clearable/>
@@ -88,8 +91,7 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="处理人:" prop="dealName">
              <el-select v-model="form.dealName" placeholder="请选择" clearable style="width: 100%">
@@ -148,6 +150,7 @@
    productId: "",
    model: "",
    unit: "",
    materialCode: "",
    quantity: "",
    checkCompany: "",
    checkResult: "",
@@ -198,6 +201,7 @@
      productId: '',
      model: '',
      unit: '',
      materialCode: '',
      quantity: '',
      productName: '',
    };
@@ -251,12 +255,21 @@
    return newItem;
  });
}
const handleChangeModel = (value) => {
  form.value.materialCode = modelOptions.value.find(item => item.id == value)?.materialCode || '';
}
// 提交产品表单
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      // 状态字段不在表单填写,也不传给后端
      const { inspectState, ...payload } = (form.value || {})
      const selectedModel = modelOptions.value.find(item =>
          String(item.id) === String(payload.model)
      );
      payload.model = selectedModel ? selectedModel.model : '';
      if (operationType.value === "add") {
        qualityUnqualifiedAdd(payload).then(res => {
          proxy.$modal.msgSuccess("提交成功");
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -41,6 +41,12 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="料号:" prop="materialCode">
              <el-input v-model="form.materialCode" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="单位:" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" clearable disabled/>
            </el-form-item>
@@ -149,6 +155,7 @@
    productId: "",
    model: "",
    unit: "",
    materialCode: "",
    quantity: "",
    checkCompany: "",
    checkResult: "",