Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

4 天以前 388f10aa600b1c2459111aa97cf0947077620a63

 src/views/qualityManagement/processInspection/components/formDia.vue

@@ -122,6 +122,18 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="批号：" prop="batchNo">
              <el-input
                v-model="form.batchNo"
                placeholder="请输入"
                clearable
                :disabled="operationType === 'edit'"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测单位：" prop="checkCompany">
              <el-input v-model="form.checkCompany" placeholder="请输入" clearable/>
            </el-form-item>
@@ -134,6 +146,8 @@
              </el-select>
            </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>
@@ -237,6 +251,15 @@

const dialogFormVisible = ref(false);
const operationType = ref('')

const validateBatchNo = (rule, value, callback) => {
  if (value === undefined || value === null || String(value).trim() === '') {
    callback(new Error('请输入批号'));
    return;
  }
  callback();
};

const data = reactive({
  form: {
    checkTime: "",
@@ -247,6 +270,7 @@
    productModelId: "",
    model: "",
    uidNo: "",
    batchNo: "",
    testStandardId: "",
    unit: "",
    quantity: "",
@@ -286,6 +310,7 @@
      }
    ],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
    batchNo: [{ required: true, validator: validateBatchNo, trigger: "blur" }],
    checkResult: [{ required: true, message: "请输入", trigger: "change" }],
  },
});
@@ -381,6 +406,7 @@
      testStandardId: "",
      unit: "",
      uidNo: "",
      batchNo: "",
      quantity: "",
      inspectedQuantity: "",
      inspectMaterialCondition: "",
@@ -470,6 +496,7 @@
  form.value.productModelId = undefined;
  form.value.unit = undefined;
  form.value.uidNo = undefined;
  form.value.batchNo = "";
  modelOptions.value = [];
  currentProductId.value = value
  form.value.productName = findNodeById(productOptions.value, value);