From 0d7a154899ff6f48f4f7c5ec0d92bb60d691b491 Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Sun, 12 Jun 2022 20:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8E=E5=8A=A1=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vuepage/client/src/views/items/Index.vue         |  9 ++++++++-
 .../vuepage/client/src/views/pricetask/Index.vue     | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
index 4967e0f..960081c 100644
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
@@ -291,6 +291,7 @@
             :key="index"
           >
             <a-input v-if="item.isEdit" v-model="ext.TaxPrice"></a-input>
+            <span v-else-if="ext.TaxPrice==undefined">-</span>
             <span v-else class="spanValue">{{ ext.TaxPrice }}</span>
           </div>
         </a-col>
@@ -765,6 +766,11 @@ export default {
           res.Data.forEach((item) => {
             item.isEdit = false;
             item.Extensions.forEach((ext) => {
+              var keys= Object.keys(ext)
+              keys.forEach(key=>{
+              if(ext[key]==null)
+                ext[key]=undefined
+              })
               this.initProfits(item,ext)
             });
           });
@@ -779,7 +785,8 @@ export default {
                 ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
               }
               
-             if(ext.BuyPrice!=undefined)
+
+             if(ext.BuyPrice>0)
                {
                   if(ext.TaxPrice==undefined||ext.TaxPrice==''){
                     ext.TaxPrice = parseFloat(ext.BuyPrice * 0.03).toFixed(2);
diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
index c7e31c5..0c67f49 100644
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue
@@ -273,6 +273,7 @@
             :key="index"
           >
             <a-input v-if="item.isEdit" v-model="ext.TaxPrice"></a-input>
+            <span v-else-if="ext.TaxPrice==undefined">-</span>
             <span v-else class="spanValue">{{ ext.TaxPrice }}</span>
           </div>
         </a-col>
@@ -574,6 +575,8 @@
 
 
 <script>
+import { json } from 'body-parser';
+
 export default {
   data() {
     return {
@@ -687,7 +690,7 @@ export default {
                 ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
               }
               
-              if(ext.BuyPrice!=undefined)
+              if(ext.BuyPrice>0)
                {
                   if(ext.TaxPrice==undefined||ext.TaxPrice==''){
                     ext.TaxPrice = parseFloat(ext.BuyPrice * 0.03).toFixed(2);
@@ -770,7 +773,12 @@ export default {
           res.Data.forEach((item) => {
             item.isEdit = false;
             item.Extensions.forEach((ext) => {
-                this.initProfits(item,ext)
+              var keys= Object.keys(ext)
+              keys.forEach(key=>{
+              if(ext[key]==null)
+                ext[key]=undefined
+              })
+              this.initProfits(item,ext)
             });
           });
           this.datas = res.Data;