fix: 用河南鹤壁代码覆盖山西长治

yuan

5 天以前 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a

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

@@ -1,184 +1,155 @@
<template>
  <div>
    <el-dialog v-model="dialogFormVisible"
    <el-dialog
        v-model="dialogFormVisible"
               :title="operationType === 'add' ? '新增原材料检验' : operationType === 'view' ? '查看原材料检验' : '编辑原材料检验'"
               width="70%"
               @close="closeDia">
      <el-form :model="form"
               label-width="140px"
               label-position="top"
               :rules="rules"
               ref="formRef">
        @close="closeDia"
    >
      <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="supplier">
              <el-select v-model="form.supplier"
            <el-form-item label="供应商：" prop="supplier">
              <el-select
                  v-model="form.supplier"
                         placeholder="请选择"
                         clearable
                         :disabled="isViewMode || supplierQuantityDisabled">
                <el-option v-for="item in supplierList"
                  filterable
                  :disabled="isViewMode || supplierQuantityDisabled"
              >
                <el-option
                    v-for="item in supplierList"
                           :key="item.id"
                           :label="item.supplierName"
                           :value="item.supplierName" />
                    :value="item.supplierName"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="产品名称："
                          prop="productId">
              <el-tree-select v-model="form.productId"
            <el-form-item label="产品名称：" prop="productId">
              <el-tree-select
                  v-model="form.productId"
                              placeholder="请选择"
                              filterable
                              clearable
                              check-strictly
                              @change="getModels"
                              :data="productOptions"
                              :render-after-expand="false"
                              :disabled="isViewMode || operationType === 'edit'"
                              style="width: 100%" />
                  style="width: 100%"
              />
            </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="isViewMode || operationType === 'edit'"
                         filterable
                         readonly
                         @change="handleChangeModel">
                <el-option v-for="item in modelOptions"
                           :key="item.id"
                           :label="item.model"
                           :value="item.id" />
            <el-form-item label="规格型号：" prop="productModelId">
              <el-select v-model="form.productModelId" placeholder="请选择" clearable :disabled="isViewMode || 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"
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select
                v-model="form.testStandardId"
                         placeholder="请选择指标"
                         clearable
                         @change="handleTestStandardChange"
                         style="width: 100%"
                         :disabled="isViewMode">
                <el-option v-for="item in testStandardOptions"
                :disabled="isViewMode"
              >
                <el-option
                  v-for="item in testStandardOptions"
                           :key="item.id"
                           :label="item.standardName || item.standardNo"
                           :value="item.id" />
                  :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="unit">
              <el-input v-model="form.unit"
                        disabled />
            <el-form-item label="单位：" prop="unit">
              <el-input v-model="form.unit" 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="isViewMode || supplierQuantityDisabled" />
            <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="isViewMode || supplierQuantityDisabled"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="合格数量："
                          prop="qualifiedQuantity">
              <el-input-number :step="0.01"
                               :min="0"
                               :max="form.quantity || 0"
                               style="width: 100%"
                               v-model="form.qualifiedQuantity"
                               placeholder="请输入"
                               :precision="2"
                               @change="onQualifiedChange"
                               :disabled="isViewMode" />
            <el-form-item label="合格数量：" prop="qualifiedQuantity">
              <el-input-number :step="0.01" :min="0" :max="form.quantity || 0" style="width: 100%"
                               v-model="form.qualifiedQuantity" placeholder="请输入" :precision="2"
                               @change="onQualifiedChange" :disabled="isViewMode"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="不合格数量："
                          prop="unqualifiedQuantity">
              <el-input-number :step="0.01"
                               :min="0"
                               :max="form.quantity || 0"
                               style="width: 100%"
                               v-model="form.unqualifiedQuantity"
                               placeholder="请输入"
                               :precision="2"
                               @change="onUnqualifiedChange"
                               :disabled="isViewMode" />
            <el-form-item label="不合格数量：" prop="unqualifiedQuantity">
              <el-input-number :step="0.01" :min="0" :max="form.quantity || 0" style="width: 100%"
                               v-model="form.unqualifiedQuantity" placeholder="请输入" :precision="2"
                               @change="onUnqualifiedChange" :disabled="isViewMode"/>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="是否抽检：" prop="isSampling">
              <el-radio-group v-model="form.isSampling" class="sampling-radio-group" :disabled="isViewMode" @change="handleSamplingChange">
                <el-radio-button :label="1">是</el-radio-button>
                <el-radio-button :label="0">否</el-radio-button>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="12" v-if="form.isSampling === 1">
            <el-form-item label="抽检数量：" prop="samplingQuantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.samplingQuantity"
                               placeholder="请输入" clearable :precision="2" :disabled="isViewMode"/>
            </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 :disabled="isViewMode"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="合格率：">
              <el-tag :type="passRateTagType">{{ passRateDisplayText }}</el-tag>
            </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
                        :disabled="isViewMode" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果："
                          prop="checkResult">
              <el-select v-model="form.checkResult"
                         :disabled="isViewMode">
                <el-option label="合格"
                           value="合格" />
                <el-option label="不合格"
                           value="不合格" />
                <el-option label="部分合格"
                           value="部分合格" />
              </el-select>
            </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
                         style="width: 100%"
                         :disabled="isViewMode">
                <el-option v-for="item in userList"
                           :key="item.nickName"
                           :label="item.nickName"
                           :value="item.nickName" />
            <el-form-item label="检验员：" prop="checkName">
              <el-select v-model="form.checkName" placeholder="请选择" clearable style="width: 100%" :disabled="isViewMode">
                <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">
            <el-form-item label="检测日期："
                          prop="checkTime">
              <el-date-picker v-model="form.checkTime"
            <el-form-item label="检测日期：" prop="checkTime">
              <el-date-picker
                  v-model="form.checkTime"
                              type="date"
                              placeholder="请选择日期"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              clearable
                              style="width: 100%"
                              :disabled="isViewMode" />
                  :disabled="isViewMode"
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -186,26 +157,24 @@
      <!--      <div style="margin-bottom: 10px;text-align: right">-->
      <!--        <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
      <!--      </div>-->
      <PIMTable rowKey="id"
      <PIMTable
          rowKey="id"
                :column="tableColumn"
                :tableData="tableData"
                :tableLoading="tableLoading"
                height="400">
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue"
                    clearable
                    :disabled="isViewMode" />
          <el-input v-model="row.testValue" clearable :disabled="isViewMode"/>
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <template v-if="!isViewMode">
            <el-button type="primary"
                       @click="submitForm">确认</el-button>
            <el-button type="primary" @click="submitForm">确认</el-button>
            <el-button @click="closeDia">取消</el-button>
          </template>
          <el-button v-else
                     @click="closeDia">关闭</el-button>
          <el-button v-else @click="closeDia">关闭</el-button>
        </div>
      </template>
    </el-dialog>
@@ -213,35 +182,19 @@
</template>

<script setup>
  import {
    ref,
    reactive,
    toRefs,
    computed,
    getCurrentInstance,
    nextTick,
  } from "vue";
import {ref, reactive, toRefs, computed, getCurrentInstance, nextTick} from "vue";
  import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
  import { modelList, productTreeList } from "@/api/basicData/product.js";
  import {
    qualityInspectAdd,
    qualityInspectUpdate,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import {
    qualityInspectParamDel,
    qualityInspectParamInfo,
  } from "@/api/qualityManagement/qualityInspectParam.js";
  import {
    qualityInspectDetailByProductId,
    getQualityTestStandardParamByTestStandardId,
  } from "@/api/qualityManagement/metricMaintenance.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {qualityInspectParamDel, qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
  import { userListNoPage } from "@/api/system/user.js";

  const { proxy } = getCurrentInstance();
  const emit = defineEmits(["close"]);
const {proxy} = getCurrentInstance()
const emit = defineEmits(['close'])

  const dialogFormVisible = ref(false);
  const operationType = ref("");
const operationType = ref('')
  const data = reactive({
    form: {
      checkTime: "",
@@ -255,29 +208,23 @@
      unit: "",
      quantity: "",
      checkCompany: "",
      checkResult: "",
    isSampling: 0,
    samplingQuantity: "",
    },
    rules: {
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
    checkTime: [{required: true, message: "请输入", trigger: "blur"},],
      supplier: [{ required: true, message: "请输入", trigger: "blur" }],
      checkName: [{ required: false, message: "请输入", trigger: "blur" }],
      productId: [{ required: true, message: "请输入", trigger: "blur" }],
      productModelId: [
        { required: true, message: "请选择产品型号", trigger: "change" },
      ],
      testStandardId: [
        { required: false, message: "请选择指标", trigger: "change" },
      ],
    productModelId: [{required: true, message: "请选择产品型号", trigger: "change"}],
    testStandardId: [{required: false, message: "请选择指标", trigger: "change"}],
      unit: [{ required: false, message: "请输入", trigger: "blur" }],
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      qualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
      unqualifiedQuantity: [
        { required: true, message: "请输入", trigger: "blur" },
      ],
    unqualifiedQuantity: [{required: true, message: "请输入", trigger: "blur"}],
      checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
      checkResult: [
        { required: true, message: "请选择检测结果", trigger: "change" },
      ],
    isSampling: [{required: true, message: "请选择是否抽检", trigger: "change"}],
    samplingQuantity: [{required: true, message: "请输入抽检数量", trigger: "blur"}],
    },
  });
  const tableColumn = ref([
@@ -300,8 +247,8 @@
    {
      label: "检验值",
      prop: "testValue",
      dataType: "slot",
      slot: "slot",
    dataType: 'slot',
    slot: 'slot',
    },
  ]);
  const tableData = ref([]);
@@ -316,7 +263,38 @@
  const userList = ref([]); // 检验员下拉列表

  // 是否为查看模式
  const isViewMode = computed(() => operationType.value === "view");
const isViewMode = computed(() => operationType.value === 'view');

const passRateValue = computed(() => {
  const fromApi = form.value.passRate;
  if (fromApi != null && fromApi !== '') {
    const n = Number(fromApi);
    if (!Number.isNaN(n)) return n;
  }
  const qualified = Number(form.value.qualifiedQuantity) || 0;
  const unqualified = Number(form.value.unqualifiedQuantity) || 0;
  const total = qualified + unqualified;
  if (!total || total === 0) return null;
  return (qualified / total) * 100;
});

const passRateDisplayText = computed(() => {
  const params = passRateValue.value;
  if (params == null || params === '') return '—';
  const n = Number(params);
  if (Number.isNaN(n)) return '—';
  return `${n.toFixed(2)}%`;
});

const passRateTagType = computed(() => {
  const params = passRateValue.value;
  if (params == null || params === '') return 'info';
  const n = Number(params);
  if (Number.isNaN(n)) return 'info';
  if (n >= 100) return 'success';
  if (n >= 90) return 'warning';
  return 'danger';
});

  // 编辑时：productMainId 或 purchaseLedgerId 任一有值则供应商、数量置灰
  const supplierQuantityDisabled = computed(() => {
@@ -327,7 +305,7 @@
  // 打开弹框
  const openDialog = async (type, row) => {
    operationType.value = type;
    getOptions().then(res => {
  getOptions().then((res) => {
      supplierList.value = res.data;
    });

@@ -351,17 +329,19 @@
      unit: "",
      quantity: "",
      checkCompany: "",
      checkResult: "",
    };
    isSampling: 0,
    samplingQuantity: "",
  }
    testStandardOptions.value = [];
    tableData.value = [];
    // 先确保产品树已加载，否则编辑时产品/规格型号无法反显
    await getProductOptions();
    if (operationType.value === "edit" || operationType.value === "view") {
  if (operationType.value === 'edit' || operationType.value === 'view') {
      // 先保存 testStandardId，避免被清空
      const savedTestStandardId = row.testStandardId;
      form.value = { ...row };
      currentProductId.value = row.productId || 0;
    const { passRate, ...rowWithoutPassRate } = row;
    form.value = { ...rowWithoutPassRate, testStandardId: "" };
    currentProductId.value = row.productId || 0
      // 关键：编辑时加载规格型号下拉选项，才能反显 productModelId
      if (currentProductId.value) {
        try {
@@ -381,8 +361,8 @@
        // 先加载指标选项
        let params = {
          productId: currentProductId.value,
          inspectType: 0,
        };
        inspectType: 0
      }
        qualityInspectDetailByProductId(params).then(res => {
          testStandardOptions.value = res.data || [];
          // 使用 nextTick 和 setTimeout 确保选项已经渲染到 DOM
@@ -391,10 +371,8 @@
              // 如果编辑数据中有 testStandardId，则设置并加载对应的参数
              if (savedTestStandardId) {
                // 确保类型匹配（item.id 可能是数字或字符串）
                const matchedOption = testStandardOptions.value.find(
                  item =>
                    item.id == savedTestStandardId ||
                    String(item.id) === String(savedTestStandardId)
              const matchedOption = testStandardOptions.value.find(item =>
                item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
                );
                if (matchedOption) {
                  // 确保使用匹配项的 id（保持类型一致）
@@ -403,12 +381,7 @@
                  getQualityInspectParamList(row.id);
                } else {
                  // 如果找不到匹配项，尝试直接使用原值
                  console.warn(
                    "未找到匹配的指标选项，testStandardId:",
                    savedTestStandardId,
                    "可用选项:",
                    testStandardOptions.value
                  );
                console.warn('未找到匹配的指标选项，testStandardId:', savedTestStandardId, '可用选项:', testStandardOptions.value);
                  form.value.testStandardId = savedTestStandardId;
                  getQualityInspectParamList(row.id);
                }
@@ -428,33 +401,31 @@
    nextTick(() => {
      proxy.$refs?.formRef?.clearValidate?.();
    });
  };
}
  const getProductOptions = () => {
    return productTreeList().then(res => {
  return productTreeList().then((res) => {
      productOptions.value = convertIdToValue(res);
      return productOptions.value;
    });
  };
  const getModels = value => {
const getModels = (value) => {
    form.value.productModelId = undefined;
    form.value.unit = undefined;
    modelOptions.value = [];
    currentProductId.value = value;
  currentProductId.value = value
    form.value.productName = findNodeById(productOptions.value, value);
    modelList({ id: value }).then(res => {
  modelList({ id: value }).then((res) => {
      modelOptions.value = res;
    });
  })
    if (currentProductId.value) {
      getList();
    }
  };

  const handleChangeModel = value => {
    form.value.model =
      modelOptions.value.find(item => item.id == value)?.model || "";
    form.value.unit =
      modelOptions.value.find(item => item.id == value)?.unit || "";
  };
const handleChangeModel = (value) => {
  form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
  form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
}

  const findNodeById = (nodes, productId) => {
    for (let i = 0; i < nodes.length; i++) {
@@ -472,7 +443,7 @@
  };

  function convertIdToValue(data) {
    return data.map(item => {
  return data.map((item) => {
      const { id, children, ...rest } = item;
      const newItem = {
        ...rest,
@@ -490,27 +461,27 @@
  const submitForm = () => {
    proxy.$refs.formRef.validate(valid => {
      if (valid) {
        form.value.inspectType = 0;
      form.value.inspectType = 0
        if (operationType.value === "add") {
          tableData.value.forEach(item => {
            delete item.id;
          });
            tableData.value.forEach((item) => {
               delete item.id
            })
        }
        const data = { ...form.value, qualityInspectParams: tableData.value };
      const data = {...form.value, qualityInspectParams: tableData.value}
        if (operationType.value === "add") {
          qualityInspectAdd(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        })
        } else {
          qualityInspectUpdate(data).then(res => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
          });
        })
        }
      }
    });
  };
  })
}

  const getList = () => {
    if (!currentProductId.value) {
@@ -520,49 +491,46 @@
    }
    let params = {
      productId: currentProductId.value,
      inspectType: 0,
    };
    inspectType: 0
  }
    qualityInspectDetailByProductId(params).then(res => {
      // 保存下拉框选项数据
      testStandardOptions.value = res.data || [];
      // 清空表格数据，等待用户选择指标
      tableData.value = [];
      // 清空指标选择
      form.value.testStandardId = "";
    });
  };
    form.value.testStandardId = '';
  })
}

  // 指标选择变化处理
  const handleTestStandardChange = testStandardId => {
const handleTestStandardChange = (testStandardId) => {
    if (!testStandardId) {
      tableData.value = [];
      return;
    }
    tableLoading.value = true;
    getQualityTestStandardParamByTestStandardId(testStandardId)
      .then(res => {
  getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
        tableData.value = res.data || [];
        tableData.value = tableData.value.map(item => ({
          ...item,
          id: null,
      id: null
        }));
      })
      .catch(error => {
        console.error("获取标准参数失败:", error);
  }).catch(error => {
    console.error('获取标准参数失败:', error);
        tableData.value = [];
      })
      .finally(() => {
  }).finally(() => {
        tableLoading.value = false;
      });
  };
  })
}

  const getQualityInspectParamList = id => {
const getQualityInspectParamList = (id) => {
    qualityInspectParamInfo(id).then(res => {
      tableData.value = res.data;
    });
  };
  })
}
  // 自动计算合格数量变化时的不合格数量
  const onQualifiedChange = value => {
const onQualifiedChange = (value) => {
    if (form.value.quantity !== undefined && form.value.quantity !== null) {
      const maxUnqualified = form.value.quantity - value;
      if (maxUnqualified >= 0) {
@@ -575,7 +543,7 @@
  };

  // 自动计算不合格数量变化时的合格数量
  const onUnqualifiedChange = value => {
const onUnqualifiedChange = (value) => {
    if (form.value.quantity !== undefined && form.value.quantity !== null) {
      const maxQualified = form.value.quantity - value;
      if (maxQualified >= 0) {
@@ -587,14 +555,24 @@
    }
  };

// 是否抽检切换
const handleSamplingChange = (value) => {
  if (value !== 1) {
    form.value.samplingQuantity = "";
    nextTick(() => {
      proxy.$refs?.formRef?.clearValidate?.("samplingQuantity");
    });
  }
};

  // 关闭弹框
  const closeDia = () => {
    proxy.resetForm("formRef");
    tableData.value = [];
    testStandardOptions.value = [];
    form.value.testStandardId = "";
  form.value.testStandardId = '';
    dialogFormVisible.value = false;
    emit("close");
  emit('close')
  };
  defineExpose({
    openDialog,
@@ -602,4 +580,7 @@
</script>

<style scoped>
.sampling-radio-group {
  height: 32px;
}
</style>