build

src/components/newResults/company-month.vue

@@ -6,7 +6,7 @@
       </div>
 
       <div style="float:right">
-        <el-select size="small" style="margin-right:10px;width:105px" v-model="companyNo" @change="requestData"
+        <el-select size="small" style="margin-right:10px;width:160px" v-model="companyNo" @change="requestData"
           :disabled="isEmpty">
           <el-option v-for="depart in cp_companies" :key="depart.id" :value="depart.value" :label="depart.label" />
         </el-select>
@@ -19,7 +19,7 @@
     </div>
 
     <el-row style="margin-top:10px;margin-top:10px" v-if="!isEmpty">
-      <el-table border size="mini" :data="tableData" :header-cell-class-name="setHeaderClassName"
+      <el-table border size="mini" :data="tableData" :header-cell-class-name="setHeaderClassName" :row-class-name="setRowClassName"
         :cell-class-name="setCellClassName">
         <el-table-column fixed="left" label="月度" prop="month" align="center" width="45px" />
         <el-table-column label="营收目标" align="center" min-width="115px">
@@ -41,13 +41,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="毛利完成%" align="center" min-width="95px">
-          <template slot-scope="scope">
-            <div :style="getCurrentRateStyle(scope.row.cost_rate, scope.row.month)">
-              {{ Number(scope.row.cost_rate).toFixed(2) + "%" }}
-            </div>
-          </template>
-        </el-table-column>
 
         <template v-if="costField">
           <el-table-column label="毛利目标" align="center" min-width="115px">
@@ -62,6 +55,13 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="毛利完成%" align="center" min-width="95px">
+            <template slot-scope="scope">
+              <div :style="getCurrentRateStyle(scope.row.cost_rate, scope.row.month)">
+                {{ Number(scope.row.cost_rate).toFixed(2) + "%" }}
+              </div>
+            </template>
+          </el-table-column>
         </template>
       </el-table>
     </el-row>
@@ -103,7 +103,21 @@ export default {
 
     this.isEmpty = this.cp_companies.length === 0;
     if (this.isEmpty) return;
-    this.cp_companies = this.cp_companies.map(item => ({ ...item, label: mapCompany[item.label] || item.label }))
+
+    this.cp_companies = this.cp_companies.map(item => {
+      let label = '';
+
+      if (item.label === '所有公司') label = '所有公司'
+      if (item.label === '北京万宇恒通国际科贸有限公司') label = '平台公司: 万宇'
+      if (item.label === "普润&锦兴&知事") label = `业务公司: 普润&锦兴&知事`
+      if (label === '') label = `业务公司: ${mapCompany[item.label]}`;
+
+
+      return ({
+        ...item,
+        label
+      })
+    })
 
     this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();
@@ -111,11 +125,14 @@ export default {
   },
   methods: {
     unit2TenThousand,
+    setRowClassName({row}){
+      if(row.month === '合计') return 'table-header-color'
+    },
     getCurrentRateStyle(current, month) {
       const days = dayjs().daysInMonth();
       const currentMonth = dayjs().month() + 1;
       if (Number(month) > Number(currentMonth)) return;
-      if(month === '合计') return;
+      if (month === '合计') return;
       const oneDay = Number(division(100, days)).toFixed(2);
       const currentDay = dayjs().date();
       const currentTotalTip = Number(multiplication(currentDay, oneDay)).toFixed(2);
@@ -125,14 +142,15 @@ export default {
       const days = dayjs().daysInMonth();
       const currentMonth = dayjs().month() + 1;
       if (Number(month) > Number(currentMonth)) return;
-      if(month === '合计') return;
+      if (month === '合计') return;
       const oneDay = Number(division(total, days)).toFixed(2);
       // console.log(month,oneDay)
       const currentDay = dayjs().date();
       const currentTotalTip = Number(multiplication(currentDay, oneDay)).toFixed(2);
       return Number(currentTotalTip) > Number(current) ? 'color: red' : '';
     },
-    setCellClassName({ column }) {
+    setCellClassName({ column,row }) {
+      if(row.month === '合计') return;
       const { label } = column;
       // if (label === "营业收入(净)" || label === '当月成本合计') return "pure__cell";
       if (label === "营收目标") return "bg__success"
@@ -226,18 +244,18 @@ export default {
 
           const totalItem = this.tableData.reduce((prev, curr) => {
             return {
-              pure_sale:addition(prev.pure_sale,curr.pure_sale),
-              pure_purch: addition(prev.pure_purch,curr.pure_purch),
-              pure_profit: addition(prev.pure_profit,curr.pure_profit),
-              completion_rate: addition(prev.completion_rate,curr.completion_rate),
-              pure_interest_rate: addition(prev.pure_interest_rate,curr.pure_interest_rate),
+              pure_sale: addition(prev.pure_sale, curr.pure_sale),
+              pure_purch: addition(prev.pure_purch, curr.pure_purch),
+              pure_profit: addition(prev.pure_profit, curr.pure_profit),
+              completion_rate: addition(prev.completion_rate, curr.completion_rate),
+              pure_interest_rate: addition(prev.pure_interest_rate, curr.pure_interest_rate),
               month: '合计',
-              cost_tips: addition(prev.cost_tips,curr.cost_tips),
-              total_tips: addition(prev.total_tips,curr.total_tips),
-              cost_rate: addition(prev.cost_rate,curr.cost_rate)
+              cost_tips: addition(prev.cost_tips, curr.cost_tips),
+              total_tips: addition(prev.total_tips, curr.total_tips),
+              cost_rate: addition(prev.cost_rate, curr.cost_rate)
             }
           }, {
-            pure_sale:0,
+            pure_sale: 0,
             pure_purch: 0,
             pure_profit: 0,
             completion_rate: 0,
@@ -248,9 +266,9 @@ export default {
             cost_rate: 0
           })
 
-          totalItem.completion_rate =  multiplication(division(totalItem.pure_sale, totalItem.total_tips) || 0, 100)
-          totalItem.cost_rate =  Number(totalItem.cost_tips) === 0 ? 0 : multiplication(division(totalItem.pure_profit, totalItem.cost_tips) || 0, 100).toFixed(2)
-          this.tableData = [...this.tableData,totalItem];
+          totalItem.completion_rate = multiplication(division(totalItem.pure_sale, totalItem.total_tips) || 0, 100)
+          totalItem.cost_rate = Number(totalItem.cost_tips) === 0 ? 0 : multiplication(division(totalItem.pure_profit, totalItem.cost_tips) || 0, 100).toFixed(2)
+          this.tableData = [...this.tableData, totalItem];
 
           console.log(this.tableData);
 

src/components/newResults/company.vue

@@ -6,7 +6,7 @@
       </div>
 
       <div style="float:right">
-        <el-select size="small" style="margin-right:10px;width:100px" v-model="companyNo" @change="requestData"
+        <el-select size="small" style="margin-right:10px;width:140px" v-model="companyNo" @change="requestData"
           :disabled="isEmpty">
           <el-option v-for="company in cp_companies" :key="company.value" :value="company.value" :label="company.label" />
         </el-select>
@@ -21,21 +21,24 @@
     <el-row style="margin-top:10px;margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :header-cell-class-name="setHeaderClassName"
         :cell-class-name="setCellClassName">
-        <el-table-column fixed="left" label="公司" prop="companyName" align="center" width="45px">
+        <el-table-column fixed="left" label="公司" prop="companyName" align="center" width="65px">
           <template slot-scope="scope">
             <div v-if="scope.row.companyName.indexOf('普润') === -1">
               {{ mapCompany[scope.row.companyName] || scope.row.companyName }}
             </div>
 
             <div v-else>
-              <p style="margin:0px">普润</p>
-              <p style="margin:0px">锦兴</p>
-              <p style="margin:0px">知事</p>
+              <el-popover placement="top" width="200" trigger="hover" content="普润&锦兴&知事">
+                <template #reference>
+                  <i class="el-icon-warning-outline" style="font-size:14px;cursor:pointer"></i>
+                   普润
+                </template>
+              </el-popover>
             </div>
           </template>
         </el-table-column>
         <el-table-column label="当日" align="center" width="115px">
-          <el-table-column label="营业收入" align="center" width="115px">
+          <el-table-column label="营业收入" align="center" width="95px">
             <template slot-scope="scope">
               {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
             </template>
@@ -62,7 +65,7 @@
                   <template #reference>
                     <div :style="`${getCurrentValueStyle(scope.row.msale_total, scope.row.total_tips)}`">
                       <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                       {{ unit2TenThousand(scope.row.msale_total, isTenThound) }}
+                      {{ unit2TenThousand(scope.row.msale_total, isTenThound) }}
                     </div>
                   </template>
                 </el-popover>
@@ -172,7 +175,16 @@ export default {
     this.isEmpty = this.cp_companies.length === 0;
     if (this.isEmpty) return;
 
-    this.cp_companies = this.cp_companies.map(item => ({ ...item, label: mapCompany[item.label] || item.label }))
+    console.log(this.cp_companies, '---');
+
+    this.cp_companies = this.cp_companies.map(item => {
+      let label = '';
+      if (item.label === '所有公司') label = '所有公司'
+      if (item.label === '北京万宇恒通国际科贸有限公司') label = '平台公司: 万宇'
+      if (item.label === "普润&锦兴&知事") label = `业务公司: 普润&锦兴&知事`
+      if (label === '') label = `业务公司: ${mapCompany[item.label]}`;
+      return ({ ...item, label })
+    })
 
     this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();

src/styles/index.scss

@@ -41,6 +41,9 @@
   background-color: #fdf6ec !important;
 }
 
+.table-header-color{
+  background-color: #F5F7FA !important;
+}
 
 .no-padding{
   .el-input__inner {