From 727ee25aeb5fcaf84e2cf009b2eacd3a86bcb3ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十一月 2024 12:55:23 +0800
Subject: [PATCH] 新增 环境检测方案,环境检测单
---
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 197 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 181 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index dbe233b..4b0114d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -81,9 +81,10 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="娆�">娆�</option>
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
+ <option value="骞�">骞�</option>
</select>
</div>
</div>
@@ -93,6 +94,24 @@
<input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
+ </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="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" 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 style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -105,20 +124,39 @@
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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;">
+ <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID" value="0">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="margin-left:340px;">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
</div>
- </div>
+ </div>
</div>
</div>
</div>
@@ -232,7 +270,9 @@
set_InitGrid();
set_InitGrid1();
set_InitGrid_Plan();
-
+ //鍔ㄦ�佸姞杞界粍缁�
+ Organ();
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -325,6 +365,7 @@
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
$("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
$("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+ $("#HErrWarQtys").val(checkStatus.data[0].淇濆吇棰勮娆℃暟);
form.render('select');
get_DocCheckItem2(checkStatus.data[0].hmainid);
@@ -378,6 +419,71 @@
});
});
+ //琛ㄥご浜у搧妯″叿淇℃伅
+ form.on('submit(HMouldList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍣ㄥ叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
+ $("#HMouldID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご璁惧鐐规瑙勭▼淇℃伅
+ form.on('submit(btnHDept)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ });
+
//鏂板
form.on('submit(set_AddNew)', function (data) {
$("#component-form-group")[0].reset();
@@ -390,7 +496,28 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr;
+ var num = [];
+ if (OperationType==3) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ for (var i = 0; i < table.cache["mainTable_plan"].length; i++) {
+ if (table.cache["mainTable_plan"][i] != "") {
+ table.cache["mainTable_plan"][i].LAY_TABLE_INDEX = i;
+ if (table.cache["mainTable_plan"][i].HRelationFlag == "鏈偣妫�") {
+ table.cache["mainTable_plan"][i].HRelationFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HRelationFlag = true
+ }
+ if (table.cache["mainTable_plan"][i].HSendFlag == "鏈彂閫�") {
+ table.cache["mainTable_plan"][i].HSendFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HSendFlag = true
+ }
+ num.push(table.cache["mainTable_plan"][i])
+ }
+ }
+ }
+ var sSubStr2 = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr + ";" +sSubStr2;
if (AllowLoadData(sSubStr1)) {
$.ajax(
{
@@ -409,13 +536,12 @@
}
else {
layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+
}
});
}
@@ -487,6 +613,7 @@
, page: false
, totalRow: true
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -517,6 +644,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -525,7 +653,7 @@
};
}
-
+
//鍒濆鍖栬〃鏍�
function set_InitGrid_Plan() {
//鐐规璁″垝
@@ -535,8 +663,14 @@
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
+ , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ , { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
+ , { field: 'HErrBeginQty', edit: 'text', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', edit: 'text', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', edit: 'text', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
@@ -575,7 +709,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0, "HSendFlag": "0", "HErrBeginQty": "", "HUseNowQty": "", "HUseEndQty": "" }];
table.render(option_plan);
}
@@ -600,6 +734,28 @@
});
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -618,16 +774,25 @@
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
- , "HBeginDate": data.璁″垝寮�濮嬫棩鏈�
- , "HEndDate": data.璁″垝缁撴潫鏃ユ湡
+ , "HBeginDate": formatDate(data.璁″垝寮�濮嬫棩鏈�) //寮�濮嬫棩鏈�
+ , "HEndDate": formatDate(data.璁″垝缁撴潫鏃ユ湡) //缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
, "HMouldMaintainRuleID": data.HMouldMaintainRuleID
, "HMouldMaintainRuleNo": data.鍣ㄥ叿淇濆吇瑙勭▼
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HMouldID": data.HMouldID
+ , "HMouldName": data.鍣ㄥ叿鍚嶇О
+ , "HCREATEORGID": data.HCREATEORGID
+ , "HUSEORGID": data.HUSEORGID
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
+ , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
});
-
+ if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -690,8 +855,8 @@
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")
- , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ "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")
+ , "HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧, "HSendFlag": data[i].淇℃伅鏍囪, "HErrBeginQty": data[i].棰勮寮�濮嬫鏁�, "HUseNowQty": data[i].褰撳墠浣跨敤娆℃暟, "HUseEndQty": data[i].缁撴潫浣跨敤娆℃暟
}
)
}
--
Gitblit v1.9.1