来料检产品选择修改

zhangwencui

3 天以前 8f1bdce523f5d50d943f7e6347656712c8b51fa9

来料检产品选择修改

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

@@ -1,121 +1,118 @@
<template>
  <div>
    <el-dialog
        v-model="dialogFormVisible"
    <el-dialog v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增原材料检验' : '编辑原材料检验'"
        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="supplierQuantityDisabled"
              >
                <el-option
                    v-for="item in supplierList"
                         :disabled="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"
                  placeholder="请选择"
                  clearable
                  check-strictly
                  @change="getModels"
                  :data="productOptions"
                  :render-after-expand="false"
                  :disabled="operationType === 'edit'"
                  style="width: 100%"
              />
            <el-form-item label="产品："
                          prop="productId">
              <el-button type="primary"
                         @click="openProductSelectDialog"
                         :disabled="operationType === 'edit'">选择产品</el-button>
              <div class="selected-product mt-2"
                   v-if="form.productName">
                <el-tag closable
                        @close="clearProductSelection"
                        class="mr-2">
                  {{ form.productName }} - {{ form.model }}
                </el-tag>
              </div>
              <div v-else
                   class="text-gray-400">请选择产品</div>
            </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="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 label="单位："
                          prop="unit">
              <el-input v-model="form.unit"
                        disabled />
            </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%"
              >
                <el-option
                  v-for="item in testStandardOptions"
                         style="width: 100%">
                <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="checkCompany">
              <el-input v-model="form.checkCompany"
                        placeholder="请输入"
                        clearable />
            </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="supplierQuantityDisabled"/>
            </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/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
            <el-form-item label="检测结果："
                          prop="checkResult">
              <el-select v-model="form.checkResult">
                <el-option label="合格" value="合格"/>
                <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%">
                <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%">
                <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%"
              />
                              style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -123,41 +120,62 @@
<!--      <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/>
          <el-input v-model="row.testValue"
                    clearable />
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
    </el-dialog>
    <!-- 产品选择对话框 -->
    <ProductSelectDialog v-model="productSelectDialogVisible"
                         :single="true"
                         @confirm="handleProductSelect" />
  </div>
</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";
  import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";

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: "",
@@ -174,16 +192,22 @@
    checkResult: "",
  },
  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"}],
    checkCompany: [{required: false, message: "请输入", trigger: "blur"}],
    checkResult: [{required: true, message: "请选择检测结果", trigger: "change"}],
      checkResult: [
        { required: true, message: "请选择检测结果", trigger: "change" },
      ],
  },
});
const tableColumn = ref([
@@ -206,8 +230,8 @@
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
      dataType: "slot",
      slot: "slot",
  },
]);
const tableData = ref([]);
@@ -220,6 +244,7 @@
const testStandardOptions = ref([]); // 指标选择下拉框数据
const modelOptions = ref([]);
const userList = ref([]); // 检验员下拉列表
  const productSelectDialogVisible = ref(false);

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

@@ -255,16 +280,16 @@
    quantity: "",
    checkCompany: "",
    checkResult: "",
  }
    };
  testStandardOptions.value = [];
  tableData.value = [];
  // 先确保产品树已加载，否则编辑时产品/规格型号无法反显
  await getProductOptions();
  if (operationType.value === 'edit') {
    if (operationType.value === "edit") {
    // 先保存 testStandardId，避免被清空
    const savedTestStandardId = row.testStandardId;
    form.value = {...row}
    currentProductId.value = row.productId || 0
      form.value = { ...row };
      currentProductId.value = row.productId || 0;
    // 关键：编辑时加载规格型号下拉选项，才能反显 productModelId
    if (currentProductId.value) {
      try {
@@ -284,8 +309,8 @@
      // 先加载指标选项
      let params = {
        productId: currentProductId.value,
        inspectType: 0
      }
          inspectType: 0,
        };
      qualityInspectDetailByProductId(params).then(res => {
        testStandardOptions.value = res.data || [];
        // 使用 nextTick 和 setTimeout 确保选项已经渲染到 DOM
@@ -294,8 +319,10 @@
            // 如果编辑数据中有 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（保持类型一致）
@@ -304,7 +331,12 @@
                getQualityInspectParamList(row.id);
              } else {
                // 如果找不到匹配项，尝试直接使用原值
                console.warn('未找到匹配的指标选项，testStandardId:', savedTestStandardId, '可用选项:', testStandardOptions.value);
                  console.warn(
                    "未找到匹配的指标选项，testStandardId:",
                    savedTestStandardId,
                    "可用选项:",
                    testStandardOptions.value
                  );
                form.value.testStandardId = savedTestStandardId;
                getQualityInspectParamList(row.id);
              }
@@ -324,31 +356,33 @@
  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++) {
@@ -366,7 +400,7 @@
};

function convertIdToValue(data) {
  return data.map((item) => {
    return data.map(item => {
    const {id, children, ...rest} = item;
    const newItem = {
      ...rest,
@@ -384,27 +418,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) {
@@ -414,48 +448,84 @@
  }
  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 || [];
  }).catch(error => {
    console.error('获取标准参数失败:', error);
    tableData.value = [];
  }).finally(() => {
    tableLoading.value = false;
  })
}
      .catch(error => {
        console.error("获取标准参数失败:", error);
        tableData.value = [];
      })
      .finally(() => {
        tableLoading.value = false;
      });
  };

const getQualityInspectParamList = (id) => {
  const getQualityInspectParamList = id => {
  qualityInspectParamInfo(id).then(res => {
    tableData.value = res.data;
  })
    });
  };

  // 打开产品选择对话框
  const openProductSelectDialog = () => {
    productSelectDialogVisible.value = true;
  };

  // 处理产品选择
  const handleProductSelect = products => {
    if (products && products.length > 0) {
      const product = products[0];
      form.value.productId = product.id;
      form.value.productName = product.productName;
      form.value.productModelId = product.id;
      form.value.model = product.model;
      form.value.unit = product.unit;
      currentProductId.value = product.id;
      // 加载指标选项
      getList();
}
  };

  // 清空产品选择
  const clearProductSelection = () => {
    form.value.productId = "";
    form.value.productName = "";
    form.value.productModelId = "";
    form.value.model = "";
    form.value.unit = "";
    currentProductId.value = 0;
    testStandardOptions.value = [];
    tableData.value = [];
    form.value.testStandardId = "";
  };
// 关闭弹框
const closeDia = () => {
  proxy.resetForm("formRef");
  tableData.value = [];
  testStandardOptions.value = [];
  form.value.testStandardId = '';
    form.value.testStandardId = "";
  dialogFormVisible.value = false;
  emit('close')
    emit("close");
};
defineExpose({
  openDialog,
@@ -463,5 +533,4 @@
</script>

<style scoped>

</style>