From a9ed06456324641db44df7bd96a276e7d2c98eca Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 四月 2023 08:28:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 68 ++-
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 47 +-
WebTM/views/领料发货/生产补料/Kf_MateReplenishOutBill_Check_New.html | 21
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 76 ++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 40 +
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 11
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 47 +-
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 51 +-
WebTM/views/模治具管理/模治具管理/Gy_SplitBarCode.html | 483 ++++++++++++++++++++++++++++++
WebTM/views/home/console_Mobile.html | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 61 ++-
WebTM/views/index.html | 25
WebTM/WebTM.csproj | 1
14 files changed, 749 insertions(+), 186 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 52f3780..a20a9eb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -202,6 +202,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBill_PDA_QiaoYi.html" />
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 853900f..1d6a2b0 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -114,7 +114,7 @@
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html?HInterId=0&HSourceBillType=-1" target="main_self_frame">
<i class="layui-icon layui-icon-at"></i>
<cite>鐩存帴璋冩嫧</cite>
</a>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index d0626fe..23b8ae4 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -234,6 +234,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">鏉＄爜鐢熸垚</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉＄爜涓绘。缁存姢</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_SplitBarCode.html">鏉＄爜鎷嗙爜</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉＄爜鐘舵�佸彉鏇村崟</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">鏉＄爜鐘舵�佸彉鏇村崟缁存姢</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBill_OutList.html">鏉＄爜褰掓。缁存姢</a></dd>
@@ -332,7 +333,7 @@
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
+ <!--<dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>-->
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
@@ -354,13 +355,13 @@
<dl class="layui-nav-child">
<dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
<dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
- <dd><a lay-href="">鎶ユ鐢宠n</a></dd>
+ <!--<dd><a lay-href="">鎶ユ鐢宠n</a></dd>-->
</dl>
</dd>
<dd>
<a>涓婃枡闃查敊</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>
+ <!--<dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>-->
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曠淮鎶�</a></dd>
</dl>
</dd>
@@ -455,8 +456,8 @@
<!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>
<!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
- <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
- <dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
+ <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>-->
+ <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曠淮鎶�</a></dd>
@@ -501,8 +502,8 @@
<dd>
<a>鎶ヨ〃鍒嗘瀽</a>
<dl class="layui-nav-child append" id="append">
- <dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
- <dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>
+ <!--<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>-->
+ <!--<dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
@@ -565,8 +566,8 @@
<dd>
<a>MRB璇勫</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">MRB璇勫鍗昻</a></dd>
- <dd><a lay-href="">MRB璇勫鍗曠淮鎶</a></dd>
+ <!--<dd><a lay-href="">MRB璇勫鍗昻</a></dd>-->
+ <!--<dd><a lay-href="">MRB璇勫鍗曠淮鎶</a></dd>-->
</dl>
</dd>
<dd>
@@ -821,8 +822,8 @@
<dd><a lay-href="宸ヨ祫绠＄悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillEdit.html">澶栬喘澧欏竷宸ヨ祫</a></dd>
</dl>
</dd>
- <dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>
- <dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList2.html">鏈堝害宸ヨ祫鎶ヨ〃</a></dd>
+ <!--<dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>-->
+ <!--<dd><a lay-href="宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/ReportList2.html">鏈堝害宸ヨ祫鎶ヨ〃</a></dd>-->
<dd>
<a>鎵ｈˉ璧勬枡</a>
<dl class="layui-nav-child">
@@ -1066,7 +1067,7 @@
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
- <dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
+ <!--<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>-->
<dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 434ecc0..bfd5970 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -463,7 +463,7 @@
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var HSourceBillType = params[params[1]]; //鐢ㄤ簬鍒ゆ柇婧愬崟绫诲瀷
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
@@ -524,6 +524,13 @@
$("#HBillType").val(1242);
} else {
$("#HBillType").val(-1);
+ }
+
+ //鐩存帴璋冩嫧 鎵皟鍑轰粨搴�--璋冨叆浠撳簱--鏉＄爜
+ if ($("#HBillType").val() == -1) {
+ element.tabChange('tab-MoveStockBill', '2');
+
+ $("#HSCWHNAME").focus();//璋冨嚭浠撳簱
}
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
@@ -640,7 +647,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: linterid, HBillType: '1207', sWhere: '' }
, cols: [[
@@ -986,7 +995,9 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
, cellMinWidth: 80
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
, cols: [[
@@ -1153,10 +1164,10 @@
}
layer.load(3);
- if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+ if (HSourceBillType == 1402 || HSourceBillType == 1214 || HSourceBillType == 1242) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
element.tabChange('tab-MoveStockBill', '2');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HWHNAME").focus();
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨嚭浠撳簱涓�
+ $("#HSCWHNAME").focus();
}
$.ajax({
@@ -1442,7 +1453,7 @@
}
});
- //鎵粨搴�
+ //鎵皟鍏ヤ粨搴�
$('#HWHNAME').on('keydown', function (event) {
var HBarCode = $('#HWHNAME').val()
if (event.keyCode == 13) {
@@ -1462,10 +1473,12 @@
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
//element.tabChange('tab-POStockInBill', '2');
+ //鎵皟鍏ヤ粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
element.tabChange('tab-MoveStockBill', '2');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HWHNAME").focus();
+ //鎵皟鍏ヤ粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HBarCode").focus();
}
}
else {
@@ -1500,11 +1513,13 @@
$("#HSCWHID").val(result.data[0].HItemID);
$("#HSCWHNAME").val(result.data[0].HName);
//element.tabChange('tab-POStockInBill', '2');
+ //鎵皟鍑轰粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨叆浠撳簱涓�
+ $("#HWHNAME").focus();
if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
element.tabChange('tab-MoveStockBill', '2');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HSCWHNAME").focus();
- }
+ //鎵皟鍑轰粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨叆浠撳簱涓�
+ $("#HWHNAME").focus();
+ }
}
else {
// $("#verifycode").click();
@@ -1602,6 +1617,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 984fab4..5cc0b31 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -506,7 +506,7 @@
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0] //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
if (result.list[i].HMinQty != 0) {
result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index a0196ca..72ca332 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -137,16 +137,21 @@
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length == 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁锛�');
+ if (checkStatus.data.length == 0 || checkStatus.data.length > 300) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁,涓旈�変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒');
return;
}
var mainid = "";
+ var BarCode = "";
for (i = 0; i < data.length; i++) {
mainid += data[i].hmainid.toString() + ",";
+ BarCode += data[i].鏉＄爜缂栧彿.toString() + ",";
}
+
mainid = mainid.substring(0, mainid.length - 1)
- var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"];
+ BarCode = BarCode.substring(0, BarCode.length - 1)
+
+ var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"] + ";" + JSON.stringify(BarCode);
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_SplitBarCode.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_SplitBarCode.html"
new file mode 100644
index 0000000..c3d9bfb
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_SplitBarCode.html"
@@ -0,0 +1,483 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鎷嗗垎鏉＄爜</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+ /*end*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
+ }
+
+ .layui-input-block {
+ margin-left: 0px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-input-block">
+ <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+ <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
+ <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+ </div>
+ </div>
+
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <!--<h1 style="text-align:center;"><b>鏉＄爜鐢熸垚</b></h1>-->
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜缂栧彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCodeNo" id="HBarCodeNo" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎷嗗垎鏉＄爜鏁�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSplitBarNum" id="HSplitBarNum" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button type="button" class="layui-btn layui-btn-sm" id="ToolSure" lay-submit="" lay-filter="ToolSure">纭畾</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">鏉＄爜淇℃伅</li>
+ <li lay-id="2">鏂扮爜淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable_New" lay-filter="mainTable_New"></table>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="switchTpl">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" value="{{d.HGiveAwayFlag}}" lay-skin="primary" lay-filter="HGiveAwayFlag" {{ d.HGiveAwayFlag == 1 ? 'checked' : '' }}>
+ </script>
+ <script type="text/html" id="switchTp2">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ debugger;
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ var option_New = [];
+ var sWhere = "";
+ var HModName = "Gy_SplitBarCode";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //#endregion
+
+ //鍏夋爣榛樿鏄剧ず鍦ㄦ潯鐮佺紪鍙蜂綅缃�
+ $("#HBarCodeNo").focus();
+ //鑾峰彇鍒跺崟浜轰俊鎭�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛�
+ element.on('tab(tab-TabTest)', function (data) {
+
+ })
+
+ var rowdata = [{
+ "HBarCode": '', "HQty": '', "HSplitNum": '', "HNumber": '', "HName": '', "HModel": '',"HBatchNo": ''
+ }];
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ set_InitGrid_New();
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鏂板
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ //set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+
+ var NewRow = {
+ "HBarCode": '', "HQty": '', "HSplitNum": '', "HNumber": '', "HName": '', "HModel": '', "HBatchNo": ''
+ };
+
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn(0);
+ break;
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ });
+
+ function isAllEqual(array) {
+ if (array.length > 0) {
+ return !array.some(function (value, index) {
+ return value !== array[0];
+ });
+ } else {
+ return true;
+ }
+ }
+
+ //#region 纭畾鎸夐挳
+ form.on('submit(ToolSure)', function (data) {//
+ var HBarCodeNo = $('#HBarCodeNo').val();//鏉＄爜缂栧彿
+ var HSplitBarNum = $('#HSplitBarNum').val();//鎷嗗垎鏉＄爜鏁�
+
+ if (!HBarCodeNo) {
+ layer.msg("鏉＄爜缂栧彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ if (!HSplitBarNum || HSplitBarNum > 10) {
+ layer.msg("鎷嗗垎鏉＄爜鏁颁笉鑳戒负绌�,涓斾笉鑳藉ぇ浜�10锛�")
+ return;
+ }
+ get_BarCodeInfo(HBarCodeNo, HSplitBarNum);
+ });
+ //#endregion
+
+ //鎵撳嵃
+ form.on('submit(ToolPrint)', function (data) {
+ get_PrintReport();
+ })
+
+ //鏉＄爜鐢熸垚
+ form.on('submit(ToolCreate)', function (data) {
+ $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+ var sSubStr = JSON.stringify(table.cache['mainTable_New']);
+ //鏁伴噺鎺у埗
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ return false;
+ }
+
+ var UserName = sessionStorage["HUserName"];
+ var HBarCodeNo = $("#HBarCodeNo").val();
+ var HSplitBarNum = $("#HSplitBarNum").val();
+ var sMainSub = HBarCodeNo + ';' + HSplitBarNum + ';' + sSubStr + ';' + UserName;
+ SaveBarCodeCreate(sMainSub);
+ })
+
+ //閫�鍑�
+ form.on('submit(ToolExit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+
+ //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 200 }
+ , { field: 'HQty', title: '鏉＄爜鏁伴噺', width: 200 }
+ , { field: 'HSplitNum', title: '鎷嗗垎鏁伴噺', width: 200, edit: 'text' }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 200 }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 75
+ , height: 'full-255'
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //鍒濆鍖栨柊鐮佷俊鎭〃鏍�
+ function set_InitGrid_New() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 200 }
+ , { field: 'HQty', title: '鏉＄爜鏁伴噺', width: 200 }
+ , { field: 'HSplitNum', title: '鎷嗗垎鏁伴噺', width: 200, edit: 'text' }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 200 }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+
+ option_New = {
+ id: 'mainTable_New'
+ , elem: '#mainTable_New'
+ , toolbar: '#toolbarDemo_New'
+ , page: false
+ , cellMinWidth: 75
+ , height: 'full-255'
+ , cols: [columns]
+ , limit: 500
+ , done: function (res, curr, count) {
+ }
+ };
+ option_New.data = rowdata;
+ table.render(option_New);
+ }
+
+ //鏌ヨ鏉＄爜淇℃伅
+ function get_BarCodeInfo(HBarCodeNo, HSplitBarNum) {
+ var index = layer.load(0);
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Gy_SplitBarCode/Info',
+ type: "GET",
+ data: { "HBarCodeNo": HBarCodeNo, "HSplitBarNum": HSplitBarNum },
+ success: function (result) {
+ if (result.count == 1) {
+ //鏍规嵁鎷嗗垎琛屾暟娣诲姞琛岋紝鍥犱负杩斿洖缁撴灉鏃惰嚜甯︿簡涓�琛屾暟鎹紝鎵�浠ュ湪鎷嗗垎琛屾暟鐨勫熀纭�涓婂噺鍘�1
+ table.reload('mainTable', {
+ data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
+
+ rowdata = [{
+ "HBarCode": '', "HQty": '', "HSplitNum": '', "HNumber": '', "HName": '', "HModel": '', "HBatchNo": ''
+ }];
+
+ //鑾峰彇26涓ぇ鍐欏瓧姣�
+ const letter = [];
+ let start = 'A'.charCodeAt(0); //65
+ let last = 'Z'.charCodeAt(0); //90
+ for (start; start <= last; start++) {
+ letter.push(String.fromCharCode(start));
+ };
+ var tmbh = result.data[0].HBarCode;//鏉＄爜缂栧彿
+ //var datas = result.data[0];
+ for (var i = 0; i < HSplitBarNum - 1; i++) {
+ result.data.push(result.data[0]);//result.data[0].鏉＄爜缂栧彿 = ;
+ rowdata.push({ "HBarCode": '', "HQty": '', "HSplitNum": '', "HNumber": '', "HName": '', "HModel": '', "HBatchNo": ''});
+ }
+
+ for (let i = 0; i < result.data.length; i++) {
+ result.data[i].HBarCode = tmbh + letter[i];
+ rowdata[i].HBarCode = tmbh + letter[i];
+ rowdata[i].HQty = result.data[0].HQty;
+ rowdata[i].HSplitNum = "";
+ rowdata[i].HNumber = result.data[0].HNumber;
+ rowdata[i].HName = result.data[0].HName;
+ rowdata[i].HModel = result.data[0].HModel;
+ rowdata[i].HBatchNo = result.data[0].HBatchNo;
+ }
+
+ table.reload('mainTable_New', {
+ data: rowdata // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
+ element.tabChange('tab-TabTest', '2'); //璺宠浆椤电
+
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏉＄爜鐢熸垚
+ function SaveBarCodeCreate(sMainSub) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_BarCode/Save_SplitBarCode", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(result.Message, { icon: 1 });
+ }
+ else {
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+ var rows = 0; //鎷嗗垎鎬昏鏁帮紱
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HSplitNum == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎷嗗垎鏁伴噺涓嶈兘涓虹┖涓斿繀椤诲ぇ浜�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ rows += Number(sSubStr[i].HSplitNum);
+ }
+ if (rows > sSubStr[0].HQty) {
+ layer.msg("鎷嗗垎鏁伴噺涔嬪拰蹇呴』灏忎簬鏉＄爜鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+
+ //#endregion
+
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 93d54f2..eb99de8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -447,7 +447,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -1088,7 +1090,9 @@
elem: '#wl-table'
, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
, cellMinWidth: 80
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
, cols: [[
@@ -1133,36 +1137,39 @@
data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": HStockOrgID, "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" },
success: function (result) {
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-Kf_OtherOutBill', '2'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-Kf_OtherOutBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-Kf_OtherOutBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1206") {
+ if (result.data.hSourceBillTypeField == "1206") {
$("#HBillType").val("1206");
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
index d2a8183..848e5e1 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_New.html"
@@ -181,7 +181,8 @@
option = {
elem: '#wl-table'
, height: 'full-50'
- //, page: true
+ , page: true
+ , limit: 100
, cellMinWidth: 90
, limit: 50
//, limits: [50, 500, 5000, 20000]
@@ -365,20 +366,22 @@
data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');//璺宠浆椤电
+ return;
}
else {
element.tabChange('tab-Kf_MateReplenishOutBillCheck', '2');
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index b49065e..02cbc2f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -355,6 +355,7 @@
//, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , limit: 100
, cellMinWidth: 90
, cols: [[
{ field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��', width: 180 }
@@ -434,8 +435,8 @@
option = {
id: 'wl-table'
, elem: '#wl-table'
- , toolbar: '#toolbarDemo'
- , page: false
+ //, toolbar: '#toolbarDemo'
+ , page: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -574,7 +575,9 @@
elem: '#wl-table'
//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
, cols: [[
@@ -591,7 +594,6 @@
, { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
// , data: [linterid]
- // , page: true
, height: 500
, done: function () {
layer.closeAll("loading");
@@ -898,7 +900,9 @@
elem: '#wl-table'
//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
, cols: [[
@@ -916,7 +920,6 @@
, { field: 'HBatchNo', title: '鎵规', width: 90 }
]]
// , data: [linterid]
- // , page: true
, height: 500
, done: function () {
layer.closeAll("loading");
@@ -1231,6 +1234,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
@@ -1367,7 +1371,9 @@
elem: '#wl-table'
, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
, cellMinWidth: 80
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
, cols: [[
@@ -1426,40 +1432,43 @@
success: function (result) {
playSound1();
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-Kf_SellOutBill', '3'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- //$("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- //$("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ //$("#HSupName").val(result.data.hSupName);
+ $("#HSupID").val(result.data.hSupIDField);
+ //$("#HDeptName").val(result.data.hDeptName);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1402") {
+ if (result.data.hSourceBillTypeField == "1402") {
$("#HBillType").val("1402");
}
- else if (result.data.HSourceBillType == "1401") {
+ else if (result.data.hSourceBillTypeField == "1401") {
$("#HBillType").val("1401");
}
else {
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_MateOutBill_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_MateOutBill_Fast.html"
index ef11660..8d9f0f4 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_MateOutBill_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_MateOutBill_Fast.html"
@@ -506,7 +506,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -521,7 +523,6 @@
, { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
// , data: [linterid]
- // , page: true
, height: 500
, done: function () {
layer.closeAll("loading");
@@ -843,7 +844,9 @@
elem: '#wl-table'
, url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
//, cellMinWidth: 80
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -1027,6 +1030,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
@@ -1076,33 +1080,36 @@
//data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-MateOutBill', '3'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoFieldField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
$("#HBillType").val(result.data.hSourceBillTypeField == null ? "3720" : result.data.hSourceBillTypeField);
@@ -1215,7 +1222,7 @@
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
, totalRow: true
- , limit: 50
+ , limit: 100
, limits: [50, 500, 5000, 20000]
, page: true
, cols: [[
@@ -1276,7 +1283,7 @@
}
element.tabChange('tab-MateOutBill', '2');
//鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
- $("#HWHNAME").focus();
+ //$("#HWHNAME").focus();
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();//鎾斁澹伴煶
layer.load(3)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index f207774..271535f 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -398,8 +398,8 @@
option = {
id: 'wl-table'
, elem: '#wl-table'
- , toolbar: '#toolbarDemo'
- , page: false
+ //, toolbar: '#toolbarDemo'
+ , page: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -421,7 +421,7 @@
return vars;
}
- ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
// icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
@@ -507,7 +507,7 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
, cols: [[
@@ -523,7 +523,8 @@
//, { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
// , data: [linterid]
- // , page: true
+ , page: true
+ , limie: 100
, height: 500
, done: function () {
layer.closeAll("loading");
@@ -629,7 +630,7 @@
}
})
});
- ////閫夋嫨浠撳簱
+ //閫夋嫨浠撳簱
//form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
// layer.open({
// type: 2
@@ -807,9 +808,11 @@
elem: '#wl-table'
//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, defaultToolbar: []
, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+ , page: true
+ , limit: 100
, cols: [[
{ type: 'radio' }
, { field: 'HQty', title: '鏁伴噺', width: 150 }
@@ -841,7 +844,7 @@
});
})
- ////鍒犻櫎
+ //鍒犻櫎
//form.on('submit(cmdDelete)', function () {//鍒犻櫎
// var checkStatus = table.checkStatus('wl-table')
// , data = checkStatus.data;
@@ -894,7 +897,7 @@
// elem: '#wl-table'
// //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
// , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
+ // //, toolbar: '#toolbarDemo'
// , defaultToolbar: []
// , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
// , cols: [[
@@ -1194,6 +1197,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
@@ -1234,8 +1238,10 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, defaultToolbar: []
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -1306,34 +1312,37 @@
//data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] }, //鏃�
success: function (result) {
//debugger;
- playSound1();
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ playSound1();
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-ProductlnBill', '2'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- //$("#HSupName").val(result.data.HSupName);
- //$("#HSupID").val(result.data.HSupID);
- //$("#HDeptName").val(result.data.HDeptName);
- //$("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ //$("#HSupName").val(result.data.hSupName);
+ //$("#HSupID").val(result.data.hSupID);
+ //$("#HDeptName").val(result.data.hDeptName);
+ //$("#HDeptID").val(result.data.hDeptID);
if (result.data.hDeptIDField != 0) {
$("#HDeptID").val(result.data.hDeptIDField);
$("#HDeptName").val(result.data.hDeptNameField);
@@ -1412,7 +1421,7 @@
// elem: '#wl-table'
// //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
// , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
+ // //, toolbar: '#toolbarDemo'
// , defaultToolbar: []
// , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
// , cols: [[
@@ -1487,9 +1496,11 @@
var listOption = {
elem: '#wl-table'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, totalRow: true
, cellMinWidth: 90
+ , page: true
+ ,limit: 100
, cols: [[
{ type: 'radio' }
, { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
@@ -1510,7 +1521,7 @@
}
var listOption1 = {
elem: '#mx-table'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
@@ -1576,9 +1587,11 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, totalRow: true
, defaultToolbar: []
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -1594,7 +1607,6 @@
, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
]]
// , data: [linterid]
- // , page: true
, height: 500
, done: function () {
layer.closeAll("loading");
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 720ce84..7c77178 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -392,7 +392,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -508,7 +510,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -536,7 +540,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -787,7 +793,9 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 100
, where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
@@ -836,7 +844,7 @@
// table.render({
// elem: '#wl-table'
// , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
+ // //, toolbar: '#toolbarDemo'
// , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
// , cols: [[
// { type: 'radio' }
@@ -1066,12 +1074,13 @@
table.render({
elem: '#mx-table'
// , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
- //, toolbar: '#toolbarDemo'
+ ////, toolbar: '#toolbarDemo'
// , where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
@@ -1112,36 +1121,39 @@
data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
if (result.count == 1) {
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-Kf_OtherInBill', '2'); //璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+ return;
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1241") {
+ if (result.data.hSourceBillType == "1241") {
$("#HBillType").val("1241");
}
@@ -1207,7 +1219,7 @@
//table.render({
// elem: '#wl-table'
// , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
+ // //, toolbar: '#toolbarDemo'
// , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
// , cellMinWidth: 90
// , cols: [[
@@ -1283,7 +1295,7 @@
var listOption = {
elem: '#wl-table'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cellMinWidth: 90
,limit:3000
, totalRow: true
@@ -1308,7 +1320,7 @@
}
var listOption1 = {
elem: '#mx-table'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
@@ -1363,7 +1375,7 @@
// elem: '#wl-table'
// //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
// , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
+ // //, toolbar: '#toolbarDemo'
// , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
// , cols: [[
// { type: 'radio' }
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 69dc78e..80da64a 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"
@@ -496,6 +496,8 @@
function RoadBillSub(linterid) {
table.render({
elem: '#wl-table'
+ , page: true
+ , limit: 100
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
, where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
, cols: [[
@@ -938,6 +940,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
, page: true
+ , limit: 100
, height: 500
, done: function () {
}
@@ -1034,41 +1037,44 @@
success: function (result) {
if (result.count == 1) {
playSound1();
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
element.tabChange('tab-POStockInBill', '2'); //璺宠浆椤电
+ return;//缁撴潫
}
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+ return;//缁撴潫
}
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+ return;//缁撴潫
}
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.hSupName);
+ $("#HSupID").val(result.data.hSupID);
+ $("#HDeptName").val(result.data.hDeptName);
+ $("#HDeptID").val(result.data.hDeptID);
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
$("#HBillType").val(result.data.hSourceBillTypeField)
sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1102") {
+ if (result.data.hSourceBillTypeField == "1102") {
$("#HBillType").val("1102");
}
- else if (result.data.HSourceBillType == "1103") {
+ else if (result.data.hSourceBillTypeField == "1103") {
$("#HBillType").val("1103");
}
else {
@@ -1165,7 +1171,7 @@
}
var listOption = {
elem: '#wl-table'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, totalRow: true
, cellMinWidth: 90
, cols: [[
@@ -1225,6 +1231,8 @@
elem: '#wl-table'
, cellMinWidth: 80
, totalRow: true
+ , page: true
+ , limit: 100
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
@@ -1243,7 +1251,6 @@
, { field: 'HPieceQty', title:'鏉＄爜浠舵暟', width: 100 }
]]
// , data: [linterid]
- // , page: true
, height: 500
, done: function () {
layer.closeAll("loading");
--
Gitblit v1.9.1