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 |   68 ++++++++++++++-------------------
 1 files changed, 29 insertions(+), 39 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 9ef0913..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"
@@ -901,7 +901,7 @@
                         var HTaxRate = obj.data.HTaxRate * 0.01;                //绋庣巼
                         /*var HDiscountRate = obj.data.HDiscountRate * 1;       //鎶樻墸鐜�*/
                         var HTaxPrice = obj.data.HTaxPrice * 1;                 //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                        HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                         /*var HRelTaxPrice = HTaxPrice * HDiscountRate;         //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
                         //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
                         var HMoney = HQty * HPrice;                             //閲戦=鏁伴噺*鍗曚环
@@ -1030,13 +1030,10 @@
                         var HQty = obj.data.HQty * 1;                           //鏁伴噺
                         HQty = Number(HQty.toFixed(HQtyDec));
                         var HTaxRate = value * 0.01;                            //绋庣巼
-                        var HTaxPrice = obj.data.HTaxPrice * 1;                 //鍚◣鍗曚环
-                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-                        var HPrice = HTaxPrice / (1 + HTaxRate);                //鍗曚环
+                        var HPrice = obj.data.HPrice * 1;                       //鍗曚环
                         HPrice = Number(HPrice.toFixed(HPriceDec));
-                        /*var HDiscountRate = obj.data.HDiscountRate * 1;       //鎶樻墸鐜�*/
-                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;         //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
-                        //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                        var HTaxPrice = HPrice * (1 + HTaxRate);                //鍚◣鍗曚环
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                         var HMoney = HQty * HPrice;                             //閲戦=鏁伴噺*鍗曚环
                         HMoney = Number(HMoney.toFixed(HMoneyDec));
                         var HTaxMoney = HMoney * HTaxRate;                      //绋庨=閲戦*绋庣巼
@@ -1110,13 +1107,11 @@
                         var HQty = obj.data.HQty * 1;                           //鏁伴噺
                         HQty = Number(HQty.toFixed(HQtyDec));
                         var HTaxRate = obj.data.HTaxRate * 0.01;                //绋庣巼
-                        var HTaxPrice = obj.data.HTaxPrice * 1;                 //鍚◣鍗曚环
+                        var HTaxPrice = value * 1;                              //鍚◣鍗曚环
                         HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                         var HPrice = HTaxPrice / (1 + HTaxRate);                //鍗曚环
                         HPrice = Number(HPrice.toFixed(HPriceDec));
-                        /*var HDiscountRate = obj.data.HDiscountRate * 1;       //鎶樻墸鐜�*/
-                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;         //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
-                        //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                        
                         var HMoney = HQty * HPrice;                             //閲戦=鏁伴噺*鍗曚环
                         HMoney = Number(HMoney.toFixed(HMoneyDec));
                         var HTaxMoney = HMoney * HTaxRate;                      //绋庨=閲戦*绋庣巼
@@ -2931,16 +2926,13 @@
                                         }
 
                                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                        var HQty = option.data[rowIndex + i].HQty * 1;                  //鏁伴噺
+                                        var HQty = option.data[rowIndex + i].HQty * 1;              //鏁伴噺
                                         HQty = Number(HQty.toFixed(HQtyDec));
-                                        var HTaxPrice = option.data[rowIndex + i].HTaxPrice*1;          //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                         var HTaxRate = value * 0.01;                                //绋庣巼
-                                        var HPrice = HTaxPrice / (1 + HTaxRate);                    //鍗曚环
+                                        var HPrice = option.data[rowIndex + i].HPrice * 1;          //鍗曚环
                                         HPrice = Number(HPrice.toFixed(HPriceDec));
-                                        
-                                        /*var HRelTaxPrice = HTaxPrice * HDiscountRate;             //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
-                                        //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                                        var HTaxPrice = HPrice * (1 + HTaxRate);                    //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                         var HMoney = HQty * HPrice;                                 //閲戦=鏁伴噺*鍗曚环
                                         HMoney = Number(HMoney.toFixed(HMoneyDec));
                                         var HTaxMoney = HMoney * HTaxRate;                          //绋庨=閲戦*绋庣巼
@@ -2991,12 +2983,10 @@
                                             var HQty = obj.data.HQty * 1;                           //鏁伴噺
                                             HQty = Number(HQty.toFixed(HQtyDec));
                                             var HTaxRate = value * 0.01;                            //绋庣巼
-                                            var HTaxPrice = obj.data.HTaxPrice * 1;                 //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                            HTaxPrice = Number(HPrice.toFixed(HPriceDec));
-                                            var HPrice = HTaxPrice / (1 + HTaxRate);                //鍗曚环
+                                            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;              //绋庨=閲戦*绋庣巼
@@ -3184,14 +3174,14 @@
 
                             for (var i = rowIndex * 1; i < option.data.length; i++) {
                                 //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                var HQty = value * 1;                           //鏁伴噺
+                                var HQty = value * 1;                                   //鏁伴噺
                                 HQty = dealDoubleToFixed(HQty, 1);
                                 var HTaxRate = option.data[i].HTaxRate * 0.01;           //绋庣巼
                                 HTaxRate = HTaxRate;
-                                var HTaxPrice = option.data[i].HTaxPrice * 1;        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
-                                var HPrice = HTaxPrice / (1 + 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;              //绋庨=閲戦*绋庣巼
@@ -3328,10 +3318,10 @@
                                 HQty = dealDoubleToFixed(HQty, 1);
                                 var HTaxRate = value * 1 * 0.01;           //绋庣巼
                                 HTaxRate = HTaxRate;
-                                var HTaxPrice = option.data[i].HTaxPrice * 1;        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
-                                var HPrice = HTaxPrice / (1 + 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;              //绋庨=閲戦*绋庣巼
@@ -3564,10 +3554,10 @@
                                 var HQty = option.data[rowIndex + i].HQty * 1;                  //鏁伴噺
                                 HQty = Number(HQty.toFixed(HQtyDec));
                                 var HTaxRate = value * 0.01;
-                                var HTaxPrice = option.data[rowIndex + i].HTaxPrice * 1;                    //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-                                var HPrice = HTaxPrice / (1 + HTaxRate);              //鍗曚环
+                                var HPrice = option.data[rowIndex + i].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;                          //绋庨=閲戦*绋庣巼
@@ -3619,10 +3609,10 @@
                                     var HQty = obj.data.HQty * 1;                           //鏁伴噺
                                     HQty = Number(HQty.toFixed(HQtyDec));
                                     var HTaxRate = value * 0.01;                            //绋庣巼
-                                    var HTaxPrice = obj.data.HTaxPrice * 1;                 //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                    HTaxPrice = Number(HPrice.toFixed(HPriceDec));
-                                    var HPrice = HTaxPrice / (1 + HTaxRate);                //鍗曚环
+                                    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;              //绋庨=閲戦*绋庣巼
@@ -3716,10 +3706,10 @@
                                 var HQty = option.data[rowIndex + i].HQty * 1;                  //鏁伴噺
                                 HQty = Number(HQty.toFixed(HQtyDec));
                                 var HTaxRate = value * 0.01;                                    //绋庣巼
-                                var HTaxPrice = option.data[rowIndex + i].HTaxPrice * 1;        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-                                var HPrice = HTaxPrice / (1 + HTaxRate);              //鍗曚环
+                                var HPrice = option.data[rowIndex + i].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;                          //绋庨=閲戦*绋庣巼

--
Gitblit v1.9.1