build

src/App.vue

@@ -29,6 +29,14 @@
             <li style="margin-bottom:20px">
               <department-report name="百辰荣达" companyNo="GS2302231125079621" :date="currentDate" />
             </li>
+
+            <li style="margin-bottom:20px">
+              <department-report name="普润心堂" companyNo="GS2302231124114965" :date="currentDate" />
+            </li>
+
+            <li style="margin-bottom:20px">
+              <department-report name="宏源广诚" companyNo="GS2302231323386950" :date="currentDate" />
+            </li>
           </ul>
         </div>
       </div>
@@ -45,12 +53,23 @@ export default {
           return time.getTime() > Date.now();
         }
       },
-      currentDate: ""
+      currentDate: "",
+      companyNo: ''
     };
   },
   async created() {
     // this.currentDate = this.transformTime();
     this.currentDate = '2023-03-31'
+    const { search } = window.location
+    if(search.indexOf('?') !== -1){
+      const query = {}
+      search.split('?')[1].split('&').forEach(item => {
+        const [key,value] = item.split('=')
+        query[key] = value
+      })
+
+      if(query.companyNo) this.companyNo = query.companyNo
+    }
   },
   methods: {
     transformTime() {
@@ -71,6 +90,7 @@ export default {
   padding: 0;
   margin: 0;
   box-sizing: border-box;
+  overflow-y: auto
 }
 html {
   @include layout-dev;
@@ -92,7 +112,6 @@ html {
     padding: 0;
     .app-main {
       width: 100%;
-      height: 100%;
       padding: 0;
       margin: 0;
       box-sizing: border-box;

src/components/reports/src/DepartmentReport.vue

@@ -3,10 +3,9 @@
     <h3 class="table-header">{{name}}业绩报表</h3>
 
     <div class="table-sub__header">
-      <span>月指标:</span>{{ stats.month }}
-      <span>完成额:</span> {{ stats.total_tips }}
+      <span>月指标:</span>{{ stats.total_tips }}
+      <span>完成额:</span> {{ stats.month }}
       <span>完成率:</span> {{ stats.completionRate }}
-      <span>本日销售额:</span> {{ stats.day }}
     </div>
     
     <el-table
@@ -26,39 +25,25 @@
           {{ mapReponseType[String(scope.row.type)] }}
         </template>
       </el-table-column>
-      <el-table-column label="本日金额" min-width="120" align="center">
-        <el-table-column label="销售">
-          <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="退货">
-          <template slot-scope="scope">
+      <el-table-column label="本日销售额" min-width="120" align="center">
+        <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
           </template>
-        </el-table-column>
       </el-table-column>
 
 
-      <el-table-column label="本月金额" min-width="120" align="center">
-        <el-table-column label="销售">
-          <template slot-scope="scope">
+      <el-table-column label="本月销售额" min-width="120" align="center">
+        <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.monthinfo.msale_total) }}
           </template>
-        </el-table-column>
-        <el-table-column label="退货">
-          <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.monthinfo.mth_total) }}
-          </template>
-        </el-table-column>
       </el-table-column>
-      <el-table-column label="月占比" prop="proportion" />
+      <el-table-column label="月占比" prop="proportion" align="center" />
     </el-table>
   </div>
 </template>
 
 <script>
-import { mapReponseType, addition, division, multiplication, unit2TenThousand} from "./_utils"
+import { mapReponseType, addition, division, multiplication, unit2TenThousand, subtraction} from "./_utils"
 import asyncRequest from "@/api/report";
 import setHeight from "@/mixins/index";
 
@@ -76,13 +61,19 @@ export default {
   },
   computed:{
     stats(){
-      const { day, month ,total_tips} = this.total;
-
+      const { month,monthReturn ,total_tips} = this.total;
+      /* 完成额 = 月销售额 - 月退货额 **/
+      const completion = subtraction(month, monthReturn)
+       /* 完成率 = 完成额 / 月指标 **/
+      const completionRate = multiplication(division(completion,total_tips) || 0, 100).toFixed(2)
+      
       return {
-        day: unit2TenThousand(day),
-        month: unit2TenThousand(month),
+        /* 月指标 **/
         total_tips: unit2TenThousand(total_tips),
-        completionRate:multiplication(division(month,total_tips) || 0, 100) + '%'
+        /* 完成额 **/
+        month: unit2TenThousand(completion),
+        /* 完成率 **/
+        completionRate:completionRate + '%'
       }
     }
   },
@@ -91,7 +82,8 @@ export default {
       total:{
         day:0,
         month:0,
-        total_tips: 0
+        total_tips: 0,
+        monthReturn:0
       },
       mapReponseType,
       dataTime: this.date,
@@ -136,7 +128,8 @@ export default {
         this.total = {
           total_tips: Number(total_tips),
           day: dayinfo.reduce((prev, {sale_total = "0"}) => addition(prev,sale_total),0),
-          month: monthinfo.reduce((prev, {msale_total = "0"}) => addition(prev,msale_total),0)
+          month: monthinfo.reduce((prev, {msale_total = "0"}) => addition(prev,msale_total),0),
+          monthReturn:  monthinfo.reduce((prev, {mth_total = "0"}) => addition(prev,mth_total),0),
         }
 
         this.tableData = types.map(type => {
@@ -145,12 +138,20 @@ export default {
           const currentMonthSale = Number(_monthinfo.msale_total) || 0 
           return {
             type,
-            dayinfo: _dayinfo,
-            monthinfo:_monthinfo,
-             /* 占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
+            dayinfo: {
+              ..._dayinfo,
+              /** 日销售额 = 日销售额 - 日退货额 */
+              sale_total:subtraction(_dayinfo.sale_total,_dayinfo.th_total)
+            },
+            monthinfo:{
+              ..._monthinfo,
+              /** 月销售额 = 月销售额 - 月退货额 */
+              msale_total:subtraction(_monthinfo.msale_total,_monthinfo.mth_total)
+            },
+             /* 月占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
             proportion:multiplication(
               division(currentMonthSale,this.total.month) || 0
-            ,100) + '%'
+            ,100).toFixed(2) + '%'
           }
         })
 

src/components/reports/src/WanyuReport.vue

@@ -2,13 +2,6 @@
   <div class="SalesReportRejectedNew">
     <h3 class="table-header">万宇业绩报表</h3>
 
-    <div class="table-sub__header">
-      <span>月指标:</span>{{ stats.total_tips }}
-      <span>完成额:</span> {{ stats.month }}
-      <span>完成率:</span> {{ stats.completionRate }}
-      <span>本日销售额:</span> {{ stats.day }}
-    </div>
-    
     <el-table
       :data="tableData"
       v-loading="loading"
@@ -22,33 +15,33 @@
       :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
     >
       <el-table-column label="部门" fixed="left" min-width="120" prop="depart" />
-      <el-table-column label="本日金额" min-width="120" align="center">
-        <el-table-column label="销售">
-          <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="退货">
-          <template slot-scope="scope">
+      <el-table-column label="本日销售额" min-width="120" align="center">
+        <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
           </template>
-        </el-table-column>
       </el-table-column>
 
 
       <el-table-column label="本月金额" min-width="120" align="center">
-        <el-table-column label="销售">
+        <el-table-column label="销售指标">
+          <template slot-scope="scope">
+            {{ unit2TenThousand(scope.row.total_tips) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="净销售">
           <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.monthinfo.msale_total) }}
+            {{ unit2TenThousand(scope.row.monthinfo.monthNetSales) }}
           </template>
         </el-table-column>
-        <el-table-column label="退货">
+
+        <el-table-column label="净销售完成率">
           <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.monthinfo.mth_total) }}
+            {{ scope.row.monthinfo.monthProportion }}
           </template>
         </el-table-column>
+
       </el-table-column>
-      <el-table-column label="月占比" prop="proportion" />
     </el-table>
   </div>
 </template>
@@ -56,7 +49,7 @@
 <script>
 import asyncRequest from "@/api/report";
 import setHeight from "@/mixins/index";
-import { addition, unit2TenThousand,multiplication,division } from "./_utils";
+import { addition, unit2TenThousand,multiplication,division, subtraction } from "./_utils";
 export default {
   name: "WanyuReport",
   props: ["date"],
@@ -158,15 +151,27 @@ export default {
         })
 
         this.tableData = tableData.map(({depart,total_tips,dayinfo,monthinfo}) => {
+          /* 月净销售 = 月销售 - 月退货 **/
+          const monthNetSales = subtraction(monthinfo.msale_total, monthinfo.mth_total)
+          /* 月经销售完成率 = 月净销售 / 销售指标 **/
+          const monthProportion = multiplication(division(monthNetSales,total_tips),100).toFixed(2)
+
           return {
             depart,
             total_tips,
-            dayinfo:{...dayinfo},
-            monthinfo:{...monthinfo},
+            dayinfo:{
+              ...dayinfo,
+              /** 日销售额 = 日销售额 - 日退货额 */
+              sale_total:subtraction(dayinfo.sale_total,dayinfo.th_total)
+            },
+            monthinfo:{
+              monthNetSales,
+              monthProportion: monthProportion + '%',
+            },
             /* 占比 =  (当前部门销售额 / 各部门总销售额) / 100 **/
             proportion:multiplication(
              division(monthinfo.msale_total,this.total.month) || 0
-            ,100) + '%',
+            ,100) || 0 + '%',
           }
         })
       } else {

src/components/reports/src/_utils.js

@@ -52,6 +52,24 @@ export function multiplication(arg1,arg2){
   return (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) / Math.pow(10, m);
 }
 
+/* 减法 **/
+export function subtraction(arg1, arg2) {
+  var r1, r2, m, n;
+  try {
+    r1 = arg1.toString().split(".")[1].length;
+  } catch (e) {
+    r1 = 0;
+  }
+  try {
+    r2 = arg2.toString().split(".")[1].length;
+  } catch (e) {
+    r2 = 0;
+  }
+  m = Math.pow(10, Math.max(r1, r2)); //last modify by deeka //动态控制精度长度
+  n = r1 >= r2 ? r1 : r2;
+  return ((arg1 * m - arg2 * m) / m).toFixed(n);
+}
+
 
 export function unit2TenThousand(value){
   if(value < 10000) return value

src/index.html

@@ -131,7 +131,6 @@
             var list = []
             // 下面的代码是为了获取当前月的信息
             time.setMonth(time.getMonth() + 1)
-            console.log(time.getMonth())
             time.setDate(0) // 修改日期0
             var maxDay = time.getDate() // 获取当月的天数
             for (var i = 1; i <= maxDay; i++) {
@@ -180,4 +179,4 @@
     </script>
 </body>
 
-</html>
+</html>

src/main.js

@@ -12,6 +12,8 @@ Vue.component(Table.name, Table);
 Vue.component(Select.name, Select);
 Vue.component(Option.name, Option);
 Vue.component(DatePicker.name, DatePicker);
+
+
 Vue.use(Components);
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])