Qukatie 2 سال پیش
والد
کامیت
2a4f68891b

+ 15 - 0
src/views/statisticAnalysis/brandProfit/index.vue

@@ -14,6 +14,21 @@
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </template>
+        <template slot="purchaseAmount" slot-scope="{ row, index }">
+          <span>{{ Number(row.purchaseAmount ? row.purchaseAmount : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="price" slot-scope="{ row, index }">
+          <span>{{ Number(row.price ? row.price : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="singleGrossProfit" slot-scope="{ row, index }">
+          <span>{{ Number(row.singleGrossProfit ? row.singleGrossProfit : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="predictOceanFreight" slot-scope="{ row, index }">
+          <span>{{ Number(row.predictOceanFreight ? row.predictOceanFreight : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="netGrossProfit" slot-scope="{ row, index }">
+          <span>{{ Number(row.netGrossProfit ? row.netGrossProfit : 0).toFixed(2) }}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>

+ 18 - 12
src/views/statisticAnalysis/customerProfit/index.vue

@@ -14,6 +14,12 @@
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </template>
+        <template slot="predictOceanFreight" slot-scope="{ row, index }">
+          <span>{{ Number(row.predictOceanFreight ? row.predictOceanFreight : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="netGrossProfit" slot-scope="{ row, index }">
+          <span>{{ Number(row.netGrossProfit ? row.netGrossProfit : 0).toFixed(2) }}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -39,7 +45,7 @@ export default {
       },
       form: {},
       search: {
-        date:defaultDate5()
+        date: defaultDate5()
       },
       dataList: [],
       loading: false,
@@ -71,47 +77,47 @@ export default {
           {
             name: "quantity",
             type: "sum",
-            decimals:0
+            decimals: 0
           },
           {
             name: "grossProfit",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "amount",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "thisUsedProfit",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "grossProfit",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "predictOceanFreight",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "netGrossProfit",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "grossProfitRate",
             type: "sum",
-            decimals:2
+            decimals: 2
           },
           {
             name: "purchaseAmount",
             type: "sum",
-            decimals:2
+            decimals: 2
           }
         ],
         column: [
@@ -198,7 +204,7 @@ export default {
     this.getAllWorkDicts()
   },
   activated() {
-   this.$nextTick(() => {
+    this.$nextTick(() => {
       this.$refs.crud.refreshTable();
     });
   },
@@ -298,7 +304,7 @@ export default {
       }
       window.open(
         `/api/blade-purchase-sales/exportOrder/customerProfitExport?${this.website.tokenHeader
-        }=${getToken()}&beginTime=${params.beginTime}&endTime=${params.endTime}&brand=${params.brand? params.brand : ''}`
+        }=${getToken()}&beginTime=${params.beginTime}&endTime=${params.endTime}&brand=${params.brand ? params.brand : ''}`
       );
     }
   }

+ 6 - 0
src/views/statisticAnalysis/salesmanProfit/index.vue

@@ -14,6 +14,12 @@
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </template>
+        <template slot="predictOceanFreight" slot-scope="{ row, index }">
+          <span>{{ Number(row.predictOceanFreight ? row.predictOceanFreight : 0).toFixed(2) }}</span>
+        </template>
+        <template slot="netGrossProfit" slot-scope="{ row, index }">
+          <span>{{ Number(row.netGrossProfit ? row.netGrossProfit : 0).toFixed(2) }}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>

+ 3 - 0
src/views/statisticAnalysis/specificationsDelivery/index.vue

@@ -14,6 +14,9 @@
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </template>
+        <template slot="amount" slot-scope="{ row, index }">
+          <span>{{Number(row.amount?row.amount:0).toFixed(2)}}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>