From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
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_POStockInBackBill.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_POStockInBackBill.html"
index 2f56366..0164310 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_POStockInBackBill.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_POStockInBackBill.html"
@@ -13,7 +13,7 @@
<body>
<div class="layui-fluid" style="padding:0">
<div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>澶栬喘鍏ュ簱鍗�(绾㈠瓧)</span>
@@ -201,7 +201,7 @@
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
</div>
@@ -592,7 +592,7 @@
//parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
+ parent.location.href = "../../../views/index_Mobile.html";
});
})
@@ -694,7 +694,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
sessionStorage["SourceFlag"] = false;
- layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+ layer.msg(data.Message, { icon: 1 });
}
else {
layer.msg(data.Message, { icon: 5 });
@@ -860,12 +860,13 @@
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/POStockInBackBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1239', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
@@ -923,14 +924,15 @@
element.tabChange('tab-POStockInBackBill', '2');
table.render({
elem: '#wl-table'
+ , totalRow: true
//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBackBill/DisBillEntryList_Webs_Json'
, url: GetWEBURL() + '/POStockInBackBill/DisBillEntryList_Webs_Json'
//, toolbar: '#toolbarDemo'
, where: { HBillID: sInterID, HBillType: '1239', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -938,6 +940,7 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
, { field: 'HBatchNo', title: '鎵规', width: 100 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
]]
// , data: [linterid]
// , page: true
@@ -1002,10 +1005,12 @@
//sessionStorage["HWHID"] = obj[0].HItemID;
$("#HWHID").val(obj[0].HItemID);
}
- function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
- $("#HStockPlaceName").val(obj[0].HName);
- $("#HStockPlaceID").val(obj[0].HItemID);
- }
+ function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
+ }
function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
$("#HSupName").val(obj[0].HName);
$("#HSupID").val(obj[0].HItemID);
@@ -1041,7 +1046,21 @@
// }
// })
//}
- function AllowLoadData(sSubStr,bnt) { //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ //if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ // layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ // layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ // layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
--
Gitblit v1.9.1