From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
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 d328cbc..8b537d5 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"
@@ -44,7 +44,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>
@@ -959,21 +959,21 @@
}, function () { window.location.reload(); });//鏂板
}
else {
- layer.msg(data.Message, { icon: 5 });
+ layer.confirm(data.Message, { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
layer.closeAll("loading");
},
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ layer.confirm("閿欒:" + err, { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
});
}
else {
- layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+ layer.confirm("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
@@ -1093,6 +1093,13 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sSubStr = table.cache['wl-table'];
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHNAME").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
var sBarCode = $('#HBarCode').val()
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
@@ -1131,11 +1138,13 @@
//, toolbar: '#toolbarDemo'
, defaultToolbar: []
, page: true
- , limit: 100
+ , limit: 3000
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -1152,7 +1161,7 @@
, done: function () {
layer.closeAll("loading");
}
- })
+ })
//娓呯┖鏁伴噺
$("#HQty").val("");
}
--
Gitblit v1.9.1