From 129bd0cd4df6f12dd576c262710b1fd9902c363e Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期三, 01 四月 2026 11:08:34 +0800
Subject: [PATCH] fix(qualityManagement): 修复质检表单规格型号选择逻辑和员工列表排序问题
---
src/views/qualityManagement/processInspection/components/formDia.vue | 43 +++++++++++++-
src/views/qualityManagement/finalInspection/components/formDia.vue | 43 +++++++++++++-
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 46 ++++++++++-----
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue | 19 ++++--
src/views/qualityManagement/metricBinding/index.vue | 2
5 files changed, 124 insertions(+), 29 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
index ed2dafa..6bcd0ad 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
@@ -127,7 +127,7 @@
<el-option
v-for="person in employees"
:key="person.id"
- :label="`${person.staffName} (${person.postName})`"
+ :label="person.postName ? `${person.staffName} (${person.postName})` : person.staffName"
:value="person.id"
/>
</el-select>
@@ -152,9 +152,9 @@
</template>
<script setup>
-import {ref, reactive, onMounted} from 'vue'
+import {ref, reactive, onMounted, markRaw} from 'vue'
import {ElMessage} from 'element-plus'
-import {Plus, Document, Promotion, Bell} from '@element-plus/icons-vue'
+import {Document, Promotion, Bell} from '@element-plus/icons-vue'
import {getRoomEnum, saveMeetingApplication} from '@/api/collaborativeApproval/meeting.js'
import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
@@ -167,19 +167,19 @@
value: 'approval',
name: '瀹℃壒娴佺▼浼氳',
desc: '闇�瑕佺粡杩囧绾у鎵圭殑浼氳鐢宠',
- icon: Document
+ icon: markRaw(Document)
},
{
value: 'department',
name: '閮ㄩ棬绾т細璁�',
desc: '閮ㄩ棬鍐呴儴浼氳鐢宠娴佺▼',
- icon: Promotion
+ icon: markRaw(Promotion)
},
{
value: 'notification',
name: '浼氳閫氱煡',
desc: '鏃犻渶瀹℃壒鐩存帴鍙戝竷鐨勪細璁�氱煡',
- icon: Bell
+ icon: markRaw(Bell)
}
])
@@ -307,7 +307,12 @@
size: -1,
staffState: 1
}).then(res => {
- employees.value = res.data.records.sort((a, b) => a.postName.localeCompare(b.postName))
+ console.log(res.data.records,"杩欎釜鏄繑鍥炵殑鏁版嵁鍦板潃")
+ employees.value = res.data.records.sort((a, b) => {
+ const nameA = a.postName || ''
+ const nameB = b.postName?.trim() || ''
+ return nameA.localeCompare(nameB)
+ })
})
})
</script>
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 5bd847f..2a57278 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -23,8 +23,21 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select
+ v-model="form.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="getProductModel"
+ style="width: 100%"
+ >
+ <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">
@@ -121,7 +134,7 @@
<script setup>
import {ref, reactive, toRefs, getCurrentInstance, nextTick} 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} from "@/api/qualityManagement/rawMaterialInspection.js";
import {userListNoPage} from "@/api/system/user.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
@@ -138,6 +151,7 @@
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
testStandardId: "",
unit: "",
@@ -150,6 +164,7 @@
process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ productModelId: [{required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change"}],
model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
testStandardId: [{required: true, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -188,6 +203,7 @@
const tableData = ref([]);
const tableLoading = ref(false);
const userList = ref([]);
+const modelOptions = ref([]); // 瑙勬牸鍨嬪彿涓嬫媺妗嗘暟鎹�
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
@@ -203,6 +219,7 @@
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
+ modelOptions.value = [];
getProductOptions();
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
@@ -212,6 +229,10 @@
currentProductId.value = row.productId || 0
// 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
if (currentProductId.value) {
+ // 鍔犺浇瑙勬牸鍨嬪彿閫夐」
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res;
+ });
// 鍏堝姞杞芥寚鏍囬�夐」
let params = {
productId: currentProductId.value,
@@ -259,10 +280,26 @@
const getModels = (value) => {
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
+ modelOptions.value = [];
+ form.value.productModelId = "";
+ form.value.model = "";
if (currentProductId.value) {
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ });
getList();
}
};
+const getProductModel = (value) => {
+ const index = modelOptions.value.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ form.value.model = modelOptions.value[index].model;
+ form.value.unit = modelOptions.value[index].unit;
+ } else {
+ form.value.model = "";
+ form.value.unit = "";
+ }
+};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
diff --git a/src/views/qualityManagement/metricBinding/index.vue b/src/views/qualityManagement/metricBinding/index.vue
index ac67474..8e35bff 100644
--- a/src/views/qualityManagement/metricBinding/index.vue
+++ b/src/views/qualityManagement/metricBinding/index.vue
@@ -375,7 +375,7 @@
}
const handleUnbind = async (row) => {
- if (!row?.id) return
+ if (!row?.processId) return
try {
await ElMessageBox.confirm('纭鍒犻櫎璇ョ粦瀹氾紵', '鎻愮ず', { type: 'warning' })
} catch {
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 4821db2..1e0f31d 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -43,8 +43,21 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select
+ v-model="form.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="getProductModel"
+ style="width: 100%"
+ >
+ <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">
@@ -141,7 +154,7 @@
<script setup>
import {ref, reactive, toRefs, getCurrentInstance, nextTick} 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 {productProcessListPage} from "@/api/basicData/productProcess.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
@@ -159,6 +172,7 @@
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
testStandardId: "",
unit: "",
@@ -171,6 +185,7 @@
processId: [{ required: true, message: "璇烽�夋嫨宸ュ簭", trigger: "change" }],
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ productModelId: [{required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change"}],
model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
testStandardId: [{required: true, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -211,6 +226,7 @@
const tableLoading = ref(false);
const currentProductId = ref(0);
const processOptions = ref([]); // 宸ュ簭涓嬫媺妗嗘暟鎹�
+const modelOptions = ref([]); // 瑙勬牸鍨嬪彿涓嬫媺妗嗘暟鎹�
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
// 鑾峰彇宸ュ簭鍒楄〃
@@ -241,6 +257,7 @@
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
+ modelOptions.value = [];
getProductOptions();
// 鍏堝姞杞藉伐搴忓垪琛�
await getProcessList();
@@ -260,6 +277,10 @@
currentProductId.value = row.productId || 0
// 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
if (currentProductId.value) {
+ // 鍔犺浇瑙勬牸鍨嬪彿閫夐」
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res;
+ });
// 鍏堝姞杞芥寚鏍囬�夐」
let params = {
productId: currentProductId.value,
@@ -307,10 +328,26 @@
const getModels = (value) => {
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
+ modelOptions.value = [];
+ form.value.productModelId = "";
+ form.value.model = "";
if (currentProductId.value) {
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ });
getList();
}
};
+const getProductModel = (value) => {
+ const index = modelOptions.value.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ form.value.model = modelOptions.value[index].model;
+ form.value.unit = modelOptions.value[index].unit;
+ } else {
+ form.value.model = "";
+ form.value.unit = "";
+ }
+};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 5cafd2c..1982aa8 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -26,23 +26,15 @@
</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"
- style="width: 100%"
- />
+ <el-tree-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable check-strictly
+ @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel" style="width: 100%">
+ <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">
@@ -141,7 +133,7 @@
<script setup>
import {ref, reactive, toRefs, getCurrentInstance, nextTick} 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} from "@/api/qualityManagement/rawMaterialInspection.js";
import {ElMessageBox} from "element-plus";
import {qualityInspectParamDel, qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
@@ -159,6 +151,7 @@
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
testStandardId: "",
unit: "",
@@ -171,6 +164,7 @@
supplier: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
checkName: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ productModelId: [{required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change"}],
model: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
testStandardId: [{required: true, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
@@ -209,6 +203,7 @@
const {form, rules} = toRefs(data);
const supplierList = ref([]);
const productOptions = ref([]);
+const modelOptions = ref([]);
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
@@ -222,6 +217,7 @@
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
+ modelOptions.value = [];
getProductOptions();
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
@@ -230,6 +226,10 @@
currentProductId.value = row.productId || 0
// 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
if (currentProductId.value) {
+ // 鍔犺浇瑙勬牸鍨嬪彿閫夐」
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res;
+ });
// 鍏堝姞杞芥寚鏍囬�夐」
let params = {
productId: currentProductId.value,
@@ -276,10 +276,26 @@
const getModels = (value) => {
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
+ modelOptions.value = [];
+ form.value.productModelId = "";
+ form.value.model = "";
if (currentProductId.value) {
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ });
getList();
}
};
+const getProductModel = (value) => {
+ const index = modelOptions.value.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ form.value.model = modelOptions.value[index].model;
+ form.value.unit = modelOptions.value[index].unit;
+ } else {
+ form.value.model = "";
+ form.value.unit = "";
+ }
+};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
--
Gitblit v1.9.3