From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支

---
 WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html |   70 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 19 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index 32e538e..f71435e 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -18,7 +18,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">杩囨护鍒�</label>
                             <div class="layui-input-inline">
-                                <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
+                                <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" value="" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
                             </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>
@@ -33,12 +33,19 @@
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
         //寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
-      layui.use(['table', 'form', 'layer'], function () {
+        layui.use(['table', 'form', 'layer'], function () {
             var table = layui.table
                 , form = layui.form
                 , layer = layui.layer;
+
+            var sWhere = "";
+
+            var params = get_UrlVars();
+            var HProcID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭id
+            var HSourceID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐢熶骇璧勬簮id
 
             form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
                 //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -64,6 +71,29 @@
             });
             //#endregion
 
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+           
+
             table.render({
                 elem: '#mainTable'
                 // , url: '/demo/table/user/'
@@ -86,16 +116,19 @@
                     , { field: 'HWorkerID', width: 150, title: 'HWorkerID', hide: true }
                     , { field: 'HSourceID', width: 150, title: 'HSourceID', hide: true }
                     , { field: 'HBillType', width: 150, title: 'HBillType', hide: true }
-                    , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
-                    , { field: '鍗曟嵁鍙�', width: 150, title: '鍗曟嵁鍙�' }
-                    , { field: '浠诲姟鍗曞彿', width: 150, title: '浠诲姟鍗曞彿' }
-                    , { field: '鐢熶骇璁㈠崟鍙�', width: 150, title: '鐢熶骇璁㈠崟鍙�' }
-                    , { field: '鐢熶骇杞﹂棿浠g爜', width: 150, title: '鐢熶骇杞﹂棿浠g爜' }
+                    , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡',templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                    , { field: '鍗曟嵁鍙�', width: 170, title: '鍗曟嵁鍙�' }
+                    , { field: '宸ュ簭', width: 140, title: '宸ュ簭' }
+                    , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+                    , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
+                    , { field: '浠诲姟鍗曞彿', width: 170, title: '浠诲姟鍗曞彿' }
                     , { field: '鐢熶骇杞﹂棿', width: 150, title: '鐢熶骇杞﹂棿' }
                     , { field: '浜у搧浠g爜', width: 150, title: '浜у搧浠g爜' }
                     , { field: '浜у搧', width: 150, title: '浜у搧' }
-                    , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
                     , { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
+                    , { field: '鐢熶骇璁㈠崟鍙�', width: 170, title: '鐢熶骇璁㈠崟鍙�' }
+                    , { field: '鐢熶骇杞﹂棿浠g爜', width: 150, title: '鐢熶骇杞﹂棿浠g爜' }                                     
+                    , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }                  
                     , { field: '鍗曚綅浠g爜', width: 150, title: '鍗曚綅浠g爜' }
                     , { field: '鍗曚綅', width: 150, title: '鍗曚綅' }
                     , { field: '鐢熶骇鏁伴噺', width: 150, title: '鐢熶骇鏁伴噺' }
@@ -113,8 +146,7 @@
                     , { field: '濮斿鍔犲伐鍗曚綅', width: 150, title: '濮斿鍔犲伐鍗曚綅' }
                     , { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
                     , { field: '宸ュ簭鍙�', width: 150, title: '宸ュ簭鍙�' }
-                    , { field: '宸ュ簭浠g爜', width: 150, title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭', width: 150, title: '宸ュ簭' }
+                    , { field: '宸ュ簭浠g爜', width: 150, title: '宸ュ簭浠g爜' }                   
                     , { field: '鍔犲伐璇存槑', width: 150, title: '鍔犲伐璇存槑' }
                     , { field: '宸ヤ綔涓績浠g爜', width: 150, title: '宸ヤ綔涓績浠g爜' }
                     , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
@@ -124,8 +156,7 @@
                     , { field: '鐝粍', width: 150, title: '鐝粍' }
                     , { field: '鎿嶄綔宸ヤ唬鐮�', width: 150, title: '鎿嶄綔宸ヤ唬鐮�' }
                     , { field: '鎿嶄綔宸�', width: 150, title: '鎿嶄綔宸�' }
-                    , { field: '鐢熶骇璧勬簮浠g爜', width: 150, title: '鐢熶骇璧勬簮浠g爜' }
-                    , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+                    , { field: '鐢熶骇璧勬簮浠g爜', width: 150, title: '鐢熶骇璧勬簮浠g爜' }                  
                     , { field: '璁″垝鏁伴噺', width: 150, title: '璁″垝鏁伴噺' }
                     , { field: '娴佽浆鍗℃暟閲�', width: 150, title: '娴佽浆鍗℃暟閲�' }
                     , { field: '鏃堕棿鍗曚綅', width: 150, title: '鏃堕棿鍗曚綅' }
@@ -174,18 +205,19 @@
                 , limit: 50
             });
             ///鍔犺浇鏄剧ず鏁版嵁
-            function RoadQuery(Where) {
-                var index = layer.load();
-                var Value = Where;
-                if (Value == null) {
-                    Value = '';
+            function RoadQuery(Value) {
+                var index = layer.load();              
+                if (Value != "") {
+                    sWhere = " and 鍗曟嵁鍙� like '%" + Value + "%' ";
+                }
+                if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
+                    sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
                 }
                 $.ajax({
                     type: "get",
                     url: GetWEBURL() + "/Web/GetSc_ProcessExchangeBillListView",
                     async: true,
-                    data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
-                    //data: { "Value": Value },
+                    data: { "sWhere": sWhere,  "OrganizationID": sessionStorage["OrganizationID"] },
                     success: function (result) {
                         if (result.count == 1) {
                             ajaxReturnData = JSON.parse(JSON.stringify(result)).data;

--
Gitblit v1.9.1