From 586dc959ca9b6aad3ffd0699f8ab1c6301bdbc0f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 31 三月 2026 21:00:55 +0800
Subject: [PATCH] fix: 设备状态改为下拉选择
---
src/views/qualityManagement/processInspection/components/formDia.vue | 21 +++++++---
src/views/qualityManagement/finalInspection/components/formDia.vue | 69 +++++++++++++++++++---------------
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 21 +++++++---
3 files changed, 69 insertions(+), 42 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 332b3fd..436425c 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -134,10 +134,19 @@
</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>
+ <el-select
+ v-model="row.deviceStatus"
+ placeholder="璇烽�夋嫨"
+ default-first-option
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="姝ｅ父" value="姝ｅ父" />
+ <el-option label="鍋滄満" value="鍋滄満" />
+ <el-option label="杩愯" value="杩愯" />
+ <el-option label="缁翠慨" value="缁翠慨" />
+ <el-option label="/" value="/" />
+ </el-select>
</template>
<template #result="{ row }">
<el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
@@ -222,32 +231,32 @@
prop: "standardValue",
width: 180
},
- {
- label: "鍗曚綅",
- prop: "unit",
- width: 80
- },
- {
- label: "妫�娴嬪櫒鍏�",
- prop: "instrument",
- dataType: '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: "unit",
+ width: 70
+ },
+ {
+ label: "妫�娴嬪櫒鍏�",
+ prop: "instrument",
+ dataType: 'slot',
+ slot: 'instrument',
+ width: 220
+ },
+ {
+ label: "璁惧鐘舵��",
+ prop: "deviceStatus",
+ dataType: 'slot',
+ slot: 'deviceStatus',
+ width: 120
+ },
+ {
+ label: "妫�娴嬬粨鏋�",
+ prop: "result",
+ dataType: 'slot',
+ slot: 'result',
+ width: 150
+ },
{
label: "缁撴灉鍒ゆ柇",
prop: "resultJudgment",
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 1a40a9c..784b88c 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -141,10 +141,19 @@
</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>
+ <el-select
+ v-model="row.deviceStatus"
+ placeholder="璇烽�夋嫨"
+ default-first-option
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="姝ｅ父" value="姝ｅ父" />
+ <el-option label="鍋滄満" value="鍋滄満" />
+ <el-option label="杩愯" value="杩愯" />
+ <el-option label="缁翠慨" value="缁翠慨" />
+ <el-option label="/" value="/" />
+ </el-select>
</template>
<template #result="{ row }">
<el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
@@ -237,7 +246,7 @@
{
label: "鍗曚綅",
prop: "unit",
- width: 80
+ width: 70
},
{
label: "妫�娴嬪櫒鍏�",
@@ -258,7 +267,7 @@
prop: "result",
dataType: 'slot',
slot: 'result',
- minWidth: 150
+ width: 150
},
{
label: "缁撴灉鍒ゆ柇",
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index daa4712..8462d3b 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -156,10 +156,19 @@
</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>
+ <el-select
+ v-model="row.deviceStatus"
+ placeholder="璇烽�夋嫨"
+ default-first-option
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="姝ｅ父" value="姝ｅ父" />
+ <el-option label="鍋滄満" value="鍋滄満" />
+ <el-option label="杩愯" value="杩愯" />
+ <el-option label="缁翠慨" value="缁翠慨" />
+ <el-option label="/" value="/" />
+ </el-select>
</template>
<template #result="{ row }">
<el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
@@ -240,7 +249,7 @@
{
label: "鍗曚綅",
prop: "unit",
- width: 80
+ width: 70
},
{
label: "妫�娴嬪櫒鍏�",
@@ -261,7 +270,7 @@
prop: "result",
dataType: 'slot',
slot: 'result',
- minWidth: 150
+ width: 150
},
{
label: "缁撴灉鍒ゆ柇",
--
Gitblit v1.9.3