build

src/components/reports/src/CompanyGrossMargin.vue

@@ -2,9 +2,9 @@
   <div class="SalesReportRejectedNew">
     <div class="table-header">{{index}}.{{companyName || '--'}}</div>
     <el-table
+      border
       :data="tableData"
       v-loading="loading"
-      border
       :size="'mini'"
       style="width: 100%"
       :row-style="({row}) => row.field === '合计' ? {background:'#f5f7fa'} : {}"
@@ -46,11 +46,11 @@ import setHeight from "@/mixins/index";
 import { 
   unit2TenThousand,
   getCompanyLabel,
+  createTotalItem,
   multiplication,
   subtraction,
   division,
   addition,
-  createTotalItem
 } from "./_utils";
 
 export default {

src/components/reports/src/GrossMargin.vue

@@ -20,12 +20,12 @@
       <el-table-column label="本日毛利率" prop="pure_day_interest_rate">
        <template slot-scope="scope">{{Number(scope.row.pure_day_interest_rate || 0).toFixed(2) + '%'}}</template>
       </el-table-column>
-      <el-table-column label="本月销售净额" prop="pure_month_sale">
-        <template slot-scope="scope">{{unit2TenThousand(scope.row.pure_month_sale)}}</template>
-      </el-table-column>
       <el-table-column label="本月销售指标" prop="total_tips">
         <template slot-scope="scope">{{ unit2TenThousand(scope.row.total_tips) }}</template>
       </el-table-column>
+      <el-table-column label="本月销售净额" prop="pure_month_sale">
+        <template slot-scope="scope">{{unit2TenThousand(scope.row.pure_month_sale)}}</template>
+      </el-table-column>
       <el-table-column label="本月指标达成率" width="105px" prop="depart">
         <template slot-scope="scope">{{Number(scope.row.month_completion_rate).toFixed(2) + '%'}}</template>
       </el-table-column>
@@ -165,7 +165,7 @@ export default {
 
           const totalItem = createTotalItem(tableData)
           totalItem.depart = "合计"
-          totalItem.month_completion_rate = multiplication(division(totalItem.pure_day_sale,totalItem.total_tips),100)
+          totalItem.month_completion_rate = multiplication(division(totalItem.pure_month_sale,totalItem.total_tips),100)
           totalItem.pure_month_interest_rate = multiplication(division(totalItem.pure_month_profit,totalItem.pure_month_sale),100)
           totalItem.pure_day_interest_rate = multiplication(division(totalItem.pure_day_profit,totalItem.pure_day_sale),100)
           this.tableData = [...tableData,totalItem]  

src/components/reports/src/MonthGrossMargin.vue

@@ -6,6 +6,8 @@
       border
       :size="'mini'"
       style="width: 100%"
+
+
     >
       <el-table-column label="月份" prop="depart">
         <template slot-scope="scope">{{scope.row.month}}</template>
@@ -35,10 +37,10 @@ import setHeight from "@/mixins/index";
 import { 
   unit2TenThousand,
   getCompanyLabel,
+  createTotalItem,
   multiplication,
   subtraction,
-  division,
-  createTotalItem
+  division
 } from "./_utils";
 
 export default {

src/pages/report.vue

@@ -37,11 +37,11 @@ export default {
       const openid = getOpenid()
       const code = getParameterByName('code')
 
-      const result = await asyncRequest.userinfo({
-        code
-      })
+      // const result = await asyncRequest.userinfo({
+      //   code
+      // })
 
-      // const result = {"code":0,"message":"获取成功","data":{"id":"1","openid":"oOpc26KiZFBKIm7SB8knFGvov1qg","mobile":"","gender":"0","nickname":"雪寒","avatar":"","subscribe_time":"2022-12-21 15:52:14","addr":"\/\/","status":"1","is_show":"1","companyArr":[{"companyNo":"GS2302231125079621","companyName":"北京百辰荣达国际科贸有限公司"},{"companyNo":"GS2302231323386950","companyName":"北京泓源广诚国际商贸有限公司"},{"companyNo":"GS2304031312553746","companyName":"北京锦兴弘昌科技有限公司"},{"companyNo":"GS2302231124114965","companyName":"北京普润心堂商贸有限公司"},{"companyNo":"GS2203161855277894","companyName":"北京万宇恒通国际科贸有限公司"}],"addtime":"2023-04-10 18:11:07","updatetime":"2023-04-19 17:19:07"}}
+      const result = {"code":0,"message":"获取成功","data":{"id":"1","openid":"oOpc26KiZFBKIm7SB8knFGvov1qg","mobile":"","gender":"0","nickname":"雪寒","avatar":"","subscribe_time":"2022-12-21 15:52:14","addr":"\/\/","status":"1","is_show":"1","companyArr":[{"companyNo":"GS2302231125079621","companyName":"北京百辰荣达国际科贸有限公司"},{"companyNo":"GS2302231323386950","companyName":"北京泓源广诚国际商贸有限公司"},{"companyNo":"GS2304031312553746","companyName":"北京锦兴弘昌科技有限公司"},{"companyNo":"GS2302231124114965","companyName":"北京普润心堂商贸有限公司"},{"companyNo":"GS2203161855277894","companyName":"北京万宇恒通国际科贸有限公司"}],"addtime":"2023-04-10 18:11:07","updatetime":"2023-04-19 17:19:07"}}
       
       this.state.loading = false
       switch(Number(result.code)){