From cac1c1f60fec101a67ce1181355ab704237f85e8 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 17 三月 2026 14:15:29 +0800
Subject: [PATCH] 质量管理：成品检增加不良数量和不良原因
---
src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue | 4 ++--
src/views/qualityManagement/finalInspection/components/formDia.vue | 13 +++++++++++--
src/views/qualityManagement/metricMaintenance/index.vue | 2 +-
src/views/qualityManagement/finalInspection/index.vue | 12 +++++++++++-
4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 5f4c975..498b10b 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -49,6 +49,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鏁伴噺锛�" prop="quantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -57,8 +62,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
+ <el-form-item label="涓嶈壇鍘熷洜锛�" prop="defectiveReason">
+ <el-select v-model="form.defectiveReason" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option :label="item.label" :value="item.value" v-for="(item,index) in defective_reason" :key="index" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -145,6 +152,7 @@
productModelId: "",
model: "",
testStandardId: "",
+ defectiveReason: undefined,
unit: "",
quantity: "",
checkCompany: "",
@@ -171,6 +179,7 @@
});
const supplierList = ref([]);
const productOptions = ref([]);
+const { defective_reason } = proxy.useDict("defective_reason");
const tableColumn = ref([
{
label: "鎸囨爣",
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index db44222..2a2360b 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -19,7 +19,7 @@
>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+<!-- <el-button type="primary" @click="openForm('add')">鏂板</el-button>-->
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -122,6 +122,16 @@
width: 100
},
{
+ label: "涓嶈壇鏁伴噺",
+ prop: "defectiveQuantity",
+ width: 100
+ },
+ {
+ label: "涓嶈壇鍘熷洜",
+ prop: "defectiveReason",
+ width: 100
+ },
+ {
label: "妫�娴嬪崟浣�",
prop: "checkCompany",
width: 120
diff --git a/src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue b/src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue
index 1ac03aa..6e22e4c 100644
--- a/src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue
+++ b/src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue
@@ -22,9 +22,9 @@
</el-form-item>
<el-form-item label="绫诲埆" prop="inspectType">
<el-select v-model="form.inspectType" placeholder="璇烽�夋嫨绫诲埆" style="width: 100%">
- <el-option label="鍘熸潗鏂欐楠�" value="0" />
+<!-- <el-option label="鍘熸潗鏂欐楠�" value="0" />-->
<el-option label="杩囩▼妫�楠�" value="1" />
- <el-option label="鍑哄巶妫�楠�" value="2" />
+ <el-option label="鎴愬搧妫�楠�" value="2" />
<el-option label="宸℃" value="3" />
</el-select>
</el-form-item>
diff --git a/src/views/qualityManagement/metricMaintenance/index.vue b/src/views/qualityManagement/metricMaintenance/index.vue
index 5b2c6bd..3fb52e9 100644
--- a/src/views/qualityManagement/metricMaintenance/index.vue
+++ b/src/views/qualityManagement/metricMaintenance/index.vue
@@ -304,7 +304,7 @@
const map = {
0: '鍘熸潗鏂欐楠�',
1: '杩囩▼妫�楠�',
- 2: '鍑哄巶妫�楠�'
+ 2: '鎴愬搧妫�楠�'
}
return map[val] || val
}
--
Gitblit v1.9.3