修改税点计算

3 years ago · 53ac0db8bd
7 changed files with 262 additions and 131 deletions
--- a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
+++ b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
@ -11,7 +11,7 @@
        WindowStartupLocation="CenterScreen"
        ActiveGlowColor="{DynamicResource PrimaryColor}"
        Height="780" 
-        Title="慧眼 V1.0.0.9"
+        Title="慧眼 V1.0.1.0"
        Width="1468" Icon="/icon.ico" 
        >
    <Border Padding="0 10" Background="#EEEEEE">
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
@ -803,7 +803,7 @@ export default {
                parseFloat(ext.BuyPrice) -
                parseFloat(ext.KDPrice) -
                parseFloat(ext.PlatformPoint)-
-                parseFloat(ext.TaxPrice);
+                (ext.TaxPrice==undefined||ext.TaxPrice==null?0:parseFloat(ext.TaxPrice))
                
                ext.Profit=parseFloat(
                  ext.Profit
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
@ -708,7 +708,7 @@ export default {
                parseFloat(ext.BuyPrice) -
                parseFloat(ext.KDPrice) -
                parseFloat(ext.PlatformPoint)-
-                parseFloat(ext.TaxPrice);
+                 (ext.TaxPrice==undefined||ext.TaxPrice==null?0:parseFloat(ext.TaxPrice));
                
                ext.Profit=parseFloat(
                  ext.Profit
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js.map
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js.map