Merge branch 'dev_NEW_pro' into dev_NEW_pro_鹤壁

yyb

2026-05-16 4039f4dce566ffddf444bed260906acdff0b164f

 src/pages/qualityManagement/processInspection/add.vue

@@ -51,6 +51,7 @@
      </up-form-item>
      <up-form-item label="指标选择"
                    prop="testStandardId"
                    required
                    border-bottom>
        <up-input v-model="testStandardDisplay"
                  placeholder="请选择指标"
@@ -184,11 +185,15 @@
      </up-button>
    </view>
    <!-- 日期选择器 -->
    <up-popup v-model:show="showDate"
              mode="date"
              :start-year="2020"
              :end-year="2030"
              @confirm="confirmDate" />
    <up-popup :show="showDate"
              mode="bottom"
              @close="showDate = false">
      <up-datetime-picker :show="true"
                          v-model="pickerValue"
                          @confirm="confirmDate"
                          @cancel="showDate = false"
                          mode="date" />
    </up-popup>
    <!-- 工序选择 -->
    <up-action-sheet :show="showprocessSheet"
                     :actions="processOptions"
@@ -313,8 +318,8 @@
    qualityInspectParamInfo,
    qualityInspectDetailByProductId,
    getQualityTestStandardParamByTestStandardId,
    list,
  } from "@/api/qualityManagement/materialInspection.js";
  import { getProcessList } from "@/api/productionManagement/processManagement.js";
  import { userListNoPage } from "@/api/system/user.js";

  // 显示提示信息
@@ -442,7 +447,7 @@
      { required: true, message: "请选择产品型号", trigger: "change" },
    ],
    testStandardId: [
      { required: false, message: "请选择指标", trigger: "change" },
      { required: true, message: "请选择指标", trigger: "change" },
    ],
    unit: [{ required: false, message: "请输入", trigger: "blur" }],
    quantity: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -602,8 +607,8 @@

  // 获取工序列表
  const getprocessList = () => {
    list().then(res => {
      processList.value = res.data;
    getProcessList({ size: -1, current: -1 }).then(res => {
      processList.value = res.data?.records || res.data || [];
    });
  };

@@ -691,6 +696,10 @@
        showToast("请选择产品");
        return;
      }
      if (!form.value.testStandardId) {
        showToast("请选择指标");
        return;
      }
      if (!form.value.checkResult) {
        showToast("请选择检测结果");
        return;
@@ -699,7 +708,7 @@
      loading.value = true;

      form.value.inspectType = 1;
      if (isEdit.value) {
      if (!isEdit.value) {
        tableData.value.forEach(item => {
          delete item.id;
        });