From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 fa1f548..b759266 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"
@@ -64,7 +64,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧</label>
+ <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
@@ -82,7 +82,7 @@
<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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" id="HPlanList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -487,9 +487,9 @@
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].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰鍚嶇О,
+ "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].琛ㄤ綋澶囨敞
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -505,10 +505,10 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < PJData.length; i++) {
var checkrow = {
- "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": PJData[i].HRemark
+ "HMaterID": PJData[i].閰嶄欢ID, "HMaterNumber": PJData[i].閰嶄欢浠ｇ爜, "HMaterName": PJData[i].閰嶄欢鍚嶇О,
+ "HUnitID": PJData[i].鍗曚綅ID, "HUnitNumber": PJData[i].璁￠噺鍗曚綅浠ｇ爜,
+ "HUnitName": PJData[i].璁￠噺鍗曚綅鍚嶇О, "HQty": PJData[i].鐢ㄩ噺,
+ "HRemark": PJData[i].瀛愬娉�1
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -527,7 +527,7 @@
//閫夋嫨淇濆吇璁″垝婧愬崟鐨勬椂鍊欏甫鍑烘暟鎹�
function get_MaintainItem3() {
- var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+ var HPlanID = $("#HEquipMaintainPlanInterID").val() //淇濆吇璁″垝ID
var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
@@ -612,7 +612,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HPlanNo").val(checkStatus.data[0].hmainid);
+ $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HEquipMaintainPlanInterID").val(checkStatus.data[0].hmainid);
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
$("#HEquipID").val(checkStatus.data[0].HEquipID);
@@ -829,6 +829,8 @@
}
//缂栬緫
function set_EditFromGrid(linterid) {
+ //绂佹閫夋嫨
+ $('#HPlanList').addClass("layui-btn-disabled").attr("disabled", true);
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
@@ -860,6 +862,7 @@
, "HEndDate": data.缁撴潫鏃ユ湡 //
, "HPlanName": data.淇濆吇璁″垝
, "HPlanNo": data.淇濆吇璁″垝缂栧彿 //
+ , "HPlanName": data.淇濆吇璁″垝缂栧彿 //
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID //澶囨敞
, "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼ //澶囨敞
--
Gitblit v1.9.1