From f659353a7d740b389f9875d772857999fe0f4e61 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 26 二月 2025 10:31:24 +0800
Subject: [PATCH] 应付单，收料通知单，退料通知单，采购订单，退料通知单，采购退料单测试优化
---
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 52 +++++++
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 23 ++-
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 2
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html | 2
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 5
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 44 ++++---
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 191 ++++++++++++++++++-------------
8 files changed, 205 insertions(+), 116 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 5b79b83..868be3b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -726,7 +726,9 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
+ //rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
@@ -826,7 +828,8 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
@@ -1466,7 +1469,8 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
@@ -1588,7 +1592,8 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
@@ -1768,6 +1773,9 @@
for (var i = 0; i < option.cols[0].length; i++) {
if (option.cols[0][i]["field"] == "HQty") {
option.cols[0][i]["edit"] = false;
+ }
+ if (option.cols[0][i]["field"] == "HMoney") {
+ option.cols[0][i]["edit"] = false;
}
}
@@ -2447,7 +2455,6 @@
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
}
var sMainStr = JSON.stringify(data.field);
- debugger
//鑾峰彇瀛愯〃鏁版嵁
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -3310,7 +3317,8 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
@@ -3443,7 +3451,8 @@
for (var j = i + 1; j < rowdataEntry.length; j++) {
if (rowdataEntry[j].HMaterID == item.HMaterID) {
rowdataEntry[i].HQty += rowdataEntry[j].HQty;
- rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HMoney += rowdataEntry[j].HMoney;//閲戦
+ rowdataEntry[i].HPrice = rowdataEntry[i].HMoney / rowdataEntry[i].HQty;//鍗曚环
rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
var HExRate = $("#HExRate").val();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 40e6c9a..6c5cee6 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -768,7 +768,7 @@
}
sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
- sWhere += getSWhereByHUser();
+ /*sWhere += getSWhereByHUser();*/
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
index 41a8d96..2c9930f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
@@ -1070,8 +1070,8 @@
//蹇�熻繃婊�
function get_FastQuery(table, option,number) {
- var HBeginDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
@@ -1179,7 +1179,6 @@
sWhere += addSWhereByOpenType();
//娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
//sWhere += " and HUserID =" + sessionStorage["Czybm"]
- var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 5aea5e8..e396a28 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -987,16 +987,16 @@
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HWHID": dataArray[i].HWHID
- , "閫�鏂欎粨搴�": dataArray[i].閫�鏂欎粨搴�
+ , "閫�鏂欎粨搴�": dataArray[i].浠撳簱
, "HSPID": dataArray[i].HSPID
, "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
, "HSecUnitID": dataArray[i].HSecUnitID
, "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': dataArray[i].鎶樻墸鐜� //
- , 'HRelTaxPrice': "0"
+ /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
+ /*, 'HDiscountRate': dataArray[i].鎶樻墸鐜�*/ //
+ /*, 'HRelTaxPrice': "0"*/
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dataArray[i].绋庨 //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -1021,7 +1021,8 @@
);
}
option.data = rowdata;
- table.render(option);
+ table.render(option);
+ OperationType = 1;//璁剧疆鎿嶄綔绫诲瀷涓烘柊澧�
}
//#endregion
@@ -1053,10 +1054,10 @@
layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HManagerName").val() == 0) {
- layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HManagerName").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//瀛愯〃鏁版嵁妫�楠岀畝鍗曡〃鍗曢獙璇�
//鍚庣画鍙敤澶氫釜鏁扮粍瀛樺偍鍒楀悕鎵╁睍
for (var i = 0; i < option.data.length; i++) {
@@ -1065,7 +1066,7 @@
}
var rowData = option.data[i];
for (var col of Object.keys(rowData)) {
- if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
+ if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) {
layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�");
return;
}
@@ -1516,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1533,12 +1534,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "閫�鏂欎粨搴�": OptionData.浠撳簱鍚嶇О
- })
- }
+ , end: function () {
+ if (typeof (OptionData[0].HItemID) != undefined) {
+ obj.update({
+ "HWHID": OptionData[0].HItemID
+ , "閫�鏂欎粨搴�": OptionData[0].浠撳簱鍚嶇О
+ })
+ }
+ OptionData = "";
+ }
})
}
//閫�鏂欎粨浣�
@@ -2109,7 +2113,11 @@
$("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(obj[0].HItemID);
}
-
+ function GetGyCur(obj) {
+ $("#HCurName").val(obj.璐у竵鍚嶇О);
+ $("#HCurID").val(obj.HItemID);
+ $("#HExRate").val(obj.姹囩巼);
+ }
//鍙屽嚮杩斿洖鐗╂枡
function GetGyMaterial(data) {
OptionData = data
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index ca6f373..0c09571 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -901,7 +901,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_FastQuery();
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index d2caa83..b1becaf 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -2182,7 +2182,7 @@
$("#HSSName").val(obj[0].缁撶畻鏂瑰紡);
$("#HAddress").val(obj[0].鍦板尯);
$("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡);
- $("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
+ $("#HPSStyleID").val(obj[0].HPSStyleID == null ? 0 : obj[0].HPSStyleID);
}
//鏃堕棿鏍煎紡
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_MateOutBillLEdit.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_MateOutBillLEdit.html"
index b864254..882f030 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_MateOutBillLEdit.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_MateOutBillLEdit.html"
@@ -80,9 +80,12 @@
<div class="layui-inline">
<label class="layui-form-label">宸ヨ壓鍗曞彿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float: left; width: 150px;">
<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchProcExchBill" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -514,6 +517,45 @@
}
});
});
+ //#endregion
+
+ //#region 閫夋嫨娴佽浆鍗″脊绐�
+ form.on('submit(btnSearchProcExchBill)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '娴佽浆鍗″垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ getMainInfoByHProcExchBillNo();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ })
//#endregion
//#region 閫夋嫨鎵撴祮浜哄脊绐�
@@ -1990,10 +2032,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍏紡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍏紡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
temp = sSubStr[i].HRate + "";
if (temp == "" || temp *1 == "0") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢ㄩ噺涓虹┖鎴栦负0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_Add_Up.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_Add_Up.html"
index 7842b4a..6feba38 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_Add_Up.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_Add_Up.html"
@@ -212,82 +212,83 @@
</div>
</div>
</div>
- </div>
-
-
- <!--鍒跺崟淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <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="HMaker" id="HMaker" 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" name="HChecker" id="HChecker" 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" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
</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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <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="HMakeDate" id="HMakeDate" 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" name="HCheckDate" id="HCheckDate" 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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
</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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <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="HUpDater" id="HUpDater" 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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
</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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
</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="HCheckDate" id="HCheckDate" 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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" 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: 120px;">
- <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" 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: 120px;">
- <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
</div>
</div>
+
+
+
</div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -1010,16 +1011,16 @@
, "HDeptName": dataArray[0].閮ㄩ棬
, "HManagerID": dataArray[0].HManagerID
, "HManagerName": dataArray[0].涓荤
- , "HWHID": dataArray[0].HWHID
- , "HWHName": dataArray[0].浠撳簱
+ , "HWHID": dataArray[0].涓昏〃浠撳簱ID == null ? 0 : dataArray[0].涓昏〃浠撳簱ID
+ , "HWHName": dataArray[0].涓昏〃浠撳簱
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
- , "HSecManagerID": dataArray[0].HSecManagerID
- , "HSecManagerName": dataArray[0].楠屾敹鍛�
- , "HKeeperID": dataArray[0].HKeeperID
- , "HKeeperName": dataArray[0].淇濈鍛�
+ //, "HSecManagerID": dataArray[0].HSecManagerID
+ //, "HSecManagerName": dataArray[0].楠屾敹鍛�
+ //, "HKeeperID": dataArray[0].HKeeperID
+ //, "HKeeperName": dataArray[0].淇濈鍛�
, "HCurID": dataArray[0].HCurID
, "HCurName": dataArray[0].甯佸埆
, "HExRate": dataArray[0].姹囩巼
@@ -1046,6 +1047,7 @@
, "HSecUnitID": dataArray[i].HSecUnitID
, "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, 'HDiscountRate': dataArray[i].鎶樻墸鐜� //
, 'HRelTaxPrice': "0"
@@ -1097,14 +1099,14 @@
layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HKeeperID").val() == 0) {
- layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSecManagerID").val() == 0) {
- layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HKeeperID").val() == 0) {
+ // layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSecManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
var num = [];
@@ -1710,6 +1712,35 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ , "HMainSourceBillNo": ""
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": checkStatus.data[0].HDeptID
+ , "HDeptName": checkStatus.data[0].閮ㄩ棬
+ , "HManagerID": checkStatus.data[0].HManagerID
+ , "HManagerName": checkStatus.data[0].涓荤
+ , "HWHID": checkStatus.data[0].涓昏〃浠撳簱ID == null ? 0 : checkStatus.data[0].涓昏〃浠撳簱ID
+ , "HWHName": checkStatus.data[0].涓昏〃浠撳簱
+ , "HEmpID": checkStatus.data[0].HEmpID
+ , "HEmpName": checkStatus.data[0].涓氬姟鍛�
+ , "HSupID": checkStatus.data[0].HSupID
+ , "HSupName": checkStatus.data[0].渚涘簲鍟�
+ //, "HSecManagerID": checkStatus.data[0].HSecManagerID
+ //, "HSecManagerName": checkStatus.data[0].楠屾敹鍛�
+ //, "HKeeperID": checkStatus.data[0].HKeeperID
+ //, "HKeeperName": checkStatus.data[0].淇濈鍛�
+ , "HCurID": checkStatus.data[0].HCurID
+ , "HCurName": checkStatus.data[0].甯佸埆
+ , "HExRate": checkStatus.data[0].姹囩巼
+ /*, "HAddress": data.浜よ揣鍦扮偣*/
+ , "HRemark": checkStatus.data[0].琛ㄥご澶囨敞
+ , "HInnerBillNo": checkStatus.data[0].鍐呴儴鍗曟嵁鍙�
+ });
+
//layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
@@ -1727,8 +1758,8 @@
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,
- "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺,"HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨,"HWHID": checkStatus.data[j].HWHID,
+ "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HQtyMust": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
+ "HMoney": (checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺) * Number(checkStatus.data[j].鍗曚环), "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HWHID": checkStatus.data[j].HWHID,
"鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid
})
--
Gitblit v1.9.1