From 5c08046b29ae41eb3629cfec66ea84d94d001ffa Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 六月 2024 15:51:26 +0800
Subject: [PATCH] 器具点检记录表 功能优化(选点检规程带出子表 选点检计划 带出模具 点检规程 带出子表) 停工单增加刷卡验证 工序出站增加遗失字段 和取样字段 工序流转卡增加批次号
---
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 174 insertions(+), 25 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 996cd9d..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"
@@ -8,7 +8,7 @@
<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/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -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>
@@ -122,6 +122,16 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇绾у埆</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -181,6 +191,7 @@
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
<script>
+ var OptionData = [];
//鑾峰彇鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -381,7 +392,43 @@
}
})
}
+ //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+ form.on('submit(btnMaintainLev)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '淇濆吇绾у埆鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
form.on('submit(HEquipMaintainRuleInterList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -418,7 +465,7 @@
});
});
//閫夋嫨淇濆吇瑙勭▼鐨勬椂鍊欏甫鍑烘暟鎹�
- function get_MaintainItem2() {
+ window.get_MaintainItem2 = function () {
$.ajax({
url: GetWEBURL() + "/Web/GetMaintainItemtemByMaintainRuleID",
type: "GET",
@@ -440,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); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -458,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); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -480,7 +527,7 @@
//閫夋嫨淇濆吇璁″垝婧愬崟鐨勬椂鍊欏甫鍑烘暟鎹�
function get_MaintainItem3() {
- var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+ var HPlanID = $("#HEquipMaintainPlanInterID").val() //淇濆吇璁″垝ID
var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
@@ -565,12 +612,14 @@
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);
$("#HEquipMaintainRuleInterID").val(checkStatus.data[0].HMouldMaintainRuleID);
$("#HEquipMaintainRuleInterNo").val(checkStatus.data[0].淇濆吇瑙勭▼);
+ $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_MaintainItem3();
@@ -780,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": " " }];
@@ -811,10 +862,12 @@
, "HEndDate": data.缁撴潫鏃ユ湡 //
, "HPlanName": data.淇濆吇璁″垝
, "HPlanNo": data.淇濆吇璁″垝缂栧彿 //
+ , "HPlanName": data.淇濆吇璁″垝缂栧彿 //
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID //澶囨敞
, "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼ //澶囨敞
-
+ , "HMaintainLevID": data.HMaintainLevID
+ , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
});
} else {
@@ -984,20 +1037,51 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaintainItemID: checkStatus.data[0].HItemID,
+ HMaintainItemNumber: checkStatus.data[0].淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: checkStatus.data[0].淇濆吇椤圭洰鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ } else {
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HMaintainItemID"] != 0 && tableBak[i]["HMaintainItemID"] != "" && tableBak[i]["HMaintainItemID"] != undefined && tableBak[i]["HMaintainItemID"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({ "HMaintainItemID": checkStatus.data[i].HItemID, "HMaintainItemNumber": checkStatus.data[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": checkStatus.data[i].淇濆吇椤圭洰鍚嶇О, "HMaintainPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+ }
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaintainItemID: checkStatus.data[0].HItemID,
- HMaintainItemNumber: checkStatus.data[0].淇濆吇椤圭洰浠ｇ爜,
- HMaintainItem: checkStatus.data[0].淇濆吇椤圭洰鍚嶇О,
- });
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HMaintainItemID: OptionData[0].HItemID,
+ HMaintainItemNumber: OptionData[0].淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: OptionData[0].淇濆吇椤圭洰鍚嶇О,
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1012,7 +1096,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1037,7 +1121,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HManagerID: OptionData[0].HItemID,
+ HManagerNumber: OptionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: OptionData[0].鑱屽憳鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1084,6 +1176,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HUnitID: OptionData[0].HItemID,
+ HUnitNumber: OptionData[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1120,6 +1221,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HMaterID: OptionData[0].HItemID,
+ HMaterNumber: OptionData[0].鐗╂枡浠ｇ爜,
+ HMaterName: OptionData[0].鐗╂枡鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1134,7 +1244,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HManager', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1159,7 +1269,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HManagerID: OptionData[0].HItemID,
+ HManagerNumber: OptionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: OptionData[0].鑱屽憳鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1227,6 +1345,37 @@
}
//#endregion
});
+
+ //璁惧
+ function GetEquipFileValue(obj) {
+ $("#HEquipName").val(obj[0].璁惧鍚嶇О);
+ $("#HEquipID").val(obj[0].hmainid);
+ }
+ //淇濆吇瑙勭▼
+ function GetEquipMaintainRuleListValue(obj) {
+ $("#HEquipMaintainRuleInterNo").val(obj.鍗曟嵁鍙�);
+ $("#HEquipMaintainRuleInterID").val(obj.hmainid);
+ get_MaintainItem2();
+ }
+ //淇濆吇椤圭洰
+ function GetMaintainListValue(obj) {
+ OptionData[0] = obj;
+ }
+ //璐ｄ换浜�
+ function GetHManagerValue(obj) {
+ OptionData = obj;
+ }
+ function GetHEmpValue(obj) {
+ OptionData = obj;
+ }
+ //璁￠噺鍗曚綅
+ function GetUnitValue(obj) {
+ OptionData = obj;
+ }
+ //閰嶄欢
+ function GetMaterValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1