From 6b3c19b794f9b234bd27db4915ee7142b8f4a80c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 六月 2024 10:57:43 +0800
Subject: [PATCH] 设备点检规程增加字段宽度,设备维修验收单选完源单带出设备,负责人

---
 WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html |  279 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 168 insertions(+), 111 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index 656e1a5..fd87c35 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -68,6 +68,10 @@
         .layui-form-label {
             width: 25%;
         }
+        /*鏄庣粏琛屽閫夋灞呬腑*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 15%;
+        }
     </style>
 </head>
 
@@ -82,7 +86,7 @@
                     <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                         <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
                         <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
-                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+                        <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
                         <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
                     </div>
                     <div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -161,8 +165,40 @@
                                                 <input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <th>淇濆吇璁″垝</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HEquipMaintainPlanInterID" class="layui-input LineHeight" id="HEquipMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+                                                <input type="hidden" name="HEquipMaintainPlanEntryID" class="layui-input LineHeight" id="HEquipMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+                                            </td>
+                                        </tr>
                                     </tbody>
                                 </table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-inline" style="margin-bottom:5px;">
+                                    <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
+                                    <div class="layui-input-inline">
+                                        <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:180px;" readonly="readonly">
+                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+                                    </div>
+                                </script>
+                                <script type="text/html" id="xuhao">
+                                    {{d.LAY_TABLE_INDEX+1}}
+                                </script>
+                                <script type="text/html" id="barDemo">
+                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+                                </script>
                             </div>
                             <div class="layui-tab-item">
                                 <table style="width:80%;">
@@ -218,35 +254,11 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-inline" style="margin-bottom:5px;">
-                                    <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
-                                    <div class="layui-input-inline">
-                                        <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
-                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
-                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                <script type="text/html" id="toolbarDemo">
-                                    <div class="layui-btn-container">
-                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
-                                    </div>
-                                </script>
-                                <script type="text/html" id="xuhao">
-                                    {{d.LAY_TABLE_INDEX+1}}
-                                </script>
-                                <script type="text/html" id="barDemo">
-                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-                                </script>
-                            </div>
                         </div>
                         <ul class="layui-tab-title">
                             <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
                             <li>鏄庣粏淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
                         </ul>
                     </div>
                     <!--闅愯棌瀛楁-->
@@ -257,11 +269,15 @@
         </div>
     </div>
     <!--琛屼笅鎷夐�夋嫨(淇濆吇缁撴灉)-->
-    <script type="text/html" id="HDotCheckResult">
+    <!--<script type="text/html" id="HDotCheckResult">
         <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
             <option value="OK">OK</option>
             <option value="NG">NG</option>
         </select>
+    </script>-->
+    <!--澶嶉�夋锛堜繚鍏荤粨鏋滐級-->
+    <script type="text/html" id="HMaintainResult">
+        <input type="checkbox" value="{{d.HMaintainResult}}" lay-skin="primary" id="HMaintainResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HMaintainResult" {{ d.HMaintainResult == 1 ? 'checked' : '' }}>
     </script>
     <script>
         layui.config({
@@ -320,13 +336,20 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
+
+            //褰撳墠鎵�鍦ㄩ〉绛�
+            var cur_title = "鍩烘湰淇℃伅";
+            //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+            element.on('tab(TabTest)', function (data) {
+                cur_title = data.elem.context.innerText;
+            })
             //#endregion
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+                var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -365,13 +388,25 @@
             });
 
             //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
-            form.on('select(HDotCheckResult)', function (data) {
+            //form.on('select(HDotCheckResult)', 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.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+            //        }
+            //    });
+            //});
+
+            //鏄惁鍚堟牸
+            form.on('checkbox(HMaintainResult)', 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.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                        value.HMaintainResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
             });
@@ -384,17 +419,19 @@
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                    parent.location.href = "../../../views/index_Mobile.html";
                 });
             })
 
             //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦                
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var oMain = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sMainSub = oMain + ';' + sSubStr;
                 if (AllowLoadData(sSubStr)) {
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
                     $.ajax({
                         type: "POST",
                         url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
@@ -408,12 +445,11 @@
                                 $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
-                                layer.close(index);
+                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
                                 layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         },
                         error: function (err) {
-                            layer.close(index);
                             layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
@@ -423,40 +459,44 @@
 
             //鏂板
             form.on('submit(Add)', function (data) {
-                $('#Saver').addClass("buttom_box_little");
-                $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
-                $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
-                $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    $('#Saver').addClass("buttom_box_little");
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+                    $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+                    $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
 
-                // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
-                $("#formData")[0].reset();
-                layui.form.render();
-                option.data = [{ "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
-                table.render(option);
+                    // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+                    $("#formData")[0].reset();
+                    layui.form.render();
+                    option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                    table.render(option);
 
-                $("#HBarCode").focus();
-                //鑾峰彇鏈�澶у崟鎹彿
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3901' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val("0");
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //淇濆吇寮�濮嬫椂闂�
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //淇濆吇缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
-                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+                    $("#HBarCode").focus();
+                    //鑾峰彇鏈�澶у崟鎹彿
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        data: { "HBillType": '3901' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HInterID").val("0");
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                    });
+                    $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //淇濆吇寮�濮嬫椂闂�
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //淇濆吇缁撴潫鏃堕棿
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
+                    $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
+
+                    layer.close(index);
+                });    
             })
 
             //#region 閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    Pub_Close(2);
+                    parent.location.href = "../../../views/index_Mobile.html";
                 });
             })
             //#endregion
@@ -535,27 +575,22 @@
             });
             function get_DocCheckItem2() {
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+                    url: GetWEBURL() + "/Web/GetMaintainItemByMaintainRuleID",
                     type: "GET",
-                    data: { "HDotCheckRuleInterID": $("#HEquipMaintainRuleInterID").val() },
+                    data: { "HEquipMaintainRuleInterID": $("#HEquipMaintainRuleInterID").val() },
                     success: function (result) {
                         if (result != null) {
-                            if (result.count == 1) {
-                                var BYData = result;//
-                                var rowdate1 = layui.table.cache["mainTable"];
+                            if (result.count == 1) {                               
+                               
                                 var data = result.data;
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                 table.render(option);
 
-                                if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                if (data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.data.length; i++) {
-                                        var checkrow = {
-                                            "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
-                                            "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
-                                            "HManagerName": data[i].HManagerName
-                                        };
+                                    for (var i = 0; i < data.length; i++) {
+                                        var checkrow = { "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].HMaintainItemID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": data[i].淇濆吇椤圭洰, "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
                                     table.reload("mainTable", {
@@ -564,7 +599,7 @@
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                 table.render(option);
                                 layer.alert("璇ヨ澶囨殏鏃犻粯璁や繚鍏昏褰�", { icon: 5 });
                             }
@@ -578,34 +613,38 @@
             function set_InitGrid() {
                 //琛ㄥご
                 columns = [
-                    { type: 'checkbox' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", width: 80 }
-                    , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HDotCheckResult' }
+                    //{ type: 'checkbox' }
+                    { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 45 }
+                    , { field: 'HMaintainResult', title: '缁撴灉', templet: '#HMaintainResult', width:55 }
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
-                    , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true}
+                    , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
-                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true}
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
                     , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
                     , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
                 ];
                 option = {
                     id: 'mainTable'
                     , elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , page: true
+                    //, toolbar: '#toolbarDemo'
+                    , page: false
                     , cellMinWidth: 100
-                    , height: 500
+                    , limit: 100
+                    , height: 'full-205'
                     , cols: [columns]
                     , done: function (res, curr, count) {
 
                     }
                 };
 
-                option.data = [{ "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "" ,"HRemark":""}];
+                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                 table.render(option);
             }
             //澧炲姞涓�琛�
@@ -643,19 +682,30 @@
             }
             //鏁版嵁楠岃瘉
             function AllowLoadData(sSubStr) {
-                if ($("#HEquipName").val() == '') {
+                if (cur_title != '鏄庣粏淇℃伅') {
+                    layer.msg("璇烽�夋嫨鍒� 鏄庣粏淇℃伅 椤电锛屾牳瀵逛繚鍏讳俊鎭悗锛屽湪鏄庣粏淇℃伅椤电涓偣鍑讳繚瀛樻寜閽�", { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
+                if ($("#HBarName").val() == '') {
                     layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+
+                if ($("#HEquipMaintainRuleInterID").val() == 0 || $("#HEquipMaintainRuleInterNo").val() == '') {
+                    layer.msg("淇濆吇瑙勭▼涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
                 //鍒ゆ柇鐗╂枡鏄庣粏椤�
                 if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
-                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("娌℃湁淇濆吇椤圭洰鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
-                        if (sSubStr[i].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
+                        if (sSubStr[i].HMaintainNumber == "" || sSubStr[i].HMaintainItemID == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,淇濆吇椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;
                         }
@@ -681,16 +731,16 @@
                 }
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.data.length == 1) {
                             var data = result.data[0];
                             $("#HEquipID").val(data.HInterID);
-                            $("#HBarName").val(data.HName);
-                            $("#HBarSpec").val(data.HModel);
-                            $("#HBarModel").val(data.HModel2);
+                            $("#HBarName").val(data.璁惧鍚嶇О);
+                            $("#HBarSpec").val(data.璁惧瑙勬牸);
+                            $("#HBarModel").val(data.璁惧鍨嬪彿);
                             $("#HQty").val(1);
                             $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             $("#HBarCode").css("background-color", "#efefef4d");
@@ -699,13 +749,15 @@
                             layer.close(index);
                         }
                         else {
+                            $("#HBarCode").val("");
                             layer.close(index);
-                            layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        $("#HBarCode").val("");
                         layer.close(index);
-                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
             }
@@ -713,24 +765,29 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetItemByEquipFile",
                     type: "GET",
-                    data: { "EquipProjectID": $("#HEquipID").val(),"Type":"BY" },
+                    data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY", "HDate": $("#HBeginDate").val() },
                     success: function (result) {
-                        var data = result.data;
-                        $("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
-                        $("#HEquipMaintainRuleInterNo").val(data[0].淇濆吇瑙勭▼鍗曞彿);
-                        var rowdata = [];
-                        for (let i = 0; i < data.length; i++) {
-                            rowdata.push(
-                                {
-                                    "HMaintainResult": "OK", "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
-                                    "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
-                                    "HManagerName": data[i].璐熻矗浜哄悕绉�,"HRemark":""
-                                }
-                            );
-                        }
-                        
-                        option.data = rowdata;
-                        table.render(option);
+                        if (result.count == 1) {
+                            var data = result.data;
+                            $("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
+                            $("#HEquipMaintainRuleInterNo").val(data[0].淇濆吇瑙勭▼鍗曞彿);
+                            $("#HPlanNo").val(data[0].淇濆吇璁″垝鍗�);
+                            $("#HEquipMaintainPlanInterID").val((data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 : data[0].淇濆吇璁″垝ID);
+                            $("#HEquipMaintainPlanEntryID").val((data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 : data[0].淇濆吇璁″垝瀛怚D);
+                            var rowdata = [];
+                            for (let i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
+                                        "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": "", "HSourceInterID": data[i].淇濆吇璁″垝ID, "HSourceEntryID": data[i].淇濆吇璁″垝瀛怚D, "HSourceBillNo": data[i].淇濆吇璁″垝鍗�
+                                    }
+                                );
+                            }
+
+                            option.data = rowdata;
+                            table.render(option);
+                        }                       
                     }
                 })
             }

--
Gitblit v1.9.1