From 5a41caded26a3b4a5aeb9cbcd83ba4fcf60fd3ee Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 261 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index c7ca50d..55d96b1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -255,7 +255,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo1">
@@ -263,7 +263,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -298,8 +298,9 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
- }
+ }
+ var OptionData = [];
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -319,6 +320,7 @@
var option1 = [];//閰嶄欢
var option_plan = [];//璁″垝
var sBillType = "3902";
+ var HModName = "Sb_EquipMaintainPlanBillEdit";
//var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
//var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢
//#endregion
@@ -378,6 +380,10 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn(0);
+ break;
}
});
@@ -393,6 +399,29 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine1': btnCopyLine1(data);
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn(1);
+ break;
+ }
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable_plan)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable_plan')
+ , data = checkStatus.data;
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" };
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine1': btnAddLine1(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine1': btnCopyLine1(data);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn(2);
+ break;
}
});
//琛屽唴浜嬩欢
@@ -405,6 +434,12 @@
set_GridDelete1(obj); //琛屽唴鍒犻櫎
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
});
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable_plan)', function (obj) {
+ set_GridDelete1(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(HEquipList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -643,15 +678,16 @@
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , {
+ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: 'background-color: #f0f9ff;' }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
- , { field: 'HMaintainItem', title: '淇濆吇椤圭洰' }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰',style: 'background-color: #f0f9ff;' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
- , { field: 'HManagerName', title: '璐熻矗浜�' }
+ , { field: 'HManagerName', title: '璐熻矗浜�', style: 'background-color: #f0f9ff;' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -669,13 +705,14 @@
}
};
+
}
//鍒濆鍖栭厤浠堕」鍒楄〃
function Table1() {
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: 'background-color: #f0f9ff;' }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
, { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text', event: "" }
@@ -709,14 +746,14 @@
//鐐规璁″垝
columns_plan = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
- , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
- , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
- , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
- , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
- , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
- , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
- , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", style: 'background-color: #f0f9ff;' }
+ , { field: 'HPlanDate', title: '璁″垝鏃ユ湡', style: 'background-color: #f0f9ff;' }
+ , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣', style: 'background-color: #f0f9ff;' }
+ , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�', style: 'background-color: #f0f9ff;' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�', style: 'background-color: #f0f9ff;' }
+ , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣', style: 'background-color: #f0f9ff;' }
+ , { field: 'HRelationFlag', title: '鍏宠仈鏍囪', style: 'background-color: #f0f9ff;' }
+ , { field: 'DiffDate', title: '鐩稿樊闂撮殧', style: 'background-color: #f0f9ff;' }
];
option_plan = {
id: 'mainTable_plan'
@@ -1137,6 +1174,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HMaintainItemID: OptionData.HItemID,
+ HMaintainItemNumber: OptionData.淇濆吇椤圭洰浠ｇ爜,
+ HMaintainItem: OptionData.淇濆吇椤圭洰鍚嶇О,
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1176,7 +1222,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ HManagerID: OptionData[0].HItemID,
+ HManagerNumber: OptionData[0].鑱屽憳浠ｇ爜,
+ HManagerName: OptionData[0].鑱屽憳鍚嶇О
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1273,7 +1327,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1341,38 +1395,207 @@
}
}
- //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
- // sSubStr1 = JSON.parse(sSubStr1);
- // for (var i = 0; i < sSubStr1.length; i++) {
- // if (sSubStr1[i].HMaterNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr1[i].HUnitNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr[i].HManagerNumber == "") {
- // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // }
- //}
+
else {
+
return Result = true;
}
+
return Result;
}
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
+
+
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn(num) {
+ var colName = "";
+ var contentUrl = "";
+ if (num == 0) {
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ }
+ if (num == 1) {
+ for (var i = 1; i < option1.cols[0].length - 1; i++) {
+ colName += option1.cols[0][i]["title"] + ",";
+ }
+ }
+ if (num == 2) {
+ for (var i = 1; i < option_plan.cols[0].length - 1; i++) {
+ colName += option_plan.cols[0][i]["title"] + ",";
+ }
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(num);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
//#endregion
+
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn(num) {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+ var currentOption;
+ if (num == 0) {
+ currentOption = option;
+ } else if (num == 1) {
+ currentOption = option1;
+ } else if (num == 2) {
+ currentOption = option_plan;
+ }
+ for (var i = 0; i < currentOption.cols[0].length - 2; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ currentOption.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ currentOption.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ currentOption.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ currentOption.cols[0][i + 1]["style"] += "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(currentOption.cols[0][i + 1]["title"], titleData) == -1) {
+ currentOption.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ currentOption.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ currentOption.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ currentOption.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ currentOption.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < currentOption.cols[0].length - 1; i++) {
+ if (currentOption.cols[0][i]["fixed"] != null) {
+ currentOption.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(currentOption.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ currentOption.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(currentOption);
+ } else {
+ if (num == 0) {
+ table.render(option);
+ } else if (num == 1) {
+ table.render(option1);
+ } else if (num == 2) {
+ table.render(option_plan);
+ }
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+
+
});
+ //淇濆吇绾у埆
+ function GetEquipMaintainRuleListValue(obj) {
+ //$("#HMouldMaintainRuleID").val(obj[0].hmainid);
+ var se=$("#HMaintainLevID").val();
+ $("#HMaintainLevID").val(obj.HMaintainLevID);
+ $("#HMouldMaintainRuleNo").val(obj.鍗曟嵁鍙�);
+ $("#HCheckCycle").val(obj.淇濆吇鍛ㄦ湡);
+ }
+
+ function GetEquipFileValue(obj) { //杩斿洖璁惧
+ $("#HEquipID").val(obj[0].hmainid);//id
+ //$("#HEquipNumber").val(obj[0].璁惧浠ｇ爜);//璁惧浠ｇ爜
+ $("#HEquipName").val(obj[0].璁惧鍚嶇О);//璁惧鍚嶇О
+ //$("#HEquipModel").val(obj[0].璁惧瑙勬牸);//璁惧鍨嬪彿
+ }
+ //淇濆吇绾у埆
+ function GetMaintainLevValue(obj) {
+ $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(obj[0].HItemID);
+ }
+
+ function GetHDeptNameValue(obj) //杩斿洖閲囪喘閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+
+ //淇濆吇椤圭洰
+ function GetMaintainListValue(obj) {
+ //option.data.淇濆吇椤圭洰浠ｇ爜 = obj.淇濆吇椤圭洰浠ｇ爜
+ // option[0].淇濆吇椤圭洰 = obj.淇濆吇椤圭洰鍚嶇О
+ //option[0].HItemID = obj.HItemID
+ OptionData = obj;
+
+ }
+ function GetHManagerValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1