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/基础资料/公用基础资料/xmlLBM_Sc_ProcExchRecordBackBillList.aspx | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html | 3
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 69 +++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 71 +++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 251 ++++++++++++++++++---------
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 78 +++++--
WebTM/views/index.html | 2
WebTM/views/仓存管理/条码库存/KF_ICInventoryByMaterID.html | 2
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_AR.html | 2
10 files changed, 365 insertions(+), 117 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b41e1b9..bf72699 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -448,7 +448,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>
+ <!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>
<!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
index d8432f3..c93eacf 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
@@ -212,7 +212,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index b720e4b..5c03a95 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -96,22 +96,22 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -176,9 +176,9 @@
<div class="layui-inline">
<!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">榛樿浠撳簱</label>
<div class="layui-input-inline">
@@ -232,9 +232,9 @@
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -252,8 +252,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -379,7 +379,7 @@
</div>
<div class="layui-inline">
<div class="layui-inline">
- <label class="layui-form-label">閿�鍞浠�<br/>璁￠噺鍗曚綅</label>
+ <label class="layui-form-label">閿�鍞浠�<br />璁￠噺鍗曚綅</label>
<div class="layui-input-inline" style="margin-top:10px">
<input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
<input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -424,20 +424,36 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label"> 鏍囧噯浜哄憳<br/>鍑嗗宸ユ椂</label>
+ <label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br/>鍑嗗宸ユ椂</label>
+ <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">骞呭</label>
+ <div class="layui-input-inline" style="">
+ <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" autocomplete="off" value="0">
+ </div>
+ </div>
-
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏嬮噸</label>
+ <div class="layui-input-inline" style="">
+ <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" autocomplete="off" value="0">
+ </div>
+ </div>
+
</div>
</div>
<div class="layui-form-item">
@@ -653,7 +669,7 @@
, "HSubjoin2": data.闄勫姞灞炴��2
, "HColor": data.棰滆壊
, "HMaterClsID": data.鐗╂枡鍒嗙被
- , "HMaterTypeID": data.鐗╂枡灞炴��
+ , "HMaterTypeID": data.鐗╂枡灞炴�� == "0" ? 1 : data.鐗╂枡灞炴��
, "HWhID": data.榛樿浠撳簱
, "HWhName": data.浠撳簱鍚嶇О
, "HSPGroupID": data.榛樿浠撲綅缁�
@@ -689,6 +705,8 @@
, "HPERUNITSTANDHOUR": data.鏍囧噯宸ユ椂
, "HSTDLABORPREPARETIME": data.鏍囧噯浜哄憳鍑嗗宸ユ椂
, "HSTDMACHINEPREPARETIME": data.鏍囧噯鏈哄櫒鍑嗗宸ユ椂
+ , "HWidth": data.HWidth
+ , "HWeight": data.HWeight
});
console.log($('#HUnitGroupID').val());
} else {
@@ -740,7 +758,15 @@
if ($("#HSecUnitName").val() == 0) {
layer.msg("璇烽�夋嫨杈呭姪璁￠噺鍗曚綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
- }
+ }
+ //if ($("#HWidth").val() == 0) {
+ // layer.msg("骞呭涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HWeight").val() == 0) {
+ // layer.msg("鍏嬮噸涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
$.ajax(
{
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchRecordBackBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchRecordBackBillList.aspx"
index ead0382..1299b46 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchRecordBackBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchRecordBackBillList.aspx"
@@ -13,7 +13,7 @@
//涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- SqlXMLReportData.GenOneRecordset(this, "select a.HNumber 璁惧缂栧彿,a.HName 璁惧鍚嶇О,g.HName 鎵�灞炶溅闂�,e.HName 璐ｄ换浜� from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on g.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "select 娴佽浆鍗″彿 娴佽浆鍗�,杩斿伐鏁伴噺,浜у搧鍚嶇О 鐗╂枡鍚嶇О,浜у搧浠ｇ爜 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,杩斿伐寮�濮嬫祦姘村彿 寮�濮嬫祦姘村彿,杩斿伐缁撴潫娴佹按鍙� 缁撴潫娴佹按鍙�,杩斿伐寮�濮嬪伐搴� 寮�濮嬪伐搴�,杩斿伐缁撴潫宸ュ簭 缁撴潫宸ュ簭,鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟,鍗曚綅 璁￠噺鍗曚綅,鏃ユ湡 ,娴佹按鍙�,宸ュ簭浠ｇ爜,宸ュ簭 宸ュ簭鍚嶇О,琛ㄤ綋澶囨敞 澶囨敞 from h_v_Sc_ProcExchRecordBackBillList where hmainid=" + Request.Params["linterid"]);
}
</script>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 7d6db5a..a522c39 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -226,6 +226,36 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杈呮暟閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" id="HAuxQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杈呭姪鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 80px;">
+ <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞呭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
<div class="layui-input-block" style="margin-left: 115px;">
<input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
@@ -447,6 +477,11 @@
//閫夋嫨璁￠噺鍗曚綅鎸夐挳
form.on('submit(btnHUnit)', function () {
get_btnHUnit();
+ });
+
+ //閫夋嫨杈呭姪鍗曚綅鎸夐挳
+ form.on('submit(btnHAuxUnit)', function () {
+ get_btnHAuxUnit();
});
//閫夋嫨BOM鎸夐挳
@@ -702,7 +737,8 @@
$("#HModel").val(checkStatus.data[0].HModel);
$("#HUnitID").val(checkStatus.data[0].HUnitID);//璁￠噺鍗曚綅id
$("#HUnitName").val(checkStatus.data[0].HUnitName);//璁￠噺鍗曚綅鍚嶇О
-
+ $("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
+ $("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -754,6 +790,32 @@
//鑾峰彇鏁版嵁
$("#HUnitID").val(checkStatus.data[0].HItemID);
$("#HUnitName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //杈呭姪鍗曚綅
+ 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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -899,6 +961,11 @@
, "HBeginDate": Format(new Date(d.data[0].鏈�杩熷紑宸ユ棩鏈�), "yyyy-MM-dd")
, "HEndDate": Format(new Date(d.data[0].鏈�杩熷畬宸ユ棩鏈�), "yyyy-MM-dd")
, "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HAuxQty": d.data[0].HAuxQty
+ , "HAuxUnit": d.data[0].HAuxUnit
+ , "HAuxUnitName": d.data[0].HAuxUnitName
+ , "HWidth": d.data[0].HWidth
+ , "HWeight": d.data[0].HWeight
//鍏朵粬淇℃伅
, "hmakers": d.data[0].鍒跺崟浜�
, "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
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");
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_Mul.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_Mul.html"
index ebd4a7b..f2ac88e 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_Mul.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_Mul.html"
@@ -166,6 +166,36 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞呭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HWidth" name="HWidth" id="HWidth" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HWeight" name="HWeight" id="HWeight" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <!--<div class="layui-inline" >
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杈呭姪鍗曚綅</label>
+ <div class="layui-input-inline">
+ <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 class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏉愭枡瑙勬牸 </label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" >
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -334,11 +364,16 @@
var dataNum = [];
var HBillNo = $("#HBillNo").val();
for (var i = 0; i < HProcessExchangeSum; i++) {
- dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty});
+ dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
}
option1.data = dataNum;
table.render(option1);
})
+
+ //閫夋嫨杈呭姪鍗曚綅鎸夐挳
+ form.on('submit(btnHAuxUnit)', function () {
+ get_btnHAuxUnit();
+ });
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
@@ -641,12 +676,13 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HBillNo', title: '娴佽浆鍗″彿' }
, { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
+ , { field: 'HSplitNo', title: '鎷嗗垎鍙�', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
};
- option1.data = [{ "HBillNo": "", "HQty": 0 }];
+ option1.data = [{ "HBillNo": "", "HQty": 0, "HSplitNo": 0 }];
table.render(option1);
}
@@ -677,6 +713,11 @@
$("#HPlanEndDate").val(Format(data1.data[0].璁″垝瀹屽伐鏃ユ湡, "yyyy-MM-dd"));
$("#HUnitID").val(data1.data[0].HUnitID);
$("#HUnitNumber").val(data1.data[0].璁￠噺鍗曚綅浠ｇ爜);
+ $("#HWidth").val(data1.data[0].HWidth);
+ $("#HWeight").val(data1.data[0].HWeight);
+ //$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
+ //$("#HAuxUnit").val(data1.data[0].HAuxUnit);
+ // $("#HMaterModel").val(data1.data[0].HMaterModel);
$.ajax({
type: "get",
@@ -789,6 +830,32 @@
}
}
+ //杈呭姪鍗曚綅
+ 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) { }
+ })
+ }
+
//闈炵┖楠岃瘉
function AllowLoadData(data) {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
index b75f787..7b95482 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
@@ -392,6 +392,8 @@
//, { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
//, { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
//, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ //, { field: 'numbers', title: '搴忓彿', width: 60, totalRow: true }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
//, { field: 'HQtyMust', title: '璁㈠崟鏁伴噺' }
, { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
index b1ce828..4304c03 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
@@ -1093,7 +1093,8 @@
, page: true
, cols: [[
{ type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HSNO', title: '搴忓彿', width: 60, totalRow: true }
, { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
, { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 1c30243..8e13c4f 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -1172,6 +1172,8 @@
sessionStorage["SourceFlag"] = true;
layer.load(3);
element.tabChange('tab-POStockInBill', '2');
+ var pFocus = $("#HBarCode");
+ pFocus.focus();
table.render({
elem: '#wl-table'
--
Gitblit v1.9.1