From 094f277b2a19214d5fec975d518579b72bf5601b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 16 十月 2024 09:46:09 +0800
Subject: [PATCH] 分页bug调整

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |   34 ++--------------------------------
 WebTM/layuiadmin/Scripts/webConfig.js                  |    2 +-
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html            |   21 +++------------------
 3 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 42e7a5f..9b027c4 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     /*var WEBURL = "http://localhost/API/";*/    //娼樻禉娓告湰鍦伴厤缃�  
     var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
     /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 9649c4f..4adc043 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -782,7 +782,7 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 'full-80'
-                    //, page: true
+                    , page: false
                     , cellMinWidth: 'auto'
                     , totalRow: true
                     , limit: 50
@@ -1129,23 +1129,8 @@
                                     }
                                 }
                             }
-
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , totalRow: true
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 'full-120'
-                                //, page: true
-                                , limits: [50, 500, 5000, 50000]
-                                , limit: 50
-                                , cellMinWidth: 90
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
+                            option.cols = [col];
+                            option.data = data1.data;
                             ins = table.render(option);
 
                             laypage.render(optionPage);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index c0a7150..4db1286 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1574,38 +1574,8 @@
                                 }
                             }
 
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 780
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                //, limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                                //, done: function (res, curr, count) {
-                                //    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
-                                //    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
-                                //    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
-                                //    for (var i = 0; i < $data.length; i++) {
-                                //        var l1 = $data.eq(i).find('div').width();
-                                //        var l2 = $head.eq(i).find('div').width();
-                                //        if (l1 > l2) {
-                                //            $head.eq(i).find('div').width(l1);
-                                //            $total.eq(i).find('div').width(l1);
-                                //        } else {
-                                //            $data.eq(i).find('div').width(l2);
-                                //            $total.eq(i).find('div').width(l2);
-                                //        }
-                                //    }
-                                //}
-                            }
+                            option.cols = [col];
+                            option.data = data1.data;
                             ins = table.render(option);
 
                             laypage.render(optionPage);

--
Gitblit v1.9.1