From 8734498eb2eaece0198fe1bdb0f29014b918a555 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 13 五月 2024 13:10:54 +0800
Subject: [PATCH] 设备/器具(保养规程，设备保养计划，设备保养记录单)表头增加“保养级别”字段

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html     |   26 ++
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html            |   63 +++++
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html          |   89 ++++++--
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html          |    5 
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html                |    5 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html     |   50 +++++
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html            |   53 +++++
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html |   51 +++++
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html     |   79 +++++++
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html     |   67 +++++
 WebTM/layuiadmin/Scripts/webConfig.js                         |    4 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html         |    5 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                |   51 +++++
 13 files changed, 509 insertions(+), 39 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 78cc31c..7078c95 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     /*var WEBURL = "http://localhost:8083/API/";  //闄堥洴闈欐湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
    /* var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�*/
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index 5184a95..db7becf 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -89,6 +89,16 @@
                                                     <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇绾у埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>                                            
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -307,6 +317,8 @@
                         }
                         $("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HPlanNo").val(checkStatus.data[0].hmainid);
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                         get_MaintainItem1();
                     }
@@ -320,7 +332,43 @@
                     }
                 });
             });
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
             //浜у搧鍣ㄥ叿
             form.on('submit(HMouldList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -1016,6 +1064,8 @@
                                 , "HMouldName": data.浜у搧妯″叿
                                 , "HMouldMaintainRuleInterID": data.HMouldMaintainRuleInterID
                                 , "HMouldMaintainRuleInterNo": data.鍣ㄥ叿淇濆吇瑙勭▼
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 0aaa2f0..9ff136a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -109,6 +109,16 @@
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇绾у埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -304,6 +314,8 @@
                         }
                         $("#HMouldMaintainRuleNo").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HMouldMaintainRuleID").val(checkStatus.data[0].hmainid);
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
                         get_DocCheckItem2(checkStatus.data[0].hmainid);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                     }
@@ -314,6 +326,43 @@
                     end: function () {
                     },
                     success: function (layero, index) {
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
             });
@@ -531,6 +580,8 @@
                                 , "HRemark": data.澶囨敞
                                 , "HMouldMaintainRuleID": data.HMouldMaintainRuleID
                                 , "HMouldMaintainRuleNo": data.鍣ㄥ叿淇濆吇瑙勭▼
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index d14621b..69579c5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -441,6 +441,11 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index c69dea5..bb87132 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -141,6 +141,7 @@
             var option = [];
             var option1 = [];
             var option2 = [];
+            var titleData = [];
 
             $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
             $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -259,6 +260,27 @@
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
+            //#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
 
             //蹇�熻繃婊�
@@ -526,7 +548,58 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option.data = data1.data;
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            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鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        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 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , totalRow: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
                             table.render(option);
 
                             //鍒锋柊鎸夐挳鏄剧ず
@@ -536,8 +609,8 @@
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
-                            layer.alert("鏆傛棤璁板綍", { icon: 5 });
-                        }
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }                        
                     }, error: function () {
                         layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index c81c4b1..9ed76db 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -80,6 +80,16 @@
                                                     <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇绾у埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -337,6 +347,45 @@
                     //}
                 }
             });
+
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
             //#endregion
 
 
@@ -463,15 +512,17 @@
                         //console.log(result.code)
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             //console.log(result)
-                            var data = result.data.Sc_MouldMaintainRuleBillMain[0];
+                            var data = result.data.h_v_Sc_MouldMaintainRuleBill_Edit[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.HBillNo
-                                , "HDate": formatDate(data.HDate)
-                                , "HInnerBillNo": data.HInnerBillNo
-                                , "HExplanation": data.HExplanation               //鎽樿
-                                , "HRemark": data.HRemark
-                                , "HCycleUnit": data.HCycleUnit
-                                , "HCheckCycle": data.HCheckCycle
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HExplanation": data.鎽樿               //鎽樿
+                                , "HRemark": data.澶囨敞
+                                , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+                                , "HCheckCycle": data.淇濆吇鍛ㄦ湡
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
index 94ae563..9ba939f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
@@ -269,6 +269,27 @@
             });
             //#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
+
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             function set_ClearBill() {
                 $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -411,6 +432,11 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index e51039e..fa1f548 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -124,6 +124,16 @@
                                                     <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇绾у埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -382,7 +392,43 @@
                     }
                 })
             }
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
             //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
             form.on('submit(HEquipMaintainRuleInterList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -572,6 +618,8 @@
                         $("#HEquipID").val(checkStatus.data[0].HEquipID);
                         $("#HEquipMaintainRuleInterID").val(checkStatus.data[0].HMouldMaintainRuleID);
                         $("#HEquipMaintainRuleInterNo").val(checkStatus.data[0].淇濆吇瑙勭▼);
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                         get_MaintainItem3();
                       
@@ -815,7 +863,8 @@
                                 , "HRemark": data.琛ㄥご澶囨敞                //澶囨敞
                                 , "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID                //澶囨敞
                                 , "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼                //澶囨敞
-
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index f3de829..8c5f95e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -495,6 +495,11 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 087fb75..b26bbcd 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -115,6 +115,18 @@
                                         </div>
                                         <div class="layui-row" style="margin-top:10px;">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">淇濆吇绾у埆</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:60%;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaintainLev" id="btnMaintainLev" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top:10px;">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鎽樿</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:493px;"></textarea>
@@ -402,9 +414,48 @@
                         $("#HMouldMaintainRuleID").val(checkStatus.data[0].hmainid);
                         $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
                         $("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
 
                         get_DocCheckItem2(checkStatus.data[0].hmainid);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                });
+            });
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
             });
@@ -627,6 +678,8 @@
                                 , "HCheckCycle": data.淇濆吇鍛ㄦ湡
                                 , "HMouldMaintainRuleID": data.HMouldMaintainRuleID
                                 , "HMouldMaintainRuleNo": data.璁惧淇濆吇瑙勭▼
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 0b6ff1f..b098dd8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -161,6 +161,7 @@
             var option1 = [];
             var option2 = [];
             var HModName = "Sb_EquipMaintainPlanBillList";
+            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "3902";
@@ -442,8 +443,62 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option.data = data1.data;
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            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鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        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 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , totalRow: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
                             table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            //DisPlay_HideColumn();
 
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -452,11 +507,9 @@
 
                             layer.close(index);
                         } else {
-                            option.data = data1.data;
-                            table.render(option);
                             layer.close(index);
-                            layer.alert("鏆傛棤鏁版嵁", { icon: 5 });
-                        }
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }                        
                     }, error: function () {
                         layer.close(index);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index e790a08..ce8473b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -76,7 +76,17 @@
                                                     <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                 </div>
                                             </div>
-                                        </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇绾у埆</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>                                       
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
@@ -174,7 +184,7 @@
             var option = [];//淇濆吇
             var option1 = [];//閰嶄欢
             var sBillType = "3912";
-           //#endregion
+            //#endregion
 
 
 
@@ -329,6 +339,45 @@
                     //}
                 }
             });
+
+            //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+            form.on('submit(btnMaintainLev)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇绾у埆鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+                        $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
             //#endregion
 
 
@@ -355,7 +404,7 @@
             function Table() {
                 //琛ㄥご
                 columns = [
-                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
@@ -387,7 +436,7 @@
             function Table1() {
                 //琛ㄥご
                 columns = [
-                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
                     , { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
@@ -395,7 +444,7 @@
                     , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
                     , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitCode" }
                     , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', edit: 'text', event: "" }
-                    , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true}
+                    , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ];
@@ -446,7 +495,7 @@
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
                 option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                 table.render(option);
-                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "","HQty": "0", "HRemark": "" }];
+                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option1);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -461,15 +510,17 @@
                         //console.log(result.code)
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             console.log(result)
-                            var data = result.data.Sb_EquipMaintainRuleBillMain[0];
+                            var data = result.data.h_v_Sb_EquipMaintainRuleBillList[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.HBillNo
-                                , "HDate": formatDate(data.HDate)
-                                , "HInnerBillNo": data.HInnerBillNo
-                                , "HExplanation": data.HExplanation               //鎽樿
-                                , "HRemark": data.HRemark
-                                , "HCycleUnit": data.HCycleUnit
-                                , "HCheckCycle": data.HCheckCycle
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HExplanation": data.鎽樿               //鎽樿
+                                , "HRemark": data.澶囨敞
+                                , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+                                , "HCheckCycle": data.淇濆吇鍛ㄦ湡
+                                , "HMaintainLevID": data.HMaintainLevID
+                                , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
                             });
 
                         } else {
@@ -621,8 +672,7 @@
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         //淇濆吇椤圭洰淇℃伅
-                        if (obj.event === 'HMaintainItemNumber')  
-                        {
+                        if (obj.event === 'HMaintainItemNumber') {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
@@ -640,7 +690,7 @@
                                     var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }                                    
+                                    }
                                     if (checkStatus.data.length === 1) {
                                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                         obj.update({
@@ -688,9 +738,8 @@
                                 }
                             });
                         }
-                         //璐ｄ换浜轰俊鎭�
-                        if (obj.event === 'HManagerNumber') 
-                        {
+                        //璐ｄ换浜轰俊鎭�
+                        if (obj.event === 'HManagerNumber') {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
index 667c73d..6d79263 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
@@ -472,6 +472,11 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'});

--
Gitblit v1.9.1