From 56158a98729ba25b04f7c80d88aafa59cc41a504 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 29 三月 2026 22:40:10 +0800
Subject: [PATCH] feat(质量维护): 优化检测项目字段并移除内控值和默认值
---
src/views/qualityManagement/finalInspection/components/formDia.vue | 129 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 5f4c975..a7b380a 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -108,9 +108,42 @@
:tableLoading="tableLoading"
height="400"
>
- <template #slot="{ row }">
- <el-input v-model="row.testValue" clearable/>
- </template>
+ <template #instrument="{ row }">
+ <el-select
+ v-model="row.instrument"
+ placeholder="璇烽�夋嫨鎴栬緭鍏�"
+ filterable
+ allow-create
+ default-first-option
+ clearable
+ style="width: 100%"
+ @change="handleInstrumentChange(row)"
+ >
+ <el-option label="鐩祴" value="鐩祴" />
+ <el-option
+ v-for="item in deviceList"
+ :key="item.id"
+ :label="item.deviceName + (item.deviceModel ? ' / ' + item.deviceModel : '')"
+ :value="item.deviceName"
+ />
+ </el-select>
+ </template>
+ <template #deviceStatus="{ row }">
+ <el-tag v-if="row.deviceStatus" :type="getDeviceStatusType(row.deviceStatus)">
+ {{ row.deviceStatus }}
+ </el-tag>
+ <span v-else style="color: #999">-</span>
+ </template>
+ <template #result="{ row }">
+ <el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
+ </template>
+ <template #resultJudgment="{ row }">
+ <el-select v-model="row.resultJudgment" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option label="鍚堟牸" value="鍚堟牸" />
+ <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
+ <el-option label="/" value="/" />
+ </el-select>
+ </template>
</PIMTable>
<template #footer>
<div class="dialog-footer">
@@ -130,6 +163,7 @@
import {userListNoPage} from "@/api/system/user.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
+import {deviceList as qualityInspectParamDeviceList} from "@/api/energyManagement/index.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -173,26 +207,47 @@
const productOptions = ref([]);
const tableColumn = ref([
{
- label: "鎸囨爣",
+ label: "妫�娴嬮」鐩�",
prop: "parameterItem",
+ width: 150
+ },
+ {
+ label: "鏍囧噯瑕佹眰",
+ prop: "standardValue",
+ width: 180
},
{
label: "鍗曚綅",
prop: "unit",
+ width: 80
},
{
- label: "鏍囧噯鍊�",
- prop: "standardValue",
- },
- {
- label: "鍐呮帶鍊�",
- prop: "controlValue",
- },
- {
- label: "妫�楠屽��",
- prop: "testValue",
+ label: "妫�娴嬪櫒鍏�",
+ prop: "instrument",
dataType: 'slot',
- slot: 'slot',
+ slot: 'instrument',
+ width: 220
+ },
+ {
+ label: "璁惧鐘舵��",
+ prop: "deviceStatus",
+ dataType: 'slot',
+ slot: 'deviceStatus',
+ width: 120
+ },
+ {
+ label: "妫�娴嬬粨鏋�",
+ prop: "result",
+ dataType: 'slot',
+ slot: 'result',
+ minWidth: 150
+ },
+ {
+ label: "缁撴灉鍒ゆ柇",
+ prop: "resultJudgment",
+ dataType: 'slot',
+ slot: 'resultJudgment',
+ width: 120
},
]);
const tableData = ref([]);
@@ -201,6 +256,7 @@
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
+const deviceList = ref([]);
// 鎵撳紑寮规
const openDialog = async (type, row) => {
@@ -209,6 +265,8 @@
// 鍏堟竻绌鸿〃鍗曢獙璇佺姸鎬侊紝閬垮厤闂儊
await nextTick();
proxy.$refs.formRef?.clearValidate();
+ // 鍔犺浇璁惧鍙拌处鍒楄〃
+ loadDeviceList();
// 骞惰鍔犺浇鍩虹鏁版嵁
const [userListsRes] = await Promise.all([
@@ -404,9 +462,48 @@
}
const getQualityInspectParamList = (id) => {
qualityInspectParamInfo(id).then(res => {
- tableData.value = res.data;
+ tableData.value = (res.data || []).map(item => ({...item}));
})
}
+
+// 鑾峰彇璁惧鍙拌处鍒楄〃
+const loadDeviceList = () => {
+ qualityInspectParamDeviceList().then(res => {
+ deviceList.value = res.data || [];
+ });
+};
+
+// 璁惧鐘舵�侀鑹叉槧灏�
+const getDeviceStatusType = (status) => {
+ const map = {
+ '姝ｅ父': 'success',
+ '杩愯': 'primary',
+ '鍋滄満': 'warning',
+ '缁翠慨': 'danger'
+ };
+ return map[status] || 'info';
+};
+
+// 妫�娴嬪櫒鍏峰彉鍖栨椂锛岃嚜鍔ㄥ～鍏呰澶囩姸鎬�
+const handleInstrumentChange = (row) => {
+ if (row.instrument === '銆愮洰娴嬨��') {
+ row.deviceId = null;
+ row.deviceName = '銆愮洰娴嬨��';
+ row.deviceStatus = '';
+ return;
+ }
+ const device = deviceList.value.find(d => d.deviceName === row.instrument);
+ if (device) {
+ row.deviceId = device.id;
+ row.deviceName = device.deviceName;
+ row.deviceStatus = device.status || '';
+ } else {
+ row.deviceId = null;
+ row.deviceName = row.instrument || '';
+ row.deviceStatus = '';
+ }
+};
+
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
--
Gitblit v1.9.3