From a7172a363ef947c2a9db279519626eb84150efcd Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 24 九月 2026 19:06:49 +0800
Subject: [PATCH] feat(生产工单): 规格列显示产品大类，规格参数并入产品名称
---
src/views/productionManagement/workOrderEdit/index.vue | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/views/productionManagement/workOrderEdit/index.vue b/src/views/productionManagement/workOrderEdit/index.vue
index 98d29f5..116dce5 100644
--- a/src/views/productionManagement/workOrderEdit/index.vue
+++ b/src/views/productionManagement/workOrderEdit/index.vue
@@ -38,6 +38,14 @@
:color="progressColor(toProgressPercentage(row?.completionStatus))"
:status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
</template>
+ <!-- 浜у搧鍚嶇О锛氫骇鍝佸悕 + 鍏蜂綋瑙勬牸鍙傛暟锛堝銆屽ぇ鎻愮惔80L 4/4銆嶏級锛涗袱鑰呯浉鍚屾椂涓嶉噸澶� -->
+ <template #productNameDisplay="{ row }">
+ {{ displayProductName(row) }}
+ </template>
+ <!-- 瑙勬牸锛氫箰鍣ㄦ樉绀哄ぇ绫伙紱绾㈡湪銆佺惔鐩掔瓑闈炰箰鍣ㄥ垽涓嶅嚭澶х被锛屽洖閫�鏄剧ず鍏惰嚜韬鏍� -->
+ <template #specDisplay="{ row }">
+ {{ row?.majorCategory || row?.model || "" }}
+ </template>
</PIMTable>
</div>
<el-dialog v-model="editDialogVisible"
@@ -161,13 +169,20 @@
width: "140",
},
{
+ // 鍏蜂綋瑙勬牸鍙傛暟锛�4/4銆�1/2 绛夛級璺熷湪浜у搧鍚嶇О鍚庨潰灞曠ず
label: "浜у搧鍚嶇О",
prop: "productName",
- width: "140",
+ width: "180",
+ dataType: "slot",
+ slot: "productNameDisplay",
},
{
+ // 涔愬櫒鏄剧ず浜у搧澶х被锛堝皬鎻愮惔/涓彁鐞�/澶ф彁鐞�/璐濇柉锛夛紝涓嶅睍绀� 4/4銆�1/2 杩欑被灏哄锛�
+ // 闈炰箰鍣紙绾㈡湪銆佺惔鐩掔瓑锛夊垽涓嶅嚭澶х被锛屽洖閫�鏄剧ず鍏惰嚜韬鏍硷紝涓嶇暀鐧�
label: "瑙勬牸",
- prop: "model",
+ prop: "majorCategory",
+ dataType: "slot",
+ slot: "specDisplay",
},
{
label: "鍗曚綅",
@@ -292,6 +307,15 @@
});
const { searchForm } = toRefs(data);
+ // 浜у搧鍚嶇О鍒楋細浜у搧鍚嶅悗璺熷叿浣撹鏍煎弬鏁帮紙濡傘�屽ぇ鎻愮惔80L 4/4銆嶏級锛�
+ // 瑙勬牸涓庝骇鍝佸悕鐩稿悓鏃朵笉閲嶅鎷兼帴銆�
+ const displayProductName = row => {
+ const name = row?.productName || "";
+ const model = row?.model || "";
+ if (!name) return model;
+ if (!model || model === name) return name;
+ return `${name} ${model}`;
+ };
const toProgressPercentage = val => {
const n = Number(val);
if (!Number.isFinite(n)) return 0;
--
Gitblit v1.9.3