From 2aeae312becf636478f0eead1b1a64ffc0341d68 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 04 三月 2026 14:13:49 +0800
Subject: [PATCH] 生产工单班组信息字段变更
---
src/views/productionManagement/workOrder/index.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 291ca18..621501c 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -24,10 +24,12 @@
:page="page"
:tableLoading="tableLoading"
@pagination="pagination">
- <template #completionStatus="{ row }">
- <el-progress :percentage="toProgressPercentage(row?.completionStatus)" :color="progressColor(toProgressPercentage(row?.completionStatus))" :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
- </template>
- </PIMTable>
+ <template #completionStatus="{ row }">
+ <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
+ </template>
+ </PIMTable>
</div>
<el-dialog v-model="editDialogVisible"
title="缂栬緫鏃堕棿"
@@ -104,7 +106,6 @@
transferCardRowData.status
}}</span>
</div> -->
-
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
<span class="info-value">{{ transferCardRowData.planStartTime }}</span>
@@ -196,7 +197,7 @@
@change="handleUserChange">
<el-option v-for="user in userOptions"
:key="user.userId"
- :label="user.userName"
+ :label="user.nickName"
:value="user.userId" />
</el-select>
</el-form-item>
@@ -231,13 +232,13 @@
const tableColumn = ref([
{
- label: "宸ュ崟缂栧彿",
- prop: "workOrderNo",
- width: "140",
+ label: "宸ュ崟绫诲瀷",
+ prop: "workOrderType",
+ width: "80",
},
{
- label: "鐢熶骇璁㈠崟鍙�",
- prop: "productOrderNpsNo",
+ label: "宸ュ崟缂栧彿",
+ prop: "workOrderNo",
width: "140",
},
{
@@ -307,12 +308,12 @@
handleEdit(row);
},
},
- {
- name: "娴佽浆鍗�",
- clickFun: row => {
- downloadAndPrintWorkOrder(row);
- },
- },
+ // {
+ // name: "娴佽浆鍗�",
+ // clickFun: row => {
+ // downloadAndPrintWorkOrder(row);
+ // },
+ // },
{
name: "闄勪欢",
clickFun: row => {
@@ -425,7 +426,9 @@
// 鍒涘缓 Blob URL
const fileBlob =
- blob instanceof Blob ? blob : new Blob([blob], { type: blob.type || "application/octet-stream" });
+ blob instanceof Blob
+ ? blob
+ : new Blob([blob], { type: blob.type || "application/octet-stream" });
const url = window.URL.createObjectURL(fileBlob);
// 鍒涘缓闅愯棌 iframe锛岀敤浜庤Е鍙戞祻瑙堝櫒鎵撳嵃
@@ -500,7 +503,7 @@
.then(res => {
if (res.code === 200) {
reportForm.userId = res.data.userId;
- reportForm.userName = res.data.userName;
+ reportForm.userName = res.data.nickName;
}
})
.catch(err => {
@@ -561,11 +564,11 @@
};
// 鐢ㄦ埛閫夋嫨鍙樺寲鏃舵洿鏂� userName
- const handleUserChange = (userId) => {
+ const handleUserChange = userId => {
if (userId) {
const selectedUser = userOptions.value.find(user => user.userId === userId);
if (selectedUser) {
- reportForm.userName = selectedUser.userName;
+ reportForm.userName = selectedUser.nickName;
}
} else {
reportForm.userName = "";
--
Gitblit v1.9.3