From b31c69631ee75cdc02195a2e3efff3f9ad95943d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 三月 2021 16:08:45 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/custOrder/custOrder.js |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 90bcf04..cc47364 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -74,6 +74,7 @@
                 top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
+            tableX.merges('custOrder', [1, 11]);
             limit();
             form.on('checkbox(tableCheckbox)', function (data) {
                 var _index = $(data.elem).attr('table-index')||0;
@@ -207,6 +208,7 @@
                                 // ,area: ['800px','450px']
                                 ,area: '800px'
                                 ,shade: 0.5
+                                ,shadeClose: true
                                 ,id: 'LAY_layuipro'
                                 ,btn: ['绔嬪嵆鐢熸垚', '绋嶅悗澶勭悊']
                                 ,btnAlign: 'c'
@@ -219,14 +221,15 @@
                                         page: true,
                                         cellMinWidth: 100,
                                         // ,width: admin.screen() > 1 ? 892 : ''
-                                        height: 332,
+                                        height: 432,
                                         cols: [[
                                             {field: 'title', title: '鍟嗗搧', align: 'center'},
                                             {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80},
                                             {field: 'locNo', title: '璐т綅', align: 'center'},
                                             {field: 'prior$', title: '鎺ㄨ崘璐т綅', align: 'center', width: 100},
                                             {field: 'reduce', title: '鏁伴噺', align: 'center', width: 80, style: 'font-weight: bold'},
-                                            {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
+                                            // {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
+                                            {field: 'total', title: '鎬婚噺', align: 'center', width: 80},
                                         ]],
                                         done: function () {
                                             tableX.merges('stoPreTab', [0,1]);
@@ -485,22 +488,22 @@
         page: {
             curr: pageCurr
         },
-        done: function (res, curr, count) {
-            if (res.code === 403) {
-                top.location.href = baseUrl+"/";
-            }
-            pageCurr=curr;
-            if (res.data.length === 0 && count !== 0) {
-                tableIns.reload({
-                    where: searchData,
-                    page: {
-                        curr: pageCurr-1
-                    }
-                });
-                pageCurr -= 1;
-            }
-            limit(child);
-        }
+        // done: function (res, curr, count) {
+        //     if (res.code === 403) {
+        //         top.location.href = baseUrl+"/";
+        //     }
+        //     pageCurr=curr;
+        //     if (res.data.length === 0 && count !== 0) {
+        //         tableIns.reload({
+        //             where: searchData,
+        //             page: {
+        //                 curr: pageCurr-1
+        //             }
+        //         });
+        //         pageCurr -= 1;
+        //     }
+        //     limit(child);
+        // }
     });
 }
 

--
Gitblit v1.9.1