修改利润计算

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js

@@ -11,7 +11,7 @@ let $httpVue = null, currentToken = '';
 if (process.env.NODE_ENV == 'development') {
   axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
   currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA'
-  currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk'
+ // currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk'
 }
 else if (process.env.NODE_ENV == 'production') {
   axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue

@@ -421,7 +421,7 @@
                       >精选
                     </a-button>
 
-                    <a-button
+                    <a-button v-if="item.PriceTaskUserId"
                       style="margin-left: 10px"
                       type="primary"
                       @click="setState(item.Id, item.State == 7 ? 6 : 7)"
@@ -670,7 +670,15 @@ export default {
           res.Data.forEach((item) => {
             item.isEdit = false;
             item.Extensions.forEach((ext) => {
-              ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
+              this.initProfits(item,ext)
+            });
+          });
+          this.datas = res.Data;
+        });
+    },
+    //获取利润率
+    initProfits(item,ext){
+            ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
               ext.Profit =
                 item.RivalPrice -
                 ext.BuyPrice -
@@ -685,13 +693,9 @@ export default {
                 ext.Profits = 0;
               } else {
                 ext.Profits = parseFloat(
-                  (ext.Profit / ext.BuyPrice) * 100
+                  (ext.Profit / (ext.BuyPrice+ext.KDPrice)) * 100
                 ).toFixed(2);
               }
-            });
-          });
-          this.datas = res.Data;
-        });
     },
     editData(data) {
       data.isEdit = true;
@@ -703,19 +707,7 @@ export default {
     },
     setData(data) {
       data.Extensions.forEach((ext) => {
-        ext.PlatformPoint = parseFloat(data.RivalPrice * 0.05).toFixed(2);
-        ext.Profit =
-          data.RivalPrice - ext.BuyPrice - ext.KDPrice - ext.PlatformPoint;
-        ext.Profit=parseFloat(
-                  ext.Profit
-                ).toFixed(2);
-        if (ext.BuyPrice == 0) {
-          ext.Profits = 0;
-        } else {
-          ext.Profits = parseFloat((ext.Profit / ext.BuyPrice) * 100).toFixed(
-            2
-          );
-        }
+          this.initProfits(data,ext)
       });
       this.http.post("/HuiYan/teamitems/SetItem", data).then((res) => {
         if (res.Success) {

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue

@@ -572,6 +572,27 @@ export default {
       this.pagination.current = page;
       this.getDatas(this.currentTab);
     },
+    //获取利润率
+    initProfits(item,ext){
+            ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
+              ext.Profit =
+                item.RivalPrice -
+                ext.BuyPrice -
+                ext.KDPrice -
+                ext.PlatformPoint;
+                
+                ext.Profit=parseFloat(
+                  ext.Profit
+                ).toFixed(2);
+
+              if (ext.BuyPrice == 0) {
+                ext.Profits = 0;
+              } else {
+                ext.Profits = parseFloat(
+                  (ext.Profit / (ext.BuyPrice+ext.KDPrice)) * 100
+                ).toFixed(2);
+              }
+    },
     openItemInfoWeb(item) {
       if (
         item == undefined ||
@@ -618,19 +639,7 @@ export default {
           res.Data.forEach((item) => {
             item.isEdit = false;
             item.Extensions.forEach((ext) => {
-              ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
-              ext.Profit =
-                item.RivalPrice -
-                ext.BuyPrice -
-                ext.KDPrice -
-                ext.PlatformPoint;
-              if (ext.BuyPrice == 0) {
-                ext.Profits = 0;
-              } else {
-                ext.Profits = parseFloat(
-                  (ext.Profit / ext.BuyPrice) * 100
-                ).toFixed(2);
-              }
+                this.initProfits(item,ext)
             });
           });
           this.datas = res.Data;
@@ -648,25 +657,15 @@ export default {
     setData(data) {
       var isError = false;
       data.Extensions.forEach((ext) => {
-        ext.PlatformPoint = parseFloat(data.RivalPrice * 0.05).toFixed(2);
-        ext.Profit =
-          data.RivalPrice - ext.BuyPrice - ext.KDPrice - ext.PlatformPoint;
-
-        if (ext.BuyUrl == undefined || ext.BuyUrl == "") {
-          isError = true;
-        }
-
-        if (ext.BuyPrice == 0) {
-          ext.Profits = 0;
-        } else {
-          ext.Profits = parseFloat((ext.Profit / ext.BuyPrice) * 100).toFixed(
-            2
-          );
+        if(ext.BuyUrl==undefined||ext.BuyUrl==''||ext.BuyUrl==null||ext.BuyUrl.length<=0)
+        {
+          isError=true
         }
+        this.initProfits(data,ext)
       });
 
       if (isError) {
-        this.$message.error("请输入5个供应商来源信息！");
+        this.$message.error("请输入5个完整的供应商来源信息！");
         return;
       }