From 63d53fc90ba0b00be2a2bce2ca4f87731f546542 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 14:46:51 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 95280dd..7de5fcb 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -155,13 +155,14 @@
                                 limit: Number.MAX_VALUE,
                                 cellMinWidth: 100,
                                 cols: [[
-                                    {type: 'checkbox', merge: ['orderNo']},
+                                    // {type: 'checkbox', merge: ['orderNo']},
                                     {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
-                                    {field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
-                                    {field: 'batch', title: '鎵瑰彿', merge: ['title'], align: 'center'},
+                                    {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+                                    {field: 'batch', title: '鎵瑰彿', align: 'center'},
                                     {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
                                     {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
-                                    {field: 'staNo', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+                                    {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+                                    {type: 'checkbox', merge: ['locNo']},
                                 ]],
                                 done: function (res) {
                                     tableMerge.render(this);

--
Gitblit v1.9.1