From 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:41:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index dd239b6..2e20edc 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -28,7 +28,7 @@
             </div>
         </div>
     </div>
-    <table class="layui-hide" id="ck-table"></table>
+    <table class="layui-hide" id="mainTable"></table>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -41,20 +41,20 @@
             , layer = layui.layer;
 
             form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
-                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                 RoadQuery($('#Value').val());
             });
             form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
-                //var sMainStr = JSON.stringify(table.cache['ck-table']);
-                var checkStatus = table.checkStatus('ck-table')
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                var checkStatus = table.checkStatus('mainTable')
                  , data = checkStatus.data;
-                //parent.GetICMOBillValue(data[0].hmainid);
+                parent.GetICMOBillValue(data);
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
             RoadQuery($('#Value').val());
             table.render({
-                elem: '#ck-table'
+                elem: '#mainTable'
                 // , url: '/demo/table/user/'
                , data: []
               , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
@@ -124,7 +124,9 @@
                   , { field: '琛屽叧闂汉', width: 150, title: '琛屽叧闂汉' }
                   , { field: '鍏抽棴绫诲瀷', width: 150, title: '鍏抽棴绫诲瀷' }
               ]]
-              , page: true
+                , page: true
+                , limits: [50, 500, 5000, 50000]
+                , limit: 50
             });
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadQuery(Where) {
@@ -142,7 +144,7 @@
                     success: function (result) {
                         if (result.count == 1) {
                             ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                            table.reload('ck-table', {
+                            table.reload('mainTable', {
                                 data: ajaxReturnData
                                 , height: 'full-10'
                                 , loading: false

--
Gitblit v1.9.1