From 6a3d112a2b2c66d603d6ea1a8d2a35754a69a7d5 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 05 九月 2025 09:27:16 +0800
Subject: [PATCH] 其他入库单:增加字段 件数

---
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html |   76 ++++++++++++++++++-------------------
 1 files changed, 37 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..833a013 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"
@@ -56,6 +56,7 @@
                 <form class="layui-form" lay-filter="component-form-group" action="">
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">鍙嶅鏍�</button>
@@ -723,6 +724,13 @@
             });
             //#endregion
 
+            //#region 鏂板
+            form.on('submit(set_AddNew)', function (data) {
+                const url = new URL(location.href);
+                location.href = url.origin + url.pathname;
+            });
+            //#endregion
+
             //#region 瀹℃牳鎸夐挳
             form.on('submit(set_CheckBill)', function (data) {
                 set_CheckBill(0);
@@ -901,7 +909,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 +1038,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 +1115,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 +2934,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 +2991,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 +3182,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 +3326,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 +3562,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 +3617,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 +3714,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