From 2c4e339508f78a215518a8a12af34ca0b1564d44 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 13:07:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 149 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 126 insertions(+), 23 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 75e9425..10d43b1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -36,6 +36,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -197,6 +198,14 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簭鍒嗙被</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcType" id="HProcType" autocomplete="off">
+ </div>
+ </div>
+ </div>
<div class="layui-tab-item">
<div class="layui-col-xs4 layui-inline">
@@ -243,17 +252,7 @@
<div class="layui-input-inline">
<input type="text" name="HSno" id="HSno" lay-verify="" autocomplete="off" value="0" class="layui-input">
</div>
- </div>
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ユ</label>
- <div class="layui-input-inline">
- <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px;"></i>
- </button>
- </div>
- </div>-->
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -445,6 +444,7 @@
</div>
<script>
+ var OptionData = [];
//#region 鎶樺彔娉ㄩ噴
//#endregion
layui.config({
@@ -491,7 +491,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#checkboxHStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
- $("#HMakeEmp").val(sessionStorage["HMakeEmp"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 2) {//澶嶅埗
@@ -502,7 +502,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#checkboxHStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
- $("#HMakeEmp").val(sessionStorage["HMakeEmp"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) {//缂栬緫
@@ -534,7 +534,10 @@
form.on('submit(Cancel)', function () {
Pub_Close(1);
})
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//鏄惁绂佺敤鎸夐挳
form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
@@ -679,6 +682,34 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Process/AuditGy_Process", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
function get_LoginIs() {
if (sessionStorage.login != "login") {
@@ -803,6 +834,7 @@
, "HCheckEmp": data.瀹℃牳浜�
, "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
, "HStandardWages": data.鏍囧噯宸ヤ环
+ , "HProcType": data.宸ュ簭鍒嗙被
});
layer.close(ajaxLoad);
} else {
@@ -839,10 +871,10 @@
layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HProcMulName").val() == "") {
- layer.msg("璇烽�夋嫨宸ユ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HProcMulName").val() == "") {
+ // layer.msg("璇烽�夋嫨宸ユ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//if (!$("#HProcessID_K3").val()) {
// layer.msg("璇烽�夋嫨ERP宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
@@ -944,7 +976,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -995,7 +1027,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ユ鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1020,7 +1052,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1033,6 +1065,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Fst").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Fst").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1045,7 +1084,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1058,6 +1097,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Proc").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Proc").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1070,7 +1116,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1083,6 +1129,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Patrol").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Patrol").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1133,6 +1186,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HBadWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HBadWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1158,6 +1218,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWasterWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWasterWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1183,6 +1250,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HBadCountDevelopWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HBadCountDevelopWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1208,6 +1282,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWWBadWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWWBadWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1233,6 +1314,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWWWasterWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWWWasterWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1258,6 +1346,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1319,6 +1414,14 @@
$("#HDeptID").val(obj[0].HItemID);
$("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
}
+ //鏂规杩斿洖
+ function GetCheckProjectValue(obj) {
+ OptionData = obj;
+ }
+ //杞﹂棿
+ function GetHWHValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1