|  | @@ -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 : ''}`
 | 
	
		
			
				|  |  |        );
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 |