From 1de874ce35d6087c66216c02c55983795acfe0f7 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 07 四月 2026 15:19:25 +0800
Subject: [PATCH] fix(workOrder): 在报工弹窗标题中显示机台名称并添加机台名列
---
src/views/productionManagement/workOrder/index.vue | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 902ca25..583fe2a 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -98,12 +98,12 @@
</div>
<!-- <div class="info-item">
<span class="info-label">宸ュ崟鐘舵��</span>
- <span class="info-value">{{
- transferCardRowData.status === 1 ? '寰呯‘璁�' :
- transferCardRowData.status === 2 ? '寰呯敓浜�' :
- transferCardRowData.status === 3 ? '鐢熶骇涓�' :
- transferCardRowData.status === 4 ? '宸茬敓浜�' :
- transferCardRowData.status
+ <span class="info-value">{{
+ transferCardRowData.status === 1 ? '寰呯‘璁�' :
+ transferCardRowData.status === 2 ? '寰呯敓浜�' :
+ transferCardRowData.status === 3 ? '鐢熶骇涓�' :
+ transferCardRowData.status === 4 ? '宸茬敓浜�' :
+ transferCardRowData.status
}}</span>
</div> -->
<div class="info-item">
@@ -165,7 +165,7 @@
</div>
</el-dialog>
<el-dialog v-model="reportDialogVisible"
- title="鎶ュ伐"
+ :title="`鎶ュ伐(鏈哄彴:${currentReportRowData?.deviceName || '-'})`"
width="500px">
<el-form ref="reportFormRef"
:model="reportForm"
@@ -203,6 +203,19 @@
clearable
filterable
@change="handleUserChange">
+ <el-option v-for="user in userOptions"
+ :key="user.userId"
+ :label="user.nickName"
+ :value="user.userId" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹℃牳浜�" prop="auditUserId">
+ <el-select v-model="reportForm.auditUserId"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨瀹℃牳浜�"
+ clearable
+ filterable
+ @change="handleReviewerIdChange">
<el-option v-for="user in userOptions"
:key="user.userId"
:label="user.nickName"
@@ -305,6 +318,10 @@
prop: "processName",
},
{
+ label: "鏈哄彴鍚嶇О",
+ prop: "deviceName",
+ },
+ {
label: "闇�姹傛暟閲�",
prop: "planQuantity",
width: "140",
@@ -353,6 +370,8 @@
clickFun: row => {
handleEdit(row);
},
+ // 褰撻渶姹傛暟閲忕瓑浜庡畬鎴愭暟閲忕殑鏃跺�欙紝鎸夐挳涓嶅彲鐐瑰嚮
+ disabled: row => Number(row?.planQuantity) === Number(row?.completeQuantity),
},
{
name: "娴佽浆鍗�",
@@ -371,16 +390,16 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row => row.planQuantity <= 0,
+ disabled: row => Number(row?.planQuantity) <= Number(row?.completeQuantity) || row.planQuantity <= 0,
},
- {
- name:"瀹℃牳",
- color: "#f56c6c",
- clickFun: row => {
- handleAudit(row);
- },
- disabled: row => Number(row?.auditStatus) === 1,
- }
+ // {
+ // name:"瀹℃牳",
+ // color: "#f56c6c",
+ // clickFun: row => {
+ // handleAudit(row);
+ // },
+ // disabled: row => Number(row?.auditStatus) === 1,
+ // }
],
},
]);
@@ -503,6 +522,7 @@
const reportFormRules = {
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
+ auditUserId: [{ required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change" }],
};
// 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
@@ -697,7 +717,7 @@
const showReportDialog = row => {
currentReportRowData.value = row;
- reportForm.planQuantity = row.planQuantity;
+ reportForm.planQuantity = row.planQuantity - row.completeQuantity;
reportForm.quantity =
row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
@@ -829,6 +849,17 @@
reportForm.userName = "";
}
};
+ // 瀹℃牳浜�
+ const handleReviewerIdChange = userId => {
+ if (userId) {
+ const selectedUser = userOptions.value.find(user => user.userId === userId);
+ if (selectedUser) {
+ reportForm.auditUserName = selectedUser.nickName;
+ }
+ } else {
+ reportForm.auditUserName = "";
+ }
+ }
onMounted(() => {
getList();
--
Gitblit v1.9.3