build

src/api/index.js

@@ -4,5 +4,5 @@ import { baseApi, cxApi } from "@/config";
 const api = "admin/";
 export default {
   // 获取微信授权信息...
-  signature: (data, params) => http(baseApi + api + "signature", data, "post", params),
+  signature: (data, params) => http(baseApi + api + "wechat_getconfig", data, "post", params),
 };

src/components/reports/src/DepartmentReport.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="SalesReportRejectedNew">
-    <h3 class="table-header">{{companyName || '--'}}业绩报表</h3>
+    <div class="table-header">{{companyName || '--'}}业绩报表</div>
 
-    <div class="table-sub__header">
-      <span>月指标:</span>{{ stats.total_tips }}
-      <span>完成额:</span> {{ stats.month }}
-      <span>完成率:</span> {{ stats.completionRate }}
-    </div>
+    <el-table class="table-sub__header" :data="[stats]" size="mini" border style="margin-top:10px;margin-bottom:-1px">
+      <!-- <span>月指标:</span>{{ stats.total_tips }} -->
+      <el-table-column align="center" prop="total_tips" label="月指标" />
+      <el-table-column align="center" prop="month" label="完成额" />
+      <el-table-column align="center"  prop="completionRate" label="完成率" />
+    </el-table>
     
     <el-table
       :data="tableData"
@@ -20,22 +21,22 @@
       :row-class-name="tableRowClassName"
       :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="type" label="业绩类型" fixed="left" min-width="120">
+      <el-table-column prop="type" label="业绩类型"  width="70">
         <template slot-scope="scope">
           {{ getTypeLabel(scope.row.type) }}
         </template>
       </el-table-column>
-      <el-table-column label="本日销售额" min-width="120" align="center">
+      <el-table-column label="本日销售额" max-width="120" align="center">
         <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
           </template>
       </el-table-column>
-      <el-table-column label="本月销售额" min-width="120" align="center">
+      <el-table-column label="本月销售额" max-width="120" align="center">
         <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.monthinfo.msale_total) }}
           </template>
       </el-table-column>
-      <el-table-column label="月占比" prop="proportion" align="center" />
+      <el-table-column label="月占比(%)" prop="proportion" align="center" />
     </el-table>
   </div>
 </template>
@@ -70,7 +71,7 @@ export default {
         /* 月指标 **/
         total_tips: unit2TenThousand(total_tips),
         /* 完成率 **/
-        completionRate: completionRate ? completionRate.toFixed(2) + '%' : completionRate + '%'
+        completionRate: completionRate ? completionRate.toFixed(2) + '%'  : completionRate + '%'
       }
     }
   },
@@ -151,7 +152,7 @@ export default {
              /* 月占比 = (当前业绩类型月销售额 / 总月销售额) / 100 **/
             proportion:multiplication(
               division(currentMonthSale,this.total.month) || 0
-            ,100).toFixed(2) + '%'
+            ,100).toFixed(2)
           }
         })
 
@@ -167,11 +168,10 @@ export default {
 
 <style lang="scss" scoped>
 .table-header {
-  line-height: 22px;
+  font-size: 14px;
   font-weight: bold;
   border-bottom: none;
 }
-
 .table-sub__header {
 
   span{

src/components/reports/src/WanyuReport.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="SalesReportRejectedNew">
-    <h3 class="table-header">北京万宇恒通国际科贸有限公司业绩报表</h3>
+    <div class="table-header">北京万宇恒通国际科贸有限公司业绩报表</div>
     <el-table
       :data="tableData"
       v-loading="loading"
@@ -13,10 +13,10 @@
       :row-class-name="tableRowClassName"
       :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="部门" fixed="left" min-width="120" prop="depart">
+      <el-table-column label="部门" fixed="left" width="70" prop="depart">
         <template slot-scope="scope">{{getCompanyLabel(scope.row.depart)}}</template>
       </el-table-column>
-      <el-table-column label="本日销售额" min-width="120" align="center">
+      <el-table-column label="本日销售额" width="100" align="center">
          <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.dayinfo.sale_total) }}
          </template>
@@ -32,7 +32,7 @@
             {{ unit2TenThousand(scope.row.monthinfo.monthNetSales) }}
           </template>
         </el-table-column>
-        <el-table-column label="净销售完成率" align="center">
+        <el-table-column label="净销售完成率(%)" align="center">
           <template slot-scope="scope">
             {{ scope.row.monthinfo.monthProportion }}
           </template>
@@ -170,7 +170,7 @@ export default {
             },
             monthinfo:{
               monthNetSales,
-              monthProportion: monthProportion + '%',
+              monthProportion: monthProportion
             },
             /* 占比 =  (当前部门销售额 / 各部门总销售额) / 100 **/
             proportion:multiplication(
@@ -193,7 +193,7 @@ export default {
 }
 
 .table-header {
-  line-height: 22px;
+  font-size: 14px;
   font-weight: bold;
   border-bottom: none;
 }

src/components/reports/src/_utils.js

@@ -82,7 +82,7 @@ export function subtraction(arg1, arg2) {
 
 
 export function unit2TenThousand(value){
-  if(value === NaN || value === "NaN" || value === 0 || value === "0") return '0'
-  if(value < 10000) return value
+  if(value === NaN || value === "NaN" || Number(value) === 0) return '0'
+  // if(value < 10000) return value
   return division(value,10000).toFixed(2) + 'W'
 }

src/pages/report.vue

@@ -24,23 +24,30 @@
             </el-date-picker>
           </div>
 
-          <ul class="myul">
-            <li style="margin-bottom:20px">
+          <h3>平台业绩报表</h3>
+          <el-row class="myul">
+            <el-col style="margin-bottom:20px">
               <wanyu-report :date="date" />
-            </li>
-            <li style="margin-bottom:20px">
+            </el-col>
+          </el-row>
+
+
+          <!-- 24 -->
+          <h3>公司业绩报表</h3> 
+          <el-row :gutter="10">
+            <el-col style="margin-bottom:20px" :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
               <department-report companyNo="GS2302231125079621" :date="date" />
-            </li>
-            <li style="margin-bottom:20px">
+            </el-col>
+            <el-col style="margin-bottom:20px" :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
               <department-report companyNo="GS2302231124114965" :date="date" />
-            </li>
-            <li style="margin-bottom:20px">
+            </el-col>
+            <el-col style="margin-bottom:20px" :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
               <department-report companyNo="GS2302231323386950" :date="date" />
-            </li>
-            <li style="margin-bottom:20px">
+            </el-col>
+            <el-col style="margin-bottom:20px" :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
               <department-report companyNo="GS2203161855277894" :date="date" />
-            </li>
-          </ul>
+            </el-col>
+          </el-row>
         </div>
       </div>
     </div>
@@ -81,7 +88,7 @@ export default {
     async initWechatSdk(){
       try{
         const code = getParameterByName('code')
-        const result = await asyncRequest.signature({code})
+        const result = await asyncRequest({code})
 
         switch(Number(result.code)){
           case 0:
@@ -104,21 +111,23 @@ export default {
                 },
                 fail:function(){
                   //..处理获取用户失败情况
-                  this.$router.push('/')
+                  //this.$router.push('/lo')
+                  alert('get userinfo fail')
                 }
               })
             })
 
             wx.error(function () {
-              this.$router.push('/login')
+              alert('wx error')
+              // this.$router.push('/login')
             })
             break
           default:
-            this.$router.push('/login')
+            // this.$router.push('/login')
             break
         }
       }catch(error){
-        this.$router.push('/login')
+        // this.$router.push('/login')
       }
     },
   }

src/router/index.js

@@ -9,12 +9,12 @@ const routes = [
 
 const router = new VueRouter({routes ,mode:'hash'})
 
-router.beforeEach((to, _, next) => {
-  if (to.path !== '/login' && !getParameterByName('code')) {
-    next('/login')
-  } else {
-    next()
-  }
-})
+// router.beforeEach((to, _, next) => {
+//   if (to.path !== '/login' && !getParameterByName('code')) {
+//     next('/login')
+//   } else {
+//     next()
+//   }
+// })
 
 export default router