From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index 0ff790d..9cf366b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -16,6 +16,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <!--<style type="text/css">
         input.layui-input.layui-unselect {
@@ -212,6 +213,13 @@
                 , soulTable = layui.soulTable
             var option = [];
             var HModName = "QC_ProcessCheckBillList";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "7507";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+        //#endregion
+
             var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
             //鏌ヨ鏉′欢
             var sWhere = "";
@@ -321,6 +329,27 @@
                 $("#btnSearch").trigger('click');
             }
 
+            //#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
+
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
@@ -418,6 +447,7 @@
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
+                    //h_v_QC_ProcessCheckBill
                     url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
                     type: "GET",
                     async: false,
@@ -433,7 +463,7 @@
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -444,6 +474,13 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                             break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break; 
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
@@ -452,6 +489,7 @@
                             option = {
                                 elem: '#mainTable'
                                 , toolbar: '#toolbarDemo'
+                                , totalRow: true 
                                 , height: 'full-50'
                                 , page: true //寮�鍚垎椤�
                                 , limit: 500
@@ -544,7 +582,7 @@
                             com = "" + Comparator + "'" + ColContent + "'";
                             break;
                     }
-                    sWhere += " and " + ColName + " " + com;
+                    sqlWhere += " and " + ColName + " " + com;
                 }
 
                 if (HBillNo)
@@ -698,7 +736,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ュ簭妫�楠屽崟-鏂板'
+                    , title: '鏂板' + HPageTitle
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=1&linterid=&HSouceBillType='
                 })
@@ -730,7 +768,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+                        , title: '缂栬緫' + HPageTitle
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })

--
Gitblit v1.9.1