Merge branch 'dev_NEW_pro' into dev_NEW_pro_鹤壁

yyb

2026-05-16 4039f4dce566ffddf444bed260906acdff0b164f

 src/pages/qualityManagement/materialInspection/add.vue

@@ -51,6 +51,7 @@
      </up-form-item>
      <up-form-item label="指标选择"
                    prop="testStandardId"
                    required
                    border-bottom>
        <up-input v-model="testStandardDisplay"
                  placeholder="请选择指标"
@@ -114,9 +115,10 @@
                    border-bottom>
        <up-input v-model="form.checkTime"
                  placeholder="请选择检测日期"
                  readonly />
                  readonly
                  @click="showDatePicker" />
        <!-- <template #right>
          <up-icon name="calendar"
          <up-icon name="arrow-right"
                   @click="showDatePicker"></up-icon>
        </template> -->
      </up-form-item>
@@ -191,11 +193,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="showSupplierSheet"
                     :actions="supplierOptions"
@@ -337,6 +343,7 @@
  const loading = ref(false);
  // 日期选择器
  const showDate = ref(false);
  const pickerValue = ref(Date.now());
  // 供应商选择
  const showSupplierSheet = ref(false);
  // 产品选择
@@ -448,7 +455,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" }],
@@ -483,6 +490,7 @@
  // 确认日期选择
  const confirmDate = e => {
    form.value.checkTime = dayjs(e.value).format("YYYY-MM-DD");
    showDate.value = false;
  };

  // 选择供应商
@@ -697,6 +705,10 @@
        showToast("请选择产品");
        return;
      }
      if (!form.value.testStandardId) {
        showToast("请选择指标");
        return;
      }
      if (!form.value.checkResult) {
        showToast("请选择检测结果");
        return;
@@ -705,7 +717,7 @@
      loading.value = true;

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