From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 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 0925311..812c87e 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"
@@ -83,7 +83,17 @@
<input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
<input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
</div>
- </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; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcMulID-BT" 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-row">
<div class="layui-col-xs4 layui-inline">
@@ -124,7 +134,23 @@
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁′欢宸ヨ祫绫诲瀷</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HPayMentType" id="HPayMentType">
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ <option value="涓汉璁′欢" selected>涓汉璁′欢</option>
+ <option value="闆嗕綋璁′欢">闆嗕綋璁′欢</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
+
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
@@ -468,6 +494,11 @@
get_checkWorkCenter();
});
+ //閫夋嫨宸ユ鎸夐挳
+ form.on('submit(HProcMulID-BT)', function () {
+ get_checkProcMul();
+ });
+
//閫夋嫨鐝粍鎸夐挳
form.on('submit(ProductionTeam-BT)', function () {
get_checkGroup();
@@ -578,8 +609,8 @@
, "HName": data.宸ュ簭鍚嶇О
, "HFixPrice": data.鐝骇瀹氶
, "HLevel": data.绛夌骇
- //, "HProcMulName": data.宸ユ鍚嶇О
- //, "HProcMulID": data.宸ユID
+ , "HProcMulName": data.宸ユ鍚嶇О
+ , "HProcMulID": data.HProMulID
, "HBarCodeForBase": data.鏉″舰鐮�
, "HHelpCode": data.鍔╄鐮�
, "HDeptName": data.閮ㄩ棬
@@ -617,6 +648,7 @@
, "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
+ , "HPayMentType": data.璁′欢宸ヨ祫绫诲瀷
});
layer.close(ajaxLoad);
} else {
@@ -651,6 +683,10 @@
//}
if ($("#HWorkCenterName").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()) {
@@ -790,6 +826,31 @@
}
$("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
$("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸ユ鏂规硶
+ function get_checkProcMul() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ユ鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcMulName").val(checkStatus.data[0].宸ユ鍚嶇О);
+ $("#HProcMulID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1090,6 +1151,11 @@
$("#HWHName").val(obj[0].鑹搧浠撳簱);
$("#HWHID").val(obj[0].HItemID);
}
+ //杩斿洖宸ユ
+ function GetGyProcMulValue(obj) {
+ $("#HProcMulName").val(obj[0].宸ユ鍚嶇О);
+ $("#HProcMulID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1