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/rawMaterialInspection/components/inspectionFormDia.vue | 135 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 117 insertions(+), 18 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
index 411856c..a95b5c6 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
@@ -3,7 +3,7 @@
<el-dialog
v-model="dialogFormVisible"
title="濉啓妫�楠岃褰�"
- width="70%"
+ width="95%"
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
@@ -18,8 +18,41 @@
@selection-change="handleSelectionChange"
height="600"
>
- <template #slot="{ row }">
- <el-input v-model="row.testValue" clearable/>
+ <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>
@@ -34,12 +67,12 @@
<script setup>
import {ref} from "vue";
-import {Search} from "@element-plus/icons-vue";
import {
qualityInspectParamDel,
qualityInspectParamInfo,
qualityInspectParamUpdate
} from "@/api/qualityManagement/qualityInspectParam.js";
+import {deviceList as qualityInspectParamDeviceList} from "@/api/energyManagement/index.js";
import {ElMessageBox} from "element-plus";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -48,45 +81,111 @@
const operationType = ref('')
const currentId = ref('')
const selectedRows = ref([]);
+const deviceList = 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([]);
const tableLoading = ref(false);
+// 鑾峰彇璁惧鍙拌处鍒楄〃
+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 openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
+ loadDeviceList();
if (operationType.value === 'edit') {
currentId.value = row.id;
getList()
}
}
const getList = () => {
+ tableLoading.value = true;
qualityInspectParamInfo(currentId.value).then(res => {
- tableData.value = res.data;
+ tableLoading.value = false;
+ tableData.value = (res.data || []).map(item => ({...item}));
+ }).catch(() => {
+ tableLoading.value = false;
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -136,4 +235,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3