From d4e2d5e93bdee0dd3538714b83745fd16dc4a07e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 20 八月 2025 16:26:33 +0800
Subject: [PATCH] PDA 条码查询页面 添加 条码出库日期 客户 销售出库单号 查询条件
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 325 +++++++++++++++++++++++++----------------------------
1 files changed, 152 insertions(+), 173 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 344d8b9..4815da7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -157,6 +157,15 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">浜у搧绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HProductType" id="HProductType" lay-filter="HProductType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="闈炴牱鍝�">闈炴牱鍝�</option>
+ <option style="color:blue;" value="鏍峰搧">鏍峰搧</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -885,23 +894,21 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = value * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //鏁板瓧绮惧害
+ var HQty = value * 1; //鏁伴噺
HQty = Number(HQty.toFixed(HQtyDec));
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
HPrice = Number(HPrice.toFixed(HPriceDec));
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = obj.data.HTaxPrice * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=鏁伴噺*鍚◣鍗曚环
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -968,24 +975,23 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = value * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ HQty = Number(HQty.toFixed(HQtyDec));
+ var HPrice = value * 1; //鍗曚环
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
//鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=鏁伴噺*鍚◣鍗曚环
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: HQty
@@ -1020,25 +1026,19 @@
return;
}
-
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //鏁板瓧绮惧害
+ var HQty = obj.data.HQty * 1; //鏁伴噺
HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环
HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=鏁伴噺*鍚◣鍗曚环
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -1104,26 +1104,21 @@
}
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
-
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
-
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=鏁伴噺*鍚◣鍗曚环
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: HQty
@@ -1519,6 +1514,7 @@
, "HProjectName": data.椤圭洰鍚嶇О
, "HWHID": data.涓讳粨搴搃d
, "HWHName": data.涓讳粨搴�
+ , "HProductType": data.浜у搧绫诲瀷
, "HCreditRating_Now": data.HCreditRating_Now
, "HRemark": data.琛ㄥご澶囨敞
, "HMaker": data.鍒跺崟浜�
@@ -1543,6 +1539,11 @@
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < result.data.length; i++) {
+ var HTaxPrice_Temp = result.data[i]["鍚◣鍗曚环"];
+ if (typeof (HTaxPrice_Temp) == "undefined") {
+ HTaxPrice_Temp = result.data[i]["HTaxPrice"];
+ }
+
rowdata.push(
{
"HMaterID": result.data[i]["HMaterID"],
@@ -1558,7 +1559,7 @@
"浠撳簱": result.data[i]["瀛愪粨搴�"],
"HQty": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
"HPrice": dealDoubleToFixed(result.data[i]["鍗曚环"], 3),
- "HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
+ "HTaxPrice": dealDoubleToFixed(HTaxPrice_Temp, 3),
"HMoney": dealDoubleToFixed(result.data[i]["閲戦"],2),
"HDiscountRate": result.data[i]["鎶樻墸鐜�"],
"HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
@@ -2925,24 +2926,21 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = option.data[rowIndex + i].HQty * 1; //鏁伴噺
- var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- //鏁板瓧绮惧害
+ var HQty = option.data[rowIndex + i].HQty * 1; //鏁伴噺
HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ //鏁板瓧绮惧害
+
option.data[rowIndex + i].HMaterID = resultData.HItemID;
option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.鐗╂枡浠ｇ爜;
option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.鐗╂枡鍚嶇О;
@@ -2983,20 +2981,19 @@
var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
-
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: HQty
@@ -3177,25 +3174,22 @@
for (var i = rowIndex * 1; i < option.data.length; i++) {
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = value * 1; //鏁伴噺
- var HPrice = option.data[i].HPrice * 1; //鍗曚环
- var HTaxRate = option.data[i].HTaxRate * 0.01; //绋庣巼
- /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ var HQty = value * 1; //鏁伴噺
HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
+ var HTaxRate = option.data[i].HTaxRate * 0.01; //绋庣巼
HTaxRate = HTaxRate;
+ var HPrice = option.data[i].HPrice * 1; //鍗曚环
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ var HTaxPrice = HPrice * (1 + HTaxRate) //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
HMoney = dealDoubleToFixed(HMoney, 2);
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
option.data[i].HQty = HQty;
option.data[i].HPrice = HPrice;
@@ -3263,24 +3257,23 @@
for (var i = rowIndex * 1; i < option.data.length; i++) {
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = option.data[i].HQty * 1; //鏁伴噺
+ HQty = dealDoubleToFixed(HQty, 1);
var HPrice = value * 1; //鍗曚环
+ HPrice = dealDoubleToFixed(HPrice, 3);
var HTaxRate = option.data[i].HTaxRate * 0.01; //绋庣巼
+ HTaxRate = HTaxRate;
/*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
//鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
HMoney = dealDoubleToFixed(HMoney, 2);
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
option.data[i].HQty = HQty;
option.data[i].HPrice = HPrice;
@@ -3321,25 +3314,22 @@
for (var i = rowIndex * 1; i < option.data.length; i++) {
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = option.data[i].HQty * 1; //鏁伴噺
- var HPrice = option.data[i].HPrice * 1; //鍗曚环
- var HTaxRate = value * 1 * 0.01; //绋庣巼
- /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ var HQty = option.data[i].HQty * 1;
HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
+ var HTaxRate = value * 1 * 0.01; //绋庣巼
HTaxRate = HTaxRate;
+ var HPrice = option.data[i].HPrice * 1; //鍗曚环
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ var HTaxPrice = HPrice * (1 + HTaxRate) //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
HMoney = dealDoubleToFixed(HMoney, 2);
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
option.data[i].HQty = HQty;
option.data[i].HPrice = HPrice;
@@ -3406,26 +3396,21 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
for (var i = rowIndex * 1; i < option.data.length; i++) {
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = option.data[i].HQty * 1; //鏁伴噺
- var HTaxRate = option.data[i].HTaxRate * 0.01; //绋庣巼
- /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = value * 1;; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
-
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ var HQty = option.data[i].HQty * 1;
HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
+ var HTaxRate = option.data[i].HTaxRate * 0.01; //绋庣巼
HTaxRate = HTaxRate;
+ var HTaxPrice = value * 1;; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
HMoney = dealDoubleToFixed(HMoney, 2);
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
option.data[i].HQty = HQty;
option.data[i].HPrice = HPrice;
@@ -3567,23 +3552,20 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = option.data[rowIndex + i].HQty * 1; //鏁伴噺
- var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- //鏁板瓧绮惧害
HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01;
+ var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ //鏁板瓧绮惧害
+
option.data[rowIndex + i].HMaterID = resultData.HItemID;
option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.鐗╂枡浠ｇ爜;
option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.鐗╂枡鍚嶇О;
@@ -3622,22 +3604,22 @@
var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
+
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate) //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
-
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: HQty
@@ -3722,23 +3704,20 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = option.data[rowIndex + i].HQty * 1; //鏁伴噺
- var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- //鏁板瓧绮惧害
HQty = Number(HQty.toFixed(HQtyDec));
+ var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = option.data[rowIndex + i].HPrice * 1; //鍗曚环
HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ var HTaxPrice = HPrice * (1 + HTaxRate) //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ var HlineTotal = HQty * HTaxPrice; //浠风◣鍚堣=閲戦+绋庨
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ //鏁板瓧绮惧害
+
option.data[rowIndex + i].HMaterID = resultData.HItemID;
option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.鐗╂枡浠ｇ爜;
option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.鐗╂枡鍚嶇О;
--
Gitblit v1.9.1