MES-WEB-LayUI.git

parent: 00ea07f0 | 补丁 | 提交 | ignore whitespace

wtt

2024-10-16 094f277b2a19214d5fec975d518579b72bf5601b

分页bug调整

3个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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/";      //ä½ææ°æ¬å°éç½®(å®ç)

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/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);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/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);

			@@ -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/"; //ä½ææ°æ¬å°éç½®(å®ç)

			@@ -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);

			@@ -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);