From cb2fc709d4e2aec6bbea3e6f4e8ccc24f3d27756 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 06 十月 2024 17:27:08 +0800
Subject: [PATCH] 工艺路线工价

---
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html |   61 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 30 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 927fd4b..31270ae 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -536,9 +536,9 @@
                 }
                 //#endregion
 
-                //if (AllowLoadData(data)) {
+                if (AllowLoadData(data)) {
                     set_SaveBill(data);
-                //}
+                }
             });
             //#endregion
             //#endregion
@@ -664,8 +664,8 @@
                                                     , "HQty": dealDoubleToFixed(HQty, 1)
                                                     , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
                                                     , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
+                                                    , 'HDiscountRate': "1"                                                     //
+                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                                     , "HTaxRate": dataArray[i].绋庣巼
                                                     , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
                                                     , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -716,8 +716,8 @@
                                                     , "HQty": dealDoubleToFixed(HQty, 1)
                                                     , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                                     , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
+                                                    , 'HDiscountRate': "1"                                                     //
+                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                                     , "HTaxRate": dataArray[i].绋庣巼
                                                     , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
                                                     , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -808,8 +808,8 @@
                                                     , "HQty": dealDoubleToFixed(HQty, 1)
                                                     , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
                                                     , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
+                                                    , 'HDiscountRate': "1"                                                     //
+                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                                     , "HTaxRate": dataArray[i].绋庣巼
                                                     , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
                                                     , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -853,8 +853,8 @@
                                                     , "HQty": dealDoubleToFixed(HQty, 1)
                                                     , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                                     , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
+                                                    , 'HDiscountRate': "1"                                                     //
+                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                                     , "HTaxRate": dataArray[i].绋庣巼
                                                     , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
                                                     , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
@@ -946,7 +946,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -1689,7 +1689,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -2008,8 +2008,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -2089,8 +2089,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
@@ -2315,13 +2315,14 @@
                         return false;
                     }
 
-                    //浠风◣鍚堣鏍煎紡鏍¢獙
+                    //绋庨鏍煎紡鏍¢獙
                     temp = option.data[i]["HTaxMoney"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else 
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
                         return false;
                     }
 
@@ -2974,8 +2975,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
@@ -3017,8 +3018,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -3142,8 +3143,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -3186,8 +3187,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)

--
Gitblit v1.9.1