From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 219 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 189 insertions(+), 30 deletions(-)
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 6ffbd4e..1136834 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"
@@ -9,6 +9,7 @@
<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/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -53,6 +54,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="1">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
@@ -66,17 +79,30 @@
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
+ <option value="骞�">骞�</option>
</select>
</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="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
</div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇绾у埆</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
+ <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>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
@@ -145,6 +171,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") {
@@ -173,7 +200,7 @@
var option = [];//淇濆吇
var option1 = [];//閰嶄欢
var sBillType = "3912";
- //#endregion
+ //#endregion
@@ -194,6 +221,13 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
+ set_EditFromGrid(linterid);
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_MAXNum();
+ OperationType = 1;
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -328,6 +362,45 @@
//}
}
});
+
+ //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+ 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) {
+
+ }
+ });
+ });
+
//#endregion
@@ -354,7 +427,7 @@
function Table() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
@@ -386,7 +459,7 @@
function Table1() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
@@ -394,7 +467,7 @@
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitCode" }
, { field: 'HUnitName', title: '鍗曚綅鍚嶇О', edit: 'text', event: "" }
- , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true}
+ , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
@@ -445,7 +518,7 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "","HQty": "0", "HRemark": "" }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option1);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -460,15 +533,19 @@
//console.log(result.code)
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
console.log(result)
- var data = result.data.Sb_EquipMaintainRuleBillMain[0];
+ var data = result.data.h_v_Sb_EquipMaintainRuleBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.HBillNo
- , "HDate": formatDate(data.HDate)
- , "HInnerBillNo": data.HInnerBillNo
- , "HExplanation": data.HExplanation //鎽樿
- , "HRemark": data.HRemark
- , "HCycleUnit": data.HCycleUnit
- , "HCheckCycle": data.HCheckCycle
+ "HBillNo": OperationType == 2 ? "" :data.鍗曟嵁鍙�
+ , "HDate": OperationType == 2 ? "" :formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.澶囨敞
+ , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+ , "HCheckCycle": data.淇濆吇鍛ㄦ湡
+ , "HMaintainLevID": data.HMaintainLevID
+ , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
+ , "HErrWarDays": data.淇濆吇棰勮澶╂暟
});
} else {
@@ -620,8 +697,7 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
//淇濆吇椤圭洰淇℃伅
- if (obj.event === 'HMaintainItemNumber')
- {
+ if (obj.event === 'HMaintainItemNumber') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -640,26 +716,55 @@
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 = [];
+ }
}
});
}
- //璐ｄ换浜轰俊鎭�
- if (obj.event === 'HManagerNumber')
- {
+ //璐ｄ换浜轰俊鎭�
+ if (obj.event === 'HManagerNumber') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -669,7 +774,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) {
@@ -694,7 +799,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HManagerID: OptionData[0].HItemID,
+ HManagerNumber: OptionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: OptionData[0].鑱屽憳鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -741,6 +854,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HUnitID: OptionData[0].HItemID,
+ HUnitNumber: OptionData[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -780,6 +902,18 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HMaterID: OptionData[0].HItemID,
+ HMaterNumber: OptionData[0].鐗╂枡浠ｇ爜,
+ HMaterName: OptionData[0].鐗╂枡鍚嶇О,
+ HUnitID: OptionData[0].HUnitID,
+ HUnitNumber: OptionData[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -794,6 +928,14 @@
var Result = true;
if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
@@ -823,12 +965,29 @@
}
return Result;
}
+
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
//#endregion
});
+ //淇濆吇椤圭洰
+ function GetMaintainListValue(obj) {
+ OptionData[0] = obj;
+ }
+ //璐ｄ换浜�
+ function GetHManagerValue(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