From 7bb3ffb383e41f66ea9e89b8b0f8182726e77d1b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 27 一月 2026 15:14:07 +0800
Subject: [PATCH] 华舟 新增 器具保养规程 器具点检规程 设备点检规程 设备保养规程 的默认结果选择

---
 WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html |   78 ++++++++++++
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html        |   72 +++++++++++
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html   |   56 +++++++--
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html        |  154 ++++++++++++++++++++----
 4 files changed, 312 insertions(+), 48 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index af94716..068bdf3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -22,6 +22,18 @@
             margin-left: 123px;
             min-height: 36px;
         }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 
@@ -272,6 +284,13 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <script type="text/html" id="HStdDotCheckResult">
+        <select name="HStdDotCheckResult" value="OK" lay-filter="HStdDotCheckResult" id="HStdDotCheckResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
+    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -358,7 +377,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+                var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -501,6 +520,24 @@
                     //}
                 }
             });
+
+            //琛岄�夋嫨澶勭悊锛堥粯璁ょ偣妫�缁撴灉锛�
+            form.on('select(HStdDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult']);
+                }
+                form.render('select');
+            });
+
             //#endregion
 
 
@@ -533,6 +570,7 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemNumber', title: '鐐规椤圭洰浠g爜', edit: 'text', event: 'HDotCheckItemNumber' }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰' }
+                    , { field: 'HStdDotCheckResult', title: "鐐规缁撴灉", templet: '#HStdDotCheckResult', event: 'HStdDotCheckResult' }
                     , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', event: 'HDotCheckItemClassName' }
                     , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
@@ -568,7 +606,7 @@
                 $("#check-btn").addClass('layui-btn-disabled').attr('disabled', true)
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -666,11 +704,34 @@
                             var subarr = [];
 
                             for (var i = 0; i < data.length; i++) {
-                                subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItemNumber": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                                subarr.push({
+                                    "HDotCheckItemID": data[i].鐐规椤圭洰ID,
+                                    "HDotCheckItemNumber": data[i].鐐规椤圭洰浠g爜,
+                                    "HDotCheckItem": data[i].鐐规椤圭洰,
+                                    "HDotCheckPart": data[i].鐐规閮ㄤ綅,
+                                    "HClaim": data[i].鍏蜂綋瑕佹眰,
+                                    "HManagerID": data[i].璐熻矗浜篒D,
+                                    "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+                                    "HManagerName": data[i].璐熻矗浜哄悕绉�,
+                                    "HRemark": data[i].瀛愬娉�,
+                                    "HDotCheckItemClassID": data[i].HDotCheckItemClassID,
+                                    "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
+                                    "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID,
+                                    "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О,
+                                    "HStdDotCheckResult": data[i]["鐐规缁撴灉"] || "OK"
+                                });
+
                             }
 
                             option.data = subarr;
                             table.render(option);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                                $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                            }
+                            form.render('select');
+
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -728,6 +789,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(buttonArr[i - 1]['HStdDotCheckResult'])
+                }
+                form.render('select');
             }
 
             //澶嶅埗涓�琛�
@@ -745,6 +811,12 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                        $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                    }
+                    form.render('select');
                 }
             }
 
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 288867f..9d62050 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"
@@ -197,7 +197,7 @@
                                             <label class="layui-form-label">榛樿瑙勭▼</label>
                                             <div class="layui-input-inline">
                                                 <input type="checkbox" name="HStandard" id="HStandard"
-                                                    lay-skin="primary" value="1" title="" checked="false" >
+                                                    lay-skin="primary" value="1">
                                             </div>
                                         </div>
                                     </div>
@@ -324,14 +324,14 @@
                         <script type="text/html" id="xuhao1">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
-                        
+
                     </form>
                 </div>
             </div>
         </div>
     </div>
     <script type="text/html" id="HStdMaintainResult">
-        <select name="HStdMaintainResult" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+        <select name="HStdMaintainResult" value="OK" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
             <!--<option value="">璇烽�夋嫨</option>-->
             <option value="OK" selected>OK</option>
             <option value="NG">NG</option>
@@ -427,7 +427,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HStdMaintainResult": "OK"};
+                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HStdMaintainResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -477,15 +477,17 @@
             form.on('submit(Saver)', function (data) {
 
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
-                data.field["HStandard"] = data.field["HStandard"]?1:0
+                data.field["HStandard"] = data.field["HStandard"] ? 1 : 0
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
+                console.log(sSubStr)
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
+
                 $.ajax(
                     {
                         type: "POST",
@@ -615,16 +617,21 @@
             });
 
 
-             //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
-            form.on('select(HStdMaintainResultHandler)', function (data) {
+            //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
+            form.on('select(HStdMaintainResult)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
                 var elem = data.othis.parents('tr');
                 var dataindex = elem.attr("data-index");
-                $.each(option2.data, function (index, value) {
+                $.each(option.data, function (index, value) {
                     if (value.LAY_TABLE_INDEX == dataindex) {
                         value.HStdMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult']);
+                }
+                form.render('select');
             });
 
             //#endregion
@@ -656,7 +663,7 @@
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
-                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResultHandler' }
+                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResult' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
                     , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
@@ -757,7 +764,6 @@
                     success: function (result) {
                         //console.log(result.code)
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            //console.log(result)
                             var data = result.data.h_v_Sc_MouldMaintainRuleBill_Edit[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": OperationType == 2 ? "" : data.鍗曟嵁鍙�
@@ -785,6 +791,8 @@
                                 , "HDeleteMan": data.浣滃簾浜�
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
                             });
+
+                            $("#HStandard").prop("checked", data.榛樿瑙勭▼);
                             let type = OperationType
 
                             if (OperationType == 3 && data['瀹℃牳浜�'] != '' && data['瀹℃牳浜�'] != null) {
@@ -795,6 +803,8 @@
                             if (OperationType == 2) {
                                 $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
                             }
+
+                            form.render()
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
@@ -816,12 +826,22 @@
                         //console.log('gouba' + result);
                         if (result.count == 1) {
                             option.data = result.list[0];
-                            console.log(option.data)
-                            console.log(result.list[0][0]["榛樿瑙勭▼"])
-                            $("#HStandard").prop("checked",result.list[0][0]["榛樿瑙勭▼"])
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (!option.data[i]['HStdMaintainResult']) {
+                                    option.data[i]['HStdMaintainResult'] = 'OK'
+                                }
+
+                            }
                             table.render(option);
                             option1.data = result.list[1];
                             table.render(option1);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdMaintainResult' + i + 1 + ''))
+                                $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                            }
+                            form.render('select');
+
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
@@ -879,6 +899,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(buttonArr[i - 1]['HStdMaintainResult'])
+                }
+                form.render('select');
             }
             //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
@@ -907,6 +932,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdMaintainResult' + i + 1 + ''))
+                        $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                    }
+                    form.render('select');
                 }
             }
             //澶嶅埗涓�琛�
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_EquipDotCheckRuleEdit.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_EquipDotCheckRuleEdit.html"
index 433329e..911365f 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_EquipDotCheckRuleEdit.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_EquipDotCheckRuleEdit.html"
@@ -1,23 +1,25 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8" />
     <title>鏂板/缂栬緫璁惧鐐规瑙勭▼鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
     <style type="text/css">
-
         /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
         .layui-form-item .layui-inline {
             margin-top: 5px;
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         /*end*/
         .layui-form-label {
             width: 199px;
@@ -27,8 +29,21 @@
             margin-left: 229px;
             min-height: 36px;
         }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
+
 <body>
     <div id="layout1" class="layui-fluid">
         <div class="layui-row layui-col-space15">
@@ -37,9 +52,12 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                    lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                    lay-submit="" lay-filter="Checker">瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+                                    lay-filter="Exit">閫�鍑�</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -56,7 +74,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍗曟嵁鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+                                                        id="HBillNo" readonly="readonly" autocomplete="off">
                                                     <input id="HInterID" name="HInterID" type="hidden" />
                                                 </div>
                                             </div>
@@ -69,7 +88,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                                    <input type="date" class="layui-input" name="HBeginDate"
+                                                        id="HBeginDate">
                                                 </div>
                                             </div>
                                         </div>
@@ -77,13 +97,16 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+                                                    <input type="date" class="layui-input" name="HEndDate"
+                                                        id="HEndDate">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鐐规鍛ㄦ湡 <label style="color:red"> * </label></label>
+                                                <label class="layui-form-label">鐐规鍛ㄦ湡 <label style="color:red"> *
+                                                    </label></label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle" value="">
+                                                    <input class="layui-input" name="HCheckCycle"
+                                                        lay-verify="HCheckCycle" id="HCheckCycle" value="">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -101,19 +124,22 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鎽樿</label>
                                                 <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea"
+                                                        name="HExplanation" id="HExplanation"></textarea>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    <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-block" style="width:190px;">
-                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID" value="0">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID"
+                                                        name="HCREATEORGID" id="HCREATEORGID" value="0">
                                                     <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                         <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                     </select>
@@ -124,7 +150,8 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">榛樿瑙勭▼</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="">
+                                                    <input type="checkbox" name="HStandard" id="HStandard"
+                                                        lay-skin="primary" title="">
                                                 </div>
                                             </div>
                                         </div>
@@ -135,25 +162,29 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HMaker" id="HMaker"
+                                                        style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HChecker" id="HChecker"
+                                                        style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCloseMan"
+                                                        id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+                                                        style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
 
@@ -162,25 +193,29 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HMakeDate"
+                                                        id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCheckDate"
+                                                        id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HCloseDate"
+                                                        id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HUpDateDate"
+                                                        id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -188,13 +223,15 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HDeleteMan"
+                                                        id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                    <input type="text" class="layui-input" name="HDeleteDate"
+                                                        id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -221,6 +258,13 @@
     </div>
     <script type="text/html" id="barDemo">
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script type="text/html" id="HStdDotCheckResult">
+        <select name="HStdDotCheckResult" value="OK" lay-filter="HStdDotCheckResult" id="HStdDotCheckResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
     </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -261,8 +305,8 @@
                 , util = layui.util
                 ;
             var sBillType = "3913";
-            var HModName= "Sb_EquipDotCheckRuleEdit"
-            var unEditable = ["HManagerName"]
+            var HModName = "Sb_EquipDotCheckRuleEdit"
+            var unEditable = ["HManagerName", 'HStdDotCheckResult']
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -310,7 +354,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -334,6 +378,24 @@
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 set_btnSave(data);
             })
+
+            //琛岄�夋嫨澶勭悊锛堥粯璁ょ偣妫�缁撴灉锛�
+            form.on('select(HStdDotCheckResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult']);
+                }
+                form.render('select');
+            });
+
             //#endregion
 
             //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
@@ -560,6 +622,7 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+                    , { field: 'HStdDotCheckResult', title: "鐐规缁撴灉", templet: '#HStdDotCheckResult', event: 'HStdDotCheckResult' }
                     , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
                     , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
@@ -618,7 +681,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HStdDotCheckResult": "OK" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -649,6 +712,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+
+                for (i = 1; i <= buttonArr.length; i++) {
+                    $('#HStdDotCheckResult' + i + '').val(buttonArr[i - 1]['HStdDotCheckResult'])
+                }
+                form.render('select');
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
@@ -666,6 +734,12 @@
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                     //layer.alert(copyrow);
+
+                    for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                        $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                    }
+                    form.render('select');
                 }
             }
             //缂栬緫
@@ -757,12 +831,33 @@
                             var data = result.data;
                             var rowarr = [];
                             for (var i = 0; i < result.data.length; i++) {
-                                rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+                                rowarr.push({
+                                    "HDotCheckItemID": data[i].鐐规椤圭洰ID,
+                                    "HDotCheckItem": data[i].鐐规椤圭洰,
+                                    "HDotCheckPart": data[i].鐐规閮ㄤ綅,
+                                    "HClaim": data[i].鍏蜂綋瑕佹眰,
+                                    "HManagerID": data[i].璐熻矗浜篒D,
+                                    "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+                                    "HManagerName": data[i].璐熻矗浜�,
+                                    "HRemark": data[i].瀛愬娉�,
+                                    "HDotCheckItemClassID": data[i].HDotCheckItemClassID,
+                                    "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
+                                    "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID,
+                                    "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О,
+                                    "HStdDotCheckResult": data[i]["鐐规缁撴灉"] || "OK"
+                                });
                             }
                             option.data = rowarr;
                             DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
                             setUneditableCol_WithUneditable(option, unEditable, [])
                             table.render(option);
+
+                            
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdDotCheckResult' + i + 1 + ''))
+                                $('#HStdDotCheckResult' + i + '').val(option.data[i - 1]['HStdDotCheckResult'])
+                            }
+                            form.render('select');
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -858,4 +953,5 @@
         }
     </script>
 </body>
+
 </html>
\ No newline at end of file
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 960a205..5ddec01 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"
@@ -17,6 +17,23 @@
         .layui-form-label {
             width: 85px;
         }
+
+        .layui-input-block {
+            margin-left: 123px;
+            min-height: 36px;
+        }
+
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
@@ -260,6 +277,13 @@
     <script type="text/html" id="barDemo">
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+     <script type="text/html" id="HStdMaintainResult">
+        <select name="HStdMaintainResult" value="OK" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <option value="OK" selected>OK</option>
+            <option value="NG">NG</option>
+        </select>
+    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -296,7 +320,7 @@
             var option1 = [];//閰嶄欢
             var HModName = "Sb_EquipMaintainRuleListSub1";
             var HModName1 = "Sb_EquipMaintainRuleListSub2";
-            var unEditable = ["HMaintainItem", "HManagerName"]
+            var unEditable = ["HMaintainItem", "HManagerName", 'HStdMaintainResult']
             var unEditable1 = ["HMaterName", "HUnitNumber", "HUnitName"]
             var sBillType = "3912";
             //#endregion
@@ -511,6 +535,24 @@
                 });
             });
 
+            //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
+             form.on('select(HStdMaintainResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStdMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                table.render(option)
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult']);
+                }
+                form.render('select');
+            });
+
+
             //#endregion
 
 
@@ -547,6 +589,7 @@
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
+                    , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResult' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
                     , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
@@ -604,7 +647,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " ","HStdMaintainResult": "OK"  }];
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option);
                 table.render(option1);
@@ -630,7 +673,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ","HStdMaintainResult": "OK"  }];
                 table.render(option);
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option1);
@@ -718,11 +761,24 @@
                             option.data = result.list[0];
                             DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                             setUneditableCol_WithUneditable(option, unEditable, [])
+                             for (var i = 0; i < option.data.length; i++) {
+                                if (!option.data[i]['HStdMaintainResult']) {
+                                    option.data[i]['HStdMaintainResult'] = 'OK'
+                                }
+
+                            }
                             table.render(option);
                             option1.data = result.list[1];
                             DisPlay_HideColumnEdit(HModName1, sessionStorage["HUserName"], option1, table);
                             setUneditableCol_WithUneditable(option1, unEditable1, [])
                             table.render(option1);
+
+                            for (i = 1; i <= option.data.length; i++) {
+                                console.log($('#HStdMaintainResult' + i+1 + ''))
+                                $('#HStdMaintainResult' + i + '').val(option.data[i-1]['HStdMaintainResult'])
+                            }
+                            form.render('select');
+
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -780,6 +836,11 @@
                 table.reload("mainTable", {
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
+                for (i = 1; i <= buttonArr.length; i++) {
+                    console.log($('#HStdMaintainResult' + i + 1 + ''))
+                    $('#HStdMaintainResult' + i + '').val(buttonArr[i - 1]['HStdMaintainResult'])
+                }
+                form.render('select');
             }
             //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
@@ -808,6 +869,11 @@
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                     for (i = 1; i <= option.data.length; i++) {
+                        console.log($('#HStdMaintainResult' + i + 1 + ''))
+                        $('#HStdMaintainResult' + i + '').val(option.data[i - 1]['HStdMaintainResult'])
+                    }
+                    form.render('select');
                 }
             }
             //澶嶅埗涓�琛�

--
Gitblit v1.9.1