From df605c69a17bb548e3f98e10f7cc3c3298e5d8f7 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 16:31:10 +0800
Subject: [PATCH] 过程检验列表加上不良数量、合格数量字段。过程检验编辑页面也加上不良数量、合格数量字段，不良数量输入框手填，合格数量，数量输入框置灰，根据根据不良数量+合格数量=数量这一逻辑计算。若不填默认不良数量为0。数量是订单本次生产数量-报废数量
---
src/views/qualityManagement/processInspection/components/formDia.vue | 56 +++++++++++++--------------
src/views/qualityManagement/processInspection/index.vue | 17 ++++++++
2 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index bc4bb93..5626d35 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -81,15 +81,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="涓嶈壇鍘熷洜锛�" prop="defectiveReason">
- <el-select v-model="form.defectiveReason" placeholder="璇烽�夋嫨" clearable style="width: 100%">
- <el-option
- v-for="dict in defective_reason"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
+ <el-form-item label="鍚堟牸鏁伴噺锛�" prop="qualifiedQuantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -100,27 +93,40 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
- <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="涓嶈壇鍘熷洜锛�" prop="defectiveReason">
+ <el-select v-model="form.defectiveReason" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option
+ v-for="dict in defective_reason"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
+
</el-col>
<el-col :span="12">
- <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
- <el-select v-model="form.checkResult">
- <el-option label="鍚堟牸" value="鍚堟牸" />
- <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
- </el-select>
+ <el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
+ <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
+ <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+ :value="item.nickName"/>
+ </el-select>
</el-form-item>
+
+ <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
+ <el-select v-model="form.checkResult">
+ <el-option label="鍚堟牸" value="鍚堟牸" />
+ <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
+ </el-select>
+ </el-form-item>
+
</el-col>
<el-col :span="12">
<el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
@@ -256,15 +262,7 @@
// 鐩戝惉涓嶈壇鏁伴噺鍙樺寲锛岃嚜鍔ㄦ洿鏂版暟閲�
// 褰� defectiveQuantity 澧炲姞鏃讹紝quantity 鍑忓皯锛涘綋 defectiveQuantity 鍑忓皯鏃讹紝quantity 澧炲姞
watch(() => form.value.defectiveQuantity, (newVal, oldVal) => {
- const newDefectiveQty = Number(newVal) || 0;
- const oldDefectiveQty = Number(oldVal) || 0;
- const currentQuantity = Number(form.value.quantity) || 0;
-
- // 璁＄畻鍙樺寲閲忥細鏂板�� - 鏃у��
- const changeAmount = newDefectiveQty - oldDefectiveQty;
-
- // quantity 鍙嶅悜鍙樺寲
- form.value.quantity = Number((currentQuantity - changeAmount).toFixed(2));
+ form.value.qualifiedQuantity = Number((form.value.quantity - newVal).toFixed(2));
});
// 鎵撳紑寮规
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index cbeab71..b022b1b 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -122,6 +122,16 @@
prop: "unit",
},
{
+ label: "鍚堟牸鏁伴噺",
+ prop: "qualifiedQuantity",
+ width: 100
+ },
+ {
+ label: "涓嶈壇鏁伴噺",
+ prop: "defectiveQuantity",
+ width: 100
+ },
+ {
label: "鏁伴噺",
prop: "quantity",
width: 100
@@ -271,7 +281,12 @@
params.entryDate = undefined
qualityInspectListPage({...params, inspectType: 1}).then(res => {
tableLoading.value = false;
- tableData.value = res.data.records
+ tableData.value = res.data.records.map(item => {
+ return {
+ ...item,
+ qualifiedQuantity: item.quantity - item.defectiveQuantity
+ };
+ });
page.total = res.data.total;
}).catch(err => {
tableLoading.value = false;
--
Gitblit v1.9.3