From 5ebd6758ee61497b0d485c2145c2d49b33951ed3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 18 一月 2024 10:17:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 175 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 64 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 8344275..7df70d9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -93,17 +93,17 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍥惧彿鐗堟湰</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">鍥惧彿鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -112,8 +112,8 @@
<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -129,11 +129,11 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎬昏鍥惧彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">鎬昏鍥惧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -157,33 +157,33 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏉愯川</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
- </div>
- </div>-->
+ <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
- </div>
- </div>-->
+ <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -204,29 +204,29 @@
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎴愬搧缂栧彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
- </div>
- </div>-->
+ <label class="layui-form-label">鎴愬搧缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">杈呮暟閲�</label>
<div class="layui-input-inline">
@@ -265,17 +265,17 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鍘熷洜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">琛ユ枡鏍囪</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
- </div>
- </div>-->
+ <label class="layui-form-label">琛ユ枡鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline">
@@ -304,6 +304,16 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
</div>
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">璁㈠崟绛夌骇</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HName" id="HName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HOrderLevID" id="HOrderLevID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnOrderID" id="btnOrderID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1415,6 +1425,11 @@
get_btnHAuxUnit();
});
+ //閫夋嫨璁㈠崟绛夌骇鎸夐挳
+ form.on('submit(btnOrderID)', function () {
+ get_btnOrderID();
+ });
+
//閫夋嫨浜у搧寮圭獥
form.on('submit(btnSearchMater2)', function () {//浜у搧
layer.open({
@@ -2146,6 +2161,7 @@
, "HAuxQty": data.杈呮暟閲�
, "HAuxUnit": data.HAuxUnit
, "HAuxUnitName": data.杈呭姪鍗曚綅
+ , "HName": data.璁㈠崟绛夌骇
, "HSplitNo": data.鎷嗗垎鍙�
, "HRemark2": data.鐧藉澂瑕佹眰
, "HRemark3": data.搴曢儴澶囨敞
@@ -2314,7 +2330,38 @@
, btn2: function (index, layero) { }
})
}
+ //璁㈠崟绛夌骇
+ function get_btnOrderID() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁㈠崟绛夌骇鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ $("#HName").val(checkStatus.data[0].璁㈠崟绛夌骇);
+ $("#HOrderLevID ").val(checkStatus.data[0].HItemID);
+ //obj.update({
+ // "璁㈠崟绛夌骇鍚嶇О": checkStatus.data[0].璁㈠崟绛夌骇
+ // //, "璁㈠崟绛夌骇浠ｇ爜": checkStatus.data[0].璁㈠崟绛夌骇浠ｇ爜
+ // , "HOrderLevID": checkStatus.data[0].HItemID
+ //})
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
//#region 鏌ヨ (鍣ㄥ叿娓呭崟)
function get_DisplayHMainID(linterid) {
var ajaxLoad = layer.load();
--
Gitblit v1.9.1