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/模治具管理/模治具管理/Gy_MaterialMouldBillMain.html | 157 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 33 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/Gy_MaterialMouldBillMain.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/Gy_MaterialMouldBillMain.html"
index 21c46dc..26d9ef0 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/Gy_MaterialMouldBillMain.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/Gy_MaterialMouldBillMain.html"
@@ -83,7 +83,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;width:185px;">
</div>
</div>
<div class="layui-inline">
@@ -109,7 +109,7 @@
</div>
<div class="layui-row">
<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="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -162,6 +162,16 @@
<label class="layui-form-label" style="width: 85px;">璁惧鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HEquipModel" lay-verify="HEquipModel" id="HEquipModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <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" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -323,7 +333,7 @@
, form = layui.form
, element = layui.element;
-
+
var HModName = "Gy_MaterialMouldBillMain";
//#endregion
@@ -336,10 +346,10 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
//鍒ゆ柇鏄惁鏂板
if (OperationType == null || OperationType == 1) {
-
+
OperationType = 1;
$("#HOrgID").attr("disabled", true);
//绂佺敤鎸夐挳
@@ -366,7 +376,7 @@
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//else if (OperationType == 2) {
-
+
// RoadBillMain(linterid);
// $.ajax({
// url: GetWEBURL() + "/Web/GetMAXNum",
@@ -391,9 +401,9 @@
//绂佺敤缁勭粐閫夐」
$("#HOrgID").attr("disabled", true);
- RoadBillMain(linterid);
+ RoadBillMain(linterid);
}
-
+
//鏄剧ず鍒楁暟鎹�
@@ -406,6 +416,12 @@
//#region 閫夋嫨閮ㄩ棬鎸夐挳
form.on('submit(btnSearchHDept)', function () {
get_Department();
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_Process();
});
//#endregion
@@ -434,9 +450,9 @@
// 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
-
- set_AddNew(data);
-
+
+ set_AddNew(data);
+
});
// 閫�鍑�
@@ -475,13 +491,13 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMouldID": "",
- "HMouldNumber":"",
+ "HMouldID": 0,
+ "HMouldNumber": "",
"HMouldName": "",
"HMouldType": "",
- "HQty": "0",
- "HMouldQty": "0",
- "HRate": "0",
+ "HQty": "1",
+ "HMouldQty": "",
+ "HRate": "",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -493,7 +509,7 @@
option.data = table.cache["mainTable"];
table.render(option);
-
+
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -509,7 +525,7 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-
+
}
break;
@@ -542,7 +558,7 @@
//#region 鍣ㄥ叿娓呭崟鍒濆鍖�
function get_InitGrid() {
- option = {
+ option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, totalRow: true
@@ -567,7 +583,7 @@
}
option.data = [];
table.render(option);
-
+
}
//#endregion
@@ -626,7 +642,41 @@
}
});
}
- //#endregion
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_Process() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //#endregion
//#region 璐熻矗浜洪�夋嫨椤甸潰
function get_checkSearchHEmp() {
@@ -741,7 +791,7 @@
$("#HEquipNumber").val(checkStatus.data[0].璁惧浠ｇ爜);//璁惧浠ｇ爜
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);//璁惧鍚嶇О
$("#HEquipModel").val(checkStatus.data[0].璁惧瑙勬牸);//璁惧鍨嬪彿
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -774,15 +824,17 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- "HMouldID":checkStatus.data[0].hmainid,
+ "HMouldID": checkStatus.data[0].hmainid,
"HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
- "HMouldName":checkStatus.data[0].妯″叿鍚嶇О,
+ "HMouldName": checkStatus.data[0].妯″叿鍚嶇О,
"HMouldType": checkStatus.data[0].妯″叿鍨嬪彿,
"HMouldQty": checkStatus.data[0].绌存暟,
"HSourceInterID": checkStatus.data[0].hmainid,
"HSourceEntryID": checkStatus.data[0].hsubid,
"HSourceBillType": checkStatus.data[0].HBillType,
- "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�,
+ "HQty": 1,
+ "HRate": 1
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -935,7 +987,7 @@
}
//#endregion
-
+
//#region 缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
@@ -973,6 +1025,8 @@
, "HEmpName": tableMain[0]["璐熻矗浜�"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
, "HOrgID": tableMain[0].HOrgID
+ , "HProcID": tableMain[0].HProcID
+ , "HProcName": tableMain[0].宸ュ簭鍚嶇О
@@ -1001,6 +1055,11 @@
//#region 淇濆瓨HMaker
function set_AddNew(data) {
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -1027,14 +1086,14 @@
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
-
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"] ;
+
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_MouldinventoryBill/SaveGy_MaterialMouldBillMain",
-
+
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -1083,7 +1142,39 @@
}
//#endregion
-
+ function AllowLoadData() { //闈炵┖楠岃瘉
+ var Result = true;
+ if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == "undefined") {
+ layer.msg("鐗╂枡淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ var sSubTable = table.cache['mainTable'];
+ if (sSubTable.length < 1) {
+ layer.msg("鏄庣粏淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HMouldID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝鍣ㄥ叿缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (!sSubTable[i].HMouldQty) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝妯＄┐鏁颁笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (!sSubTable[i].HRate) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝鍗犳瘮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+
+ return Result;
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -1119,7 +1210,7 @@
})
}
-
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -1131,7 +1222,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [ ];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1203,7 +1294,7 @@
})
}
//#endregion
-
+
});
--
Gitblit v1.9.1