From 33430ec5f8f7bd181bbeea8d933285ef58a7980a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 23 二月 2024 09:22:00 +0800
Subject: [PATCH] 项目管理、车间管理、仓库管理 模块下的全部单据和单据列表; 单据有网格的 增加 合计行

---
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

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 4725d33..445c1fa 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"
@@ -78,6 +78,8 @@
                                                 <label class="layui-form-label">淇濆吇璁″垝缂栧彿</label>
                                                 <div class="layui-input-inline">
                                                     <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HEquipMaintainPlanEntryID" id="HEquipMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HEquipMaintainPlanInterID" id="HEquipMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                     <input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -238,7 +240,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": " " };
+                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -324,8 +326,11 @@
                                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                                 table.render(option);
                                 table.render(option1);
-                                $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
-                                $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+                                if (BYData.length != 0) {
+                                    $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
+                                    $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+                                }
+                               
                                 if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
@@ -429,7 +434,7 @@
                                         var checkrow = {
                                             "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                             "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -448,7 +453,7 @@
                                             "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                             "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                             "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
-                                            "HRemark": rowdate2[i].HRemark
+                                            "HRemark": PJData[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -467,16 +472,19 @@
 
             //閫夋嫨淇濆吇璁″垝婧愬崟鐨勬椂鍊欏甫鍑烘暟鎹�
             function get_MaintainItem3() {
+                var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+                var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
+
                 $.ajax({
-                    url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew",
+                    url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList",
                     type: "GET",
                     async: false,
-                    data: { "HInterID": $("#HPlanNo").val() },
+                    data: { "HInterID": HPlanID, "HDate": HDate  },
                     success: function (result) {
                         if (result != null) {
                             if (result.count == 1) {
-                                var BYData = result.list[0];//淇濆吇
-                                var PJData = result.list[1];//閰嶄欢
+                                var BYData = result.data[0];//淇濆吇
+                                var PJData = result.data[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
                                 option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
@@ -486,12 +494,13 @@
 
                                 if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
+                                    $("#HEquipMaintainPlanEntryID").val(BYData[0].HPlanEntryID);
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HMaintainItemID": BYData[i].HMaintainRuleID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HEmployeeID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -549,6 +558,7 @@
                         }
                         $("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HPlanNo").val(checkStatus.data[0].hmainid);
+                        $("#HEquipMaintainPlanInterID").val(checkStatus.data[0].hmainid);         
                         $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
                         $("#HEquipID").val(checkStatus.data[0].HEquipID);
                         $("#HEquipMaintainRuleInterID").val(checkStatus.data[0].HMouldMaintainRuleID);
@@ -732,7 +742,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option);
                 table.render(option1);
@@ -791,6 +801,8 @@
                                 , "HPlanName": data.淇濆吇璁″垝  
                                 , "HPlanNo": data.淇濆吇璁″垝缂栧彿                //
                                 , "HRemark": data.琛ㄥご澶囨敞                //澶囨敞
+                                , "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID                //澶囨敞
+                                , "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼                //澶囨敞
 
                             });
 

--
Gitblit v1.9.1