From 5b19fc51b6129ff8e5f40ecf25f1a73717f3e53b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 22:57:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 251 +++++++++++++++++++++++++++++++++----------------
1 files changed, 167 insertions(+), 84 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 36ffd37..b339474 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"
@@ -159,17 +159,17 @@
</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">
@@ -181,95 +181,104 @@
</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="HXTNumber" id="HXTNumber">
- </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="HXTModel" id="HXTModel">
- </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="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
- </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="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>-->
- <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">
<label class="layui-form-label">宸ヨ壓璺嚎</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID" >
+ <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" 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">
+ <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-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>-->
+ <!--<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>-->
+ <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="HMaterModel" id="HMaterModel" style="float: left;">
+ </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="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" 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="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+ </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>-->
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">婧愬崟瀹㈡埛浠ｇ爜</label>
+ <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">
- <input type="text" class="layui-input" name="HCusNumber" id="HCusNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ <input type="text" class="layui-input" name="HAuxQty" id="HAuxQty" style="float: left;" value="0">
</div>
</div>
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑</label>
+ <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="HPickLabel" id="HPickLabel" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ <input type="text" class="layui-input" name="HSplitNo" id="HSplitNo" style="float: left;" value="0">
</div>
</div>
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑缂栫爜</label>
+ <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="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
+
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -330,7 +339,7 @@
<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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaterModel1" id="HMaterModel1" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -393,15 +402,15 @@
</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="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" 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">娴佽浆鍗＄被鍨�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" 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-xs3 layui-inline">
@@ -422,6 +431,13 @@
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" 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="HXTNumber" id="HXTNumber">
+ </div>
+ </div>
+
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -440,6 +456,12 @@
<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-inline">
+ <input type="text" class="layui-input" name="HXTModel" id="HXTModel">
</div>
</div>
</div>
@@ -464,6 +486,26 @@
<div class="layui-input-inline">
<input type="checkbox" name="isHBLFlag" id="isHBLFlag" value="false" lay-skin="primary" lay-filter="isHBLFlag">
<input type="hidden" name="HBLFlag" id="HBLFlag" value="false" lay-skin="primary" lay-filter="HBLFlag">
+ </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="HCusNumber" id="HCusNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <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="HPickLabel" id="HPickLabel" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <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="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
</div>
</div>
</div>
@@ -1201,6 +1243,10 @@
get_HideColumn();
});
+ //閫夋嫨杈呭姪鍗曚綅鎸夐挳
+ form.on('submit(btnHAuxUnit)', function () {
+ get_btnHAuxUnit();
+ });
//閫夋嫨浜у搧寮圭獥
form.on('submit(btnSearchMater2)', function () {//浜у搧
@@ -1323,7 +1369,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterModel").val(checkStatus.data[0].HModel);
+ $("#HMaterModel1").val(checkStatus.data[0].HModel);
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
$("#HMaterName").val(checkStatus.data[0].HName);
$("#HMaterID").val(checkStatus.data[0].HItemID);
@@ -1835,6 +1881,13 @@
, "HEquipMentID": data.HEquipMentID
, "HProductNum": data.鎴愬搧缂栧彿
, "HExplanation": data.鎽樿
+ , "HMaterModel": data.鏉愭枡瑙勬牸
+ , "HWidth": data.骞呭
+ , "HWeight": data.鍏嬮噸
+ , "HAuxQty": data.杈呮暟閲�
+ , "HAuxUnit": data.HAuxUnit
+ , "HAuxUnitName": data.杈呭姪鍗曚綅
+ , "HSplitNo": data.鎷嗗垎鍙�
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
@@ -1856,7 +1909,7 @@
, "HMaterName": data.瀛愪欢鍚嶇О
, "HMaterID": data.HMaterID
, "HMaterNumber": data.瀛愪欢浠ｇ爜
- , "HMaterModel": data.瀛愪欢瑙勬牸
+ , "HMaterModel1": data.瀛愪欢瑙勬牸
, "HUnitNumber": data.鍗曚綅浠ｇ爜
, "HMainMaterID": data.涓昏鏉愭枡
, "HPlanQty": data.鐢熶骇鏁伴噺
@@ -1951,6 +2004,32 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+
+ //杈呭姪鍗曚綅
+ function get_btnHAuxUnit() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HAuxUnit").val(checkStatus.data[0].HItemID);
+ $("#HAuxUnitName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
}
//#region 鏌ヨ (鍣ㄥ叿娓呭崟)
@@ -2121,6 +2200,10 @@
$("#HPickLabelNumber").val(data.鍖呰鏍囪瘑缂栫爜);
$("#HXTNumber").val(data.鑺綋鐗╂枡浠ｇ爜);
$("#HXTModel").val(data.鑺綋瑙勬牸鍨嬪彿);
+ $("#HWidth").val(data.HWidth);
+ $("#HWeight").val(data.HWeight);
+ $("#HAuxUnitName").val(data.HAuxUnitName);
+ $("#HAuxUnit").val(data.HAuxUnit);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
--
Gitblit v1.9.1