From f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 14 四月 2026 16:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/验收入库/产品入库/Kf_ProductInBillEdit.html | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
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_ProductInBillEdit.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_ProductInBillEdit.html"
index e67ab74..ef13731 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_ProductInBillEdit.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_ProductInBillEdit.html"
@@ -262,6 +262,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -414,6 +416,12 @@
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
};
switch (obj.event) {
+ //搴撳瓨鏌ヨ
+ case 'get_Inventory': get_Inventory();
+ break;
+ //鍑哄叆搴撹褰曟煡璇�
+ case 'get_InOutSum': get_InOutSum();
+ break;
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
@@ -488,7 +496,55 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
//#endregion
-
+ //#region 搴撳瓨鏌ヨ
+ function get_Inventory() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ //寮圭獥鏂规硶
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
+ //#region 鍑哄叆搴撹褰曟煡璇�
+ function get_InOutSum() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
//#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
@@ -751,10 +807,10 @@
if (OperationType == 1 || OperationType == 4) {
if ($("#HSourceBillType").val() == "3710") {
- for (var i = 0; i < option.data.length; i++) {
+ for (var i = 0; i < option.data.length; i++) {
+ var tableData = table.cache["mainTable"];
var HSourceBillData = "";
- var HSourceBillData = getPushSource_ICMOBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
- if (HSourceBillData != "none") {
+ var HSourceBillData = getPushSource_ICMOBillInit(tableData[i].HSourceInterID, tableData[i].HSourceEntryID); if (HSourceBillData != "none") {
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
@@ -1035,7 +1091,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1461,7 +1517,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=' +"Warehouse", 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1478,12 +1534,12 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
- })
- }
+ // , end: function () {
+ // obj.update({
+ // "HWHID": OptionData.HItemID
+ // , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+ // })
+ //}
})
}
//杈呭姪璁￠噺鍗曚綅
@@ -1801,7 +1857,14 @@
$("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
$("#HKeeperID").val(obj[0].HItemID);
}
+
+ function GetGyCur(obj) //杩斿洖甯佸埆
+ {
+ $("#HCurName").val(obj.璐у竵鍚嶇О);
+ $("#HCurID").val(obj.HItemID);
+ $("#HExRate").val(obj.姹囩巼);
+ }
function GetHWHValue(obj) //杩斿洖浠撳簱
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
@@ -1824,8 +1887,9 @@
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
+ function GetGyWarehouse(data) {
+ option.data = data
+ //OptionData = data
}
//鍙屽嚮杩斿洖杈呭姪灞炴��
function GetGyProperty(data) {
--
Gitblit v1.9.1