From 7cb06e1b369e7d79b314a8a3573b215aa078c4c5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 03 二月 2026 11:33:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView2.html |   67 +++++++++++----------------------
 1 files changed, 23 insertions(+), 44 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
index 152c6db..8981784 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
@@ -21,14 +21,13 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
                         </div>
                     </div>
                 </form>
             </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,22 +40,16 @@
             , 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')
-                 , data = checkStatus.data;
-                parent.GetICMOBillValue(data);
-                var index = parent.layer.getFrameIndex(window.name);
-                parent.layer.close(index);
-            });
-            RoadQuery($('#Value').val());
+            //RoadQuery($('#Value').val());
+            var ICMOBill = $('#Value').val();
             table.render({
-                elem: '#ck-table'
+                elem: '#mainTable'
                 // , url: '/demo/table/user/'
-               , data: []
+                , url: GetWEBURL() + "/Web/GetSc_ICMOBillListView2"
+                , where: { "ICMOBill": "", "OrganizationID": sessionStorage["OrganizationID"] } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
               , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
               , cols: [[
                   { type: 'radio' }
@@ -113,8 +106,19 @@
                   , { field: '浣滃簾鏃ユ湡', width: 150, title: '浣滃簾鏃ユ湡' }
                   , { field: '鍗曟嵁绫诲瀷', width: 150, title: '鍗曟嵁绫诲瀷' }
               ]]
-              , page: true
+                , page: true
+                , limits: [50, 500, 5000, 50000]
+                , limit: 50, //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                method: 'get',  //鎻愪氦鏂瑰紡
+                layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                response: {
+                    statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+                },
+                done: function (res) {   //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+                    layer.close(layer.index);    //杩斿洖鏁版嵁鍏抽棴loading		    	
+                }
             });
+
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadQuery(Where) {
                 var index = layer.load();
@@ -122,38 +126,13 @@
                 if (Value == null) {
                     Value = '';
                 }
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/Web/GetSc_ICMOBillListView2",
-                    async: true,
-                    data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
-                    //data: { "Value": Value },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                            table.reload('ck-table', {
-                                data: ajaxReturnData
-                                , height: 'full-10'
-                                , loading: false
-                                , done: function (index, res) {
-
-                                }
-                            });
-                            layer.close(index);
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    },
-                    error: function (result) {
-                        layer.close(index);
-                        console.log(result);
-                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
-                    }
+                table.reload("mainTable", { //姝ゅ鏄笂鏂囨彁鍒扮殑 鍒濆鍖栨爣璇唅d
+                    where: { "page": 1, "limit": 10, "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
                 });
+
             };
         });
+      
     </script>
 
 </body>

--
Gitblit v1.9.1