编辑成品检验时，需加上不良数量，合格数量字段。页面列表也需要加上不良数量、合格数量字段。不良数量可以手填，合格数量、数量都置灰。根据不良数量+合格数量...

huminmin

4 小时以前 e62bbded9ae11eb3fc42df8170f87d17a2d32c44

编辑成品检验时，需加上不良数量，合格数量字段。页面列表也需要加上不良数量、合格数量字段。不良数量可以手填，合格数量、数量都置灰。根据不良数量+合格数量=数量这一逻辑计算。若不填默认不良数量为0。数量是订单本次生产数量-报废数量

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

@@ -62,20 +62,32 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="不良数量：" prop="defectiveQuantity">
              <el-input v-model="form.defectiveQuantity" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="不良原因：" prop="defectiveReason">
              <el-select v-model="form.defectiveReason" placeholder="请选择" clearable style="width: 100%">
                <el-option :label="item.label" :value="item.value" v-for="(item,index) in defective_reason" :key="index" />
              </el-select>
            </el-form-item>
          </el-col>

          <el-col :span="12">
            <el-form-item label="合格数量：" prop="qualifiedQuantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="请输入" clearable :precision="2" disabled/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="不良数量：" prop="defectiveQuantity">
              <el-input v-model="form.defectiveQuantity" placeholder="请输入" clearable disabled/>
            <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">
@@ -87,8 +99,11 @@
        </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 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"/>
                            </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -102,16 +117,6 @@
                  clearable
                  style="width: 100%"
              />
            </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>
                                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                                                     :value="item.nickName"/>
                            </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@@ -162,6 +167,7 @@
    testStandardId: "",
    defectiveReason: undefined,
    unit: "",
    qualifiedQuantity: "",
    quantity: "",
    checkCompany: "",
    checkResult: "",
@@ -219,6 +225,29 @@
const testStandardOptions = ref([]); // 指标选择下拉框数据
const modelOptions = ref([]);

// 监听不良数量变化，自动更新数量
// 当 defectiveQuantity 增加时，quantity 减少；当 defectiveQuantity 减少时，quantity 增加
watch(() => form.value.defectiveQuantity, (newVal, oldVal) => {
  if (newVal > form.value.quantity) {
    form.value.defectiveQuantity = form.value.quantity;
  }
  form.value.qualifiedQuantity = Number((form.value.quantity - newVal).toFixed(2));
});

// 监听总数量变化，自动更新合格数量
watch(() => form.value.quantity, (newVal, oldVal) => {
  const totalQty = Number(newVal) || 0;
  const defectiveQty = Number(form.value.defectiveQuantity) || 0;

  // 确保不良数量不超过总数量
  if (defectiveQty > totalQty) {
    form.value.defectiveQuantity = totalQty;
  }

  // 计算合格数量
  form.value.qualifiedQuantity = Number((totalQty - defectiveQty).toFixed(2));
});

// 打开弹框
const openDialog = async (type, row) => {
  operationType.value = type;

 src/views/qualityManagement/finalInspection/index.vue

@@ -122,6 +122,11 @@
    width: 100
  },
  {
    label: "合格数量",
    prop: "qualifiedQuantity",
    width: 100
  },
  {
    label: "不良数量",
    prop: "defectiveQuantity",
    width: 100
@@ -339,7 +344,7 @@
    type: "warning",
  })
      .then(() => {
        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "出厂检验.xlsx");
        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "成品检验.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");

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

@@ -278,7 +278,6 @@
    form.value.defectiveQuantity = totalQty;
  }

  console.log(totalQty);
  // 计算合格数量
  form.value.qualifiedQuantity = Number((totalQty - defectiveQty).toFixed(2));
});

 src/views/qualityManagement/processInspection/index.vue

@@ -281,12 +281,7 @@
  params.entryDate = undefined
  qualityInspectListPage({...params, inspectType: 1}).then(res => {
    tableLoading.value = false;
    tableData.value = res.data.records.map(item => {
      return {
        ...item,
        qualifiedQuantity: item.quantity - item.defectiveQuantity
      };
    });
    tableData.value = res.data.records
    page.total = res.data.total;
  }).catch(err => {
    tableLoading.value = false;