From 32556bda58dc73c0450b4082530b7ee78e17384d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 16 一月 2026 15:13:35 +0800
Subject: [PATCH] Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 66746d4..a20d642 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -45,11 +45,18 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�"
- prop="model">
- <el-input v-model="form.model"
- :disabled="operationType === 'edit'"
- placeholder="璇疯緭鍏�"
- clearable />
+ prop="productModelId">
+ <el-select v-model="form.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ :disabled="operationType === 'edit'"
+ filterable
+ readonly>
+ <el-option v-for="item in modelOptions"
+ :key="item.id"
+ :label="item.model"
+ :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -159,7 +166,7 @@
<script setup>
import { ref } from "vue";
import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
- import { productTreeList } from "@/api/basicData/product.js";
+ import {modelList, productTreeList} from "@/api/basicData/product.js";
import {
qualityInspectAdd,
qualityInspectUpdate,
@@ -183,7 +190,7 @@
checkName: "",
productName: "",
productId: "",
- model: "",
+ productModelId: undefined,
unit: "",
quantity: "",
checkCompany: "",
@@ -195,7 +202,7 @@
supplier: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ productModelId: [{ required: false, message: "璇烽�夋嫨", trigger: "blur" }],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -234,6 +241,7 @@
const { form, rules } = toRefs(data);
const supplierList = ref([]);
const productOptions = ref([]);
+ const modelOptions = ref([]);
const currentProductId = ref(0);
// 鎵撳紑寮规
@@ -246,6 +254,7 @@
form.value = {};
getProductOptions();
if (operationType.value === "edit") {
+ getModels(row.productId || 0);
form.value = { ...row };
currentProductId.value = row.productId || 0;
getQualityInspectParamList(row.id);
@@ -258,7 +267,11 @@
};
const getModels = value => {
currentProductId.value = value;
+ form.value.productModelId = undefined;
form.value.productName = findNodeById(productOptions.value, value);
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ });
if (currentProductId) {
getList();
}
--
Gitblit v1.9.3