From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/webapp/static/js/order/out.js |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index abe3c6a..1ebda0a 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -42,6 +42,15 @@
             ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
             ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
             ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+            ,{field: 'finishStatus', align: 'center', title: '鏄惁瀹屾垚', templet: function(d){
+                    if (d.qty === 0 && d.enableQty === 0) {
+                        return '<span style="color:green;font-weight:bold;">瀹屾垚</span>';
+                    } else {
+                        return '<span style="color:red;">鏈畬鎴�</span>';
+                    }
+                }}
+
+
             // ,{field: 'name', align: 'center',title: '鍚嶇О'}
             // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
             // ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜', hide: true}

--
Gitblit v1.9.1