From 048ab324c11eed0f8be15978d6d1ff2dcc36603a Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期四, 09 九月 2021 15:54:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 27 +++++++++++++++++++++++++++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 27 +++++++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
3 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a808e1a..31137c5 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 823d7e8..789f4a8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -128,6 +128,7 @@
<label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID" >
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -666,6 +667,7 @@
"HPlanQty": data.娴佽浆鍗℃暟閲�,
"lngBillKey": data.hmainid,
"HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID":data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�
});
@@ -731,6 +733,31 @@
});
}
+ //#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
+ $('body').on('keydown', function (e) {
+ var HinteID = $("#HProcExchHinteID").val();
+ if (e.key == "F7") {
+ if (HinteID == "" || HinteID == null || HinteID == undefined) {
+ layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
+ end: function () {
+ }
+ });
+ }
+ }
+ })
+ //#endregion
+
//鏄惁琚浆涓嬪伐搴�
form.on('checkbox(checkboxHLastSubProc)', function (data) {
$("#HLastSubProc").val(data.elem.checked);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index e53cedc..8f8e2e6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -124,6 +124,7 @@
<label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -806,6 +807,7 @@
"HPieceQty": data.娴佽浆鍗℃暟閲�,
"HPlanQty": data.娴佽浆鍗℃暟閲�,
"HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"lngBillKey": data.hmainid,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�
@@ -872,6 +874,31 @@
});
}
+ //#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
+ $('body').on('keydown', function (e) {
+ var HinteID = $("#HProcExchHinteID").val();
+ if (e.key == "F7") {
+ if (HinteID == "" || HinteID == null || HinteID == undefined) {
+ layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
+ end: function () {
+ }
+ });
+ }
+ }
+ })
+ //#endregion
+
//閫夋嫨鐢熶骇鐝粍寮圭獥
form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
layer.open({
--
Gitblit v1.9.1