From 3b57005ff0ece33bde3cce11bc3a93ab57722071 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 04 七月 2024 15:59:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 91 insertions(+), 14 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 afbff2e..25d747f 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"
@@ -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;
@@ -58,17 +58,19 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">淇濆吇鍛ㄦ湡</label>
+ <label class="layui-form-label" style="width: 85px;">淇濆吇鍛ㄦ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
+ <div class="layui-input-block" style="margin-left: 120px;width: 185px;">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
+ <option value="鍛�">鍛�</option>
<option value="鏈�">鏈�</option>
+ <option value="骞�">骞�</option>
</select>
</div>
</div>
@@ -81,7 +83,7 @@
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
@@ -110,6 +112,18 @@
<label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">淇濆吇绾у埆</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:60%;background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaintainLev" id="btnMaintainLev" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -402,9 +416,48 @@
$("#HMouldMaintainRuleID").val(checkStatus.data[0].hmainid);
$("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
$("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
-
+ $("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID == null ? 0 : checkStatus.data[0].HMaintainLevID);
+ form.render('select');
get_DocCheckItem2(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ });
+ //琛ㄥご淇℃伅淇濆吇绾у埆寮圭獥
+ 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) {
+
}
});
});
@@ -538,6 +591,7 @@
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -597,7 +651,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -627,6 +681,8 @@
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
, "HMouldMaintainRuleID": data.HMouldMaintainRuleID
, "HMouldMaintainRuleNo": data.璁惧淇濆吇瑙勭▼
+ , "HMaintainLevID": data.HMaintainLevID
+ , "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
});
} else {
@@ -736,7 +792,7 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
, "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
@@ -885,14 +941,35 @@
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) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
--
Gitblit v1.9.1