From 8dc2427e1c5e5e349bce2d72759034c406eb0848 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 13 三月 2026 01:15:27 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSClient/src/views/outbound/outSGOrder.vue | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
index b8d9f4c..c243620 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
@@ -93,9 +93,16 @@
},
{
field: "orderId",
- title: "涓婃父鐢熶骇鍗曞彿",
+ title: "鎺掔▼鍙�",
type: "string",
width: 160,
+ align: "left",
+ },
+ {
+ field: "number",
+ title: "鐢ㄧ焊搴忓彿",
+ type: "string",
+ width: 90,
align: "left",
},
{
@@ -108,10 +115,21 @@
{
field: "outSGOrderStatus",
title: "鍑哄簱鍗曠姸鎬�",
- type: "string",
+ type: "tag",
width: 110,
align: "left",
bind: { key: "outboundStatusEnum", data: [] },
+ getColor: (row) => {
+ const status = row.outSGOrderStatus;
+ if (status === 3) { // 缂烘枡
+ return 'danger'; // 绾㈣壊
+ } else if (status === 0) { // 鏈紑濮�
+ return 'success'; // 缁胯壊
+ } else if (status === 1) { // 鍑哄簱涓�
+ return 'primary'; // 钃濊壊
+ }
+ return ''; // 榛樿鏃犻鑹�
+ }
},
{
field: "createDate",
@@ -121,12 +139,32 @@
align: "left",
},
{
- field: "materialNoWidth",
- title: "鐗╂枡缂栧彿锛堝箙瀹斤級",
- type: "string",
- width: 160,
- align: "left",
- },
+ field: "materialNos",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "materialWides",
+ title: "骞呭",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "isLackMaterial",
+ title: "鏄惁缂烘枡",
+ type: "string",
+ width: 100,
+ align: "center",
+ formatter: (row) => {
+ const isLack = Boolean(row.isLackMaterial);
+ const text = isLack ? "鏄�" : "鍚�";
+ const bgColor = isLack ? '#ff4d4f' : '#52c41a';
+ return `<div style="background-color: ${bgColor}; color: #ffffff; text-align: center; font-weight: bold; width: 100%; height: 100%; padding: 10px 0; display: flex; justify-content: center; align-items: center;">${text}</div>`;
+ }
+ },
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏鍗�",
@@ -247,12 +285,23 @@
align: "left",
},
{
- field: "outBSTOrderDetailStatus",
+ field: "outSGOrderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
+ type: "tag",
width: 180,
align: "left",
bind: { key: "outboundStatusEnum", data: [] },
+ getColor: (row) => {
+ const status = row.outSGOrderDetailStatus;
+ if (status === 3) { // 缂烘枡
+ return 'danger'; // 绾㈣壊
+ } else if (status === 0) { // 鏈紑濮�
+ return 'success'; // 缁胯壊
+ } else if (status === 1) { // 鍑哄簱涓�
+ return 'primary'; // 钃濊壊
+ }
+ return ''; // 榛樿鏃犻鑹�
+ }
},
{
field: "createDate",
--
Gitblit v1.9.3