附件

yyb

8 天以前 9581c0ae9f0d9a2e92744f3dca78960780b9a2df

 src/pages/qualityManagement/processInspection/add.vue

@@ -67,14 +67,32 @@
                  placeholder="请输入单位"
                  disabled />
      </up-form-item>
      <up-form-item label="数量"
      <up-form-item label="总数量"
                    prop="quantity"
                    required
                    border-bottom>
        <up-input v-model="form.quantity"
                  type="number"
                  placeholder="请输入数量"
                  placeholder="请输入总数量"
                  :disabled="processQuantityDisabled" />
      </up-form-item>
      <up-form-item label="合格数量"
                    prop="qualifiedQuantity"
                    required
                    border-bottom>
        <up-input v-model="form.qualifiedQuantity"
                  type="number"
                  placeholder="请输入合格数量"
                  clearable />
      </up-form-item>
      <up-form-item label="不合格数量"
                    prop="unqualifiedQuantity"
                    required
                    border-bottom>
        <up-input v-model="form.unqualifiedQuantity"
                  type="number"
                  placeholder="请输入不合格数量"
                  clearable />
      </up-form-item>
      <up-form-item label="检测单位"
                    prop="checkCompany"
@@ -82,19 +100,6 @@
        <up-input v-model="form.checkCompany"
                  placeholder="请输入检测单位"
                  clearable />
      </up-form-item>
      <up-form-item label="检测结果"
                    prop="checkResult"
                    required
                    border-bottom>
        <up-input v-model="form.checkResult"
                  placeholder="请选择检测结果"
                  readonly
                  @click="showResultSheet" />
        <template #right>
          <up-icon @click="showResultSheet = true"
                   name="arrow-right" />
        </template>
      </up-form-item>
      <up-form-item label="检验员"
                    prop="checkName"
@@ -207,12 +212,6 @@
                     @select="selectModel"
                     @close="showModelSheet = false"
                     title="选择规格型号" />
    <!-- 检测结果选择 -->
    <up-action-sheet :show="showResultSheet"
                     :actions="resultSheetOptions"
                     @select="selectResult"
                     @close="showResultSheet = false"
                     title="选择检测结果" />
    <!-- 检验员选择 -->
    <up-action-sheet :show="showInspectorSheet"
                     :actions="userSheetOptions"
@@ -339,8 +338,6 @@
  const showProductTree = ref(false);
  // 规格型号选择
  const showModelSheet = ref(false);
  // 检测结果选择
  const showResultSheet = ref(false);
  // 检验员选择
  const showInspectorSheet = ref(false);
  // 指标选择
@@ -358,8 +355,9 @@
    testStandardId: "",
    unit: "",
    quantity: "",
    qualifiedQuantity: "",
    unqualifiedQuantity: "",
    checkCompany: "",
    checkResult: "",
    productMainId: null,
    purchaseLedgerId: null,
  });
@@ -379,11 +377,6 @@
  const modelOptions = ref([]);
  // 检验员列表
  const userList = ref([]);
  // 检测结果选项
  const resultOptions = ref([
    { label: "合格", value: "合格" },
    { label: "不合格", value: "不合格" },
  ]);
  // 指标选项
  const testStandardOptions = ref([]);
  // 当前产品ID
@@ -408,13 +401,6 @@
    return modelOptions.value.map(item => ({
      name: item.model,
      value: item.id,
    }));
  });

  const resultSheetOptions = computed(() => {
    return resultOptions.value.map(item => ({
      name: item.label,
      value: item.value,
    }));
  });

@@ -446,10 +432,13 @@
    ],
    unit: [{ required: false, message: "请输入", trigger: "blur" }],
    quantity: [{ required: true, message: "请输入", trigger: "blur" }],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
    checkResult: [
      { required: true, message: "请选择检测结果", trigger: "change" },
    qualifiedQuantity: [
      { required: true, message: "请输入合格数量", trigger: "blur" },
    ],
    unqualifiedQuantity: [
      { required: true, message: "请输入不合格数量", trigger: "blur" },
    ],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
  };

  // 是否为编辑模式
@@ -463,13 +452,6 @@
    const v = form.value || {};
    return !!(v.productMainId != null || v.purchaseLedgerId != null);
  });

  // 获取页面ID
  const getPageId = () => {
    const pages = getCurrentPages();
    const currentPage = pages[pages.length - 1];
    return currentPage.options.id;
  };

  // 返回上一页
  const goBack = () => {
@@ -561,12 +543,6 @@
      modelOptions.value.find(item => item.id == value)?.model || "";
    form.value.unit =
      modelOptions.value.find(item => item.id == value)?.unit || "";
  };

  // 选择检测结果
  const selectResult = e => {
    form.value.checkResult = e.value;
    showResultSheet.value = false;
  };

  // 选择检验员
@@ -690,16 +666,41 @@
        showToast("请选择工序");
        return;
      }
      if (!form.value.quantity) {
        showToast("请输入数量");
      if (!form.value.quantity && form.value.quantity !== 0) {
        showToast("请输入总数量");
        return;
      }
      if (
        form.value.qualifiedQuantity === "" ||
        form.value.qualifiedQuantity === undefined
      ) {
        showToast("请输入合格数量");
        return;
      }
      if (
        form.value.unqualifiedQuantity === "" ||
        form.value.unqualifiedQuantity === undefined
      ) {
        showToast("请输入不合格数量");
        return;
      }
      const qty = Number(form.value.quantity);
      const qf = Number(form.value.qualifiedQuantity);
      const uq = Number(form.value.unqualifiedQuantity);
      if (Number.isNaN(qty) || qty < 0) {
        showToast("总数量格式不正确");
        return;
      }
      if (Number.isNaN(qf) || qf < 0 || Number.isNaN(uq) || uq < 0) {
        showToast("合格/不合格数量格式不正确");
        return;
      }
      if (qf + uq !== qty) {
        showToast("合格数量与不合格数量之和须等于总数量");
        return;
      }
      if (!form.value.productId) {
        showToast("请选择产品");
        return;
      }
      if (!form.value.checkResult) {
        showToast("请选择检测结果");
        return;
      }

@@ -713,7 +714,9 @@
      }

      const data = { ...form.value, qualityInspectParams: tableData.value };
      data.quantity = Number(data.quantity);
      data.quantity = qty;
      data.qualifiedQuantity = qf;
      data.unqualifiedQuantity = uq;
      if (isEdit.value) {
        const res = await qualityInspectUpdate(data);
        showToast("保存成功");
@@ -752,8 +755,9 @@
        testStandardId: "",
        unit: "",
        quantity: "",
        qualifiedQuantity: "",
        unqualifiedQuantity: "",
        checkCompany: "",
        checkResult: "",
        productMainId: null,
        purchaseLedgerId: null,
      };
@@ -774,8 +778,9 @@
        testStandardId: "1",
        unit: "kg",
        quantity: 1000,
        qualifiedQuantity: 1000,
        unqualifiedQuantity: 0,
        checkCompany: "第三方检测机构",
        checkResult: "合格",
        productMainId: null,
        purchaseLedgerId: null,
      };
@@ -854,8 +859,9 @@
        testStandardId: "",
        unit: "",
        quantity: "",
        qualifiedQuantity: "",
        unqualifiedQuantity: "",
        checkCompany: "",
        checkResult: "",
        productMainId: null,
        purchaseLedgerId: null,
      };