From c7bf4b8773f888fd5be613b7bb6fb8ae4a47b028 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 23 四月 2024 16:53:57 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 6c3bd2e..21099b0 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -30,23 +30,15 @@
         height: 'full-120',
         where: {order_id: 9999999999},
         cols: [[
-            {type: 'checkbox'},
-            {type: 'numbers', title: '#'},
-            {field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
-            {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�'},
-            {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�'},
-            {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�'},
-            {field: 'fusingPointMax', title: '鏈�澶х啍鐐�'},
-            {field: 'yellownessMin', title: '鏈�灏忛粍搴�'},
-            {field: 'yellownessMax', title: '鏈�澶ч粍搴�'},
-            {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�'},
-            {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�'},
-            // ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
-            // ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+            {type: 'checkbox'}
+            ,{type: 'numbers', title: '#'}
+            ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
+            ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
+            ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
             ,{field: 'anfme', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'}
             ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
-            // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
-            // ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜', hide: true}
+            ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+            ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜', hide: true}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
         ]],
         request: {
@@ -152,16 +144,13 @@
                                 cols: [[
                                     // {type: 'checkbox', merge: ['orderNo']},
                                     {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
-                                    {field: 'batch', title: '鎵瑰彿', merge: true, align: 'center'},
-                                    {field: 'packageNo', title: '鍖呭彿', align: 'center'},
-                                    {field: 'orderDetlId', title: 'id', align: 'center',hide:true},
-                                    {field: 'qtyAnfme', title: '鍑哄簱鏁伴噺', align: 'center'},
-                                    {field: 'locNo', title: '搴撲綅鍙�', align: 'center',templet: '#locNoTpl'},
+                                    {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+                                    {field: 'hostId', title: 'id', align: 'center'},
                                     // { title: '鍓╀綑闇�姹傞噺', align: 'center' , width: 120, toolbar: '#checkNeedQty'},
                                     // {field: 'anfme', title: '瀹為檯鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
-                                    // { title: '鍑哄簱鏁伴噺', align: 'center',field: 'anfme', width: 90, style: 'font-weight: bold; color: red'},
-                                    // {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
-                                    // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+                                    { title: '鍑哄簱鏁伴噺', align: 'center',field: 'anfme', width: 90, style: 'font-weight: bold; color: red'},
+                                    {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+                                    {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                                     // {type: 'checkbox', merge: ['locNo']},
                                 ]],
                                 done: function (res) {

--
Gitblit v1.9.1