From 94daa18047880219aaafba8228d242d8a2a5e5ac Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 02 九月 2024 11:03:35 +0800
Subject: [PATCH] 采购模块自动计算，过滤功能测试修改
---
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 10 ++--
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 18 ++++----
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 50 ++++++++++++++++++++++--
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 3 +
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 2
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 6 +-
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 6 +-
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 4 +-
9 files changed, 71 insertions(+), 30 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index a0f96aa..a5c9f02 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -709,7 +709,7 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;'}
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true,edit:'text' }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
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 3074712..3d8259c 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"
@@ -1274,7 +1274,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -1297,8 +1297,8 @@
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1322,7 +1322,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option);
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
@@ -1346,8 +1346,8 @@
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1373,7 +1373,7 @@
obj.update({
HDiscountRate: oldText
});
-
+ table.render(option);
layer.msg("鎶樻墸鐜囪杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
return;
}
@@ -1393,8 +1393,8 @@
HQty = Number(HQty.toFixed(HQtyDec));
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index edd4913..5d55299 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -707,7 +707,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
@@ -750,7 +750,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
HTaxRate: HTaxRate * 100
@@ -790,7 +790,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
@@ -930,8 +930,8 @@
, { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width: 90, totalRow: true }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width:90 }
, { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width:90 }
- , { field: 'HTaxMoney', title: '绋庨', edit: 'text', event: 'inputHTaxMoney', width:90 }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', edit: 'text', event: 'inputHlineTotal', width:90 }
+ , { field: 'HTaxMoney', title: '绋庨', event: 'inputHTaxMoney', width:90 }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', event: 'inputHlineTotal', width:90 }
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width:125 }
, { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
, { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
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/Add_Edit_Cg_POInStockBillList.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/Add_Edit_Cg_POInStockBillList.html"
index 2906ada..056ec2e 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/Add_Edit_Cg_POInStockBillList.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/Add_Edit_Cg_POInStockBillList.html"
@@ -647,7 +647,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option)
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -676,7 +676,7 @@
});
table.render(option)
break;
- case "HTaxRate": //鏁伴噺
+ case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
if (!ref.test(temp)) {
@@ -684,7 +684,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option)
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
@@ -724,7 +724,7 @@
obj.update({
HDiscountRate: oldText
});
-
+ table.render(option)
layer.msg("鎶樻墸鐜囪杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
return;
}
@@ -757,7 +757,7 @@
});
table.render(option);
break;
- case "HTaxPrice": //鍗曚环
+ case "HTaxPrice": //鍚◣鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
// ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
@@ -795,6 +795,46 @@
});
table.render(option)
break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HMoney: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("閲戦璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HMoney / HQty)); //鍗曚环 = 閲戦/(鏁伴噺)
+ var HTaxPrice = Number(HPrice * (1 + HTaxRate)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+
+
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: Number(HQty.toFixed(HQtyDec))
+ , HPrice: Number(HPrice.toFixed(HPriceDec))
+ , HMoney: Number(HMoney.toFixed(HMoneyDec))
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec)) //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ table.render(option)
+ break;
default:
}
});
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 5eadd91..e4af931 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"
@@ -612,7 +612,7 @@
, { field: '杈呭姪鍗曚綅', title: '杈呭姪鍗曚綅', width: 100, edit: 'text', event: "HSecUnitID" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
- , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;'}
, { field: 'HBatchNo', title: '鎵瑰彿', width: 150, edit: 'text' }
@@ -804,7 +804,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -837,7 +837,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option);
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index b2c13fd..3de1a32 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -809,7 +809,7 @@
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
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 5484d63..fe1ccf9 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"
@@ -1398,6 +1398,7 @@
//浠撳簱
if (obj.event == "HWHID") { //鍒ゆ柇obj.event浜嬩欢 鐨勫瓧绗︿覆鏄惁==HWHID
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({ //鎵撳紑灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1406,7 +1407,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, btn: ["纭畾", "鍙栨秷"] //鑷畾涔夐�夋嫨鎸夐挳 鍏舵寜閽殑鍚嶇О涓� 纭畾锛屽彇娑�
, btn1: function (index, laero) { //褰撲负涓虹‘璁ゆ椂
//鎸夐挳涓� 鐨勫洖璋�
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/Add_Edit_Kf_POStockInBillList.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/Add_Edit_Kf_POStockInBillList.html"
index 4dc9552..1eacfd0 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/Add_Edit_Kf_POStockInBillList.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/Add_Edit_Kf_POStockInBillList.html"
@@ -723,7 +723,7 @@
obj.update({
HPrice: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -765,7 +765,7 @@
obj.update({
HMoney: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -775,7 +775,7 @@
var HQty = obj.data.HQty * 1; //鏁伴噺
var HMoney = value * 1;
var HPrice = (HMoney / HQty); //鍗曚环=閲戦/鏁伴噺
- var HTaxRate = value * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
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 20b7bb7..dd41307 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"
@@ -679,7 +679,7 @@
obj.update({
HMoney: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -688,7 +688,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HMoney = value * 1;
- var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+ var HPrice = Number((HMoney / HQty).toFixed(2)); //鍗曚环=閲戦/鏁伴噺
HQty = Number(HQty.toFixed(HQtyDec));
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
--
Gitblit v1.9.1