From 8a7559f1cd6e9c653bb5be4b2e3a73a4d178e05e Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 27 四月 2026 14:01:43 +0800
Subject: [PATCH] 阳光印刷Web: 调整工单管理报工功能
---
src/views/productionManagement/workOrder/index.vue | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 177fc8a..ec83bfe 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -244,9 +244,9 @@
</el-col>
<el-col :span="12">
- <el-form-item label="鏈哄彴" prop="machineId">
+ <el-form-item label="鏈哄彴" prop="deviceId">
<el-select
- v-model="reportForm.machineId"
+ v-model="reportForm.deviceId"
placeholder="璇烽�夋嫨鏈哄彴"
filterable
clearable
@@ -400,8 +400,8 @@
const handleDeviceChange = (val) => {
const device = deviceOptions.value.find(item => item.id === val)
- reportForm.machineName = device?.deviceName || ""
- reportForm.machineId = val || ""
+ reportForm.deviceName = device?.deviceName || ""
+ reportForm.deviceId = val || ""
}
const normalizeArray = (val) => {
@@ -500,14 +500,6 @@
label: "宸ュ簭鍚嶇О",
prop: "processName",
},
- // {
- // label: "鏈哄彴鍚嶇О",
- // prop: "deviceName",
- // },
- {
- label: "鏈哄彴鍚嶇О",
- prop: "deviceNames",
- },
{
label: "闇�姹傛暟閲�",
prop: "planQuantity",
@@ -562,10 +554,6 @@
clickFun: row => {
handleEdit(row);
},
- // 褰撻渶姹傛暟閲忕瓑浜庡畬鎴愭暟閲忕殑鏃跺�欙紝鎸夐挳涓嶅彲鐐瑰嚮
- disabled: row =>
- Number(row?.planQuantity) === Number(row?.completeQuantity) ||
- !canOperateByReportWorker.value(row),
},
{
name: "娴佽浆鍗�",
@@ -584,10 +572,6 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row =>
- Number(row?.planQuantity) <= Number(row?.completeQuantity) ||
- row.planQuantity <= 0 ||
- !canOperateByReportWorker.value(row),
},
// {
// name:"瀹℃牳",
@@ -631,7 +615,7 @@
userId: "",
productMainId: null,
teamList: [],
- machineId: null,
+ deviceId: null,
});
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
@@ -728,7 +712,7 @@
endTime: [{required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change"}],
auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
teamList: [{required: true, message: "璇烽�夋嫨鐝粍", trigger: "change"}],
- machineId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
+ deviceId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
};
// 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
@@ -926,10 +910,10 @@
};
const showReportDialog = row => {
- if (!isCurrentUserReportWorker(row)) {
- ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶鎶ュ伐");
- return;
- }
+ // if (!isCurrentUserReportWorker(row)) {
+ // ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶鎶ュ伐");
+ // return;
+ // }
currentReportRowData.value = row;
reportForm.planQuantity = row.planQuantity - row.completeQuantity;
reportForm.quantity =
--
Gitblit v1.9.3