大罗素 1.新增入库添加入库时间字段 2.过程检验不需要工序字段

gaoluyang

2026-04-09 1ba8a855aeff2c61db619a3147b45b98bb990714

大罗素
1.新增入库添加入库时间字段
2.过程检验不需要工序字段

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

@@ -8,13 +8,13 @@
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="工序：" prop="process">
              <el-select v-model="form.process" placeholder="请选择工序" clearable :disabled="processQuantityDisabled" style="width: 100%">
                <el-option v-for="item in processList" :key="item.name" :label="item.name" :value="item.name"/>
              </el-select>
            </el-form-item>
          </el-col>
<!--          <el-col :span="12">-->
<!--            <el-form-item label="工序：" prop="process">-->
<!--              <el-select v-model="form.process" placeholder="请选择工序" clearable :disabled="processQuantityDisabled" style="width: 100%">-->
<!--                <el-option v-for="item in processList" :key="item.name" :label="item.name" :value="item.name"/>-->
<!--              </el-select>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
          <el-col :span="12">
            <el-form-item label="产品名称：" prop="productId">
              <el-tree-select
@@ -30,53 +30,53 @@
              />
            </el-form-item>
          </el-col>
                    <el-col :span="12">
                        <el-form-item label="规格型号：" prop="productModelId">
                            <el-select v-model="form.productModelId" placeholder="请选择" clearable :disabled="operationType === 'edit'"
                               filterable readonly @change="handleChangeModel">
                                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
                            </el-select>
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="productModelId">
              <el-select v-model="form.productModelId" placeholder="请选择" clearable :disabled="operationType === 'edit'"
                         filterable readonly @change="handleChangeModel">
                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select
                v-model="form.testStandardId"
                placeholder="请选择指标"
                clearable
                @change="handleTestStandardChange"
                style="width: 100%"
              >
                <el-option
                  v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
                    <el-col :span="12">
                        <el-form-item label="指标选择：" prop="testStandardId">
                            <el-select
                                v-model="form.testStandardId"
                        placeholder="请选择指标"
                        clearable
                        @change="handleTestStandardChange"
                        style="width: 100%"
                            >
                                <el-option
                                    v-for="item in testStandardOptions"
                            :key="item.id"
                            :label="item.standardName || item.standardNo"
                            :value="item.id"
                                />
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="单位：" prop="unit">
                            <el-input v-model="form.unit" placeholder="请输入" disabled/>
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="单位：" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2" :disabled="processQuantityDisabled"/>
            </el-form-item>
          </el-col>
                    <el-col :span="12">
                        <el-form-item label="检测单位：" prop="checkCompany">
                            <el-input v-model="form.checkCompany" placeholder="请输入" clearable/>
                        </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>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
              <el-select v-model="form.checkResult">
@@ -85,16 +85,17 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkName">
                    <el-col :span="12">
                        <el-form-item label="检验员：" prop="checkName">
                            <el-select v-model="form.checkName" placeholder="请选择" clearable>
                                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                                                     :value="item.nickName"/>
                                   :value="item.nickName"/>
                            </el-select>
            </el-form-item>
          </el-col>
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
         
          <el-col :span="12">
            <el-form-item label="检测日期：" prop="checkTime">
              <el-date-picker
@@ -150,7 +151,7 @@
const data = reactive({
  form: {
    checkTime: "",
    process: "",
    // process: "",
    checkName: "",
    productName: "",
    productId: "",
@@ -164,7 +165,7 @@
  },
  rules: {
    checkTime: [{ required: true, message: "请输入", trigger: "blur" },],
    process: [{ required: true, message: "请选择工序", trigger: "change" }],
    // process: [{ required: true, message: "请选择工序", trigger: "change" }],
    checkName: [{ required: false, message: "请输入", trigger: "blur" }],
    productId: [{ required: true, message: "请输入", trigger: "blur" }],
    productModelId: [{ required: true, message: "请选择", trigger: "change" }],
@@ -234,7 +235,7 @@
    // 先重置表单数据（保持字段完整，避免弹窗首次渲染时触发必填红框“闪一下”）
    form.value = {
        checkTime: "",
        process: "",
        // process: "",
        checkName: "",
        productName: "",
        productId: "",
@@ -276,7 +277,7 @@
            let params = {
                productId: currentProductId.value,
                inspectType: 1,
                process: form.value.process || ''
                // process: form.value.process || ''
            }
            qualityInspectDetailByProductId(params).then(res => {
                testStandardOptions.value = res.data || [];
@@ -376,7 +377,7 @@
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      form.value.inspectType = 1
            const processName = form.value.process || '';
            // const processName = form.value.process || '';
            if (operationType.value === "add") {
                tableData.value.forEach((item) => {
                    delete item.id
@@ -384,7 +385,7 @@
            }
            const data = {
                ...form.value, 
                process: processName, // 保留 process 字段以兼容后端
                // process: processName, // 保留 process 字段以兼容后端
                qualityInspectParams: tableData.value
            }
      if (operationType.value === "add") {
@@ -407,11 +408,11 @@
        tableData.value = [];
        return;
    }
    const processName = form.value.process || '';
    // const processName = form.value.process || '';
    let params = {
        productId: currentProductId.value,
        inspectType: 1,
        process: processName
        // process: processName
    }
    qualityInspectDetailByProductId(params).then(res => {
        // 保存下拉框选项数据

 src/views/qualityManagement/processInspection/index.vue

@@ -2,15 +2,15 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">工序：</span>
        <el-input
            v-model="searchForm.process"
            style="width: 240px"
            placeholder="请输入工序搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
        />
<!--        <span class="search_title">工序：</span>-->
<!--        <el-input-->
<!--            v-model="searchForm.process"-->
<!--            style="width: 240px"-->
<!--            placeholder="请输入工序搜索"-->
<!--            @change="handleQuery"-->
<!--            clearable-->
<!--            :prefix-icon="Search"-->
<!--        />-->
        <span  style="margin-left: 10px" class="search_title">检测日期：</span>
        <el-date-picker  v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                         placeholder="请选择" clearable @change="changeDaterange" />
@@ -100,11 +100,11 @@
    prop: "workOrderNo",
    width: 120
  },
  {
    label: "工序",
    prop: "process",
    width: 230
  },
  // {
  //   label: "工序",
  //   prop: "process",
  //   width: 230
  // },
  {
    label: "检验员",
    prop: "checkName",