From 34e08619ee8fa88ea81b32b19a553743587f9244 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 10:37:44 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index d9f3b50..36a9d82 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);
@@ -173,12 +174,13 @@
                                 let index  = obj.othis.parents('tr').attr("data-index");
                                 let data = tableCache[index];
                                 data['staNo'] = Number(obj.elem.value);
+                                obj.othis.children().find("input").css("color", "blue");
                                 return false;
                             });
                         }
                         ,yes: function(index, layero){
                             //鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
-                            pakout(tableCache);
+                            pakout(tableCache, index);
                         }
                         ,btn2: function(index, layero){
                             //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
@@ -195,8 +197,9 @@
         })
     }
 
-    function pakout(tableCache) {
-        let loadIndex = layer.load(2);
+    function pakout(tableCache, layerIndex) {
+        // let loadIndex = layer.load(2);
+        notice.msg('姝e湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4, position: "top"});
         $.ajax({
             url: baseUrl + "/out/pakout/auth",
             headers: {'token': localStorage.getItem('token')},
@@ -204,9 +207,12 @@
             data: JSON.stringify(tableCache),
             method: 'POST',
             success: function (res) {
-                layer.close(loadIndex);
+                notice.destroy();
                 if (res.code === 200) {
-                    layer.msg(res.msg, {icon: 1})
+                    layer.close(layerIndex);
+                    layer.msg(res.msg, {icon: 1});
+                    insTb.reload({where: null});
+                    insTb2.reload({where: null, page: {curr: 1}});
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/";
                 } else {

--
Gitblit v1.9.1