build

src/components/newResults/company-month.vue

@@ -64,6 +64,7 @@
           </el-table-column>
         </template>
       </el-table>
+      <div style="height:100px"></div>
     </el-row>
 
     <template v-else>

src/components/newResults/company.vue

@@ -31,21 +31,18 @@
               <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="95px">
-            <template slot-scope="scope">
-              {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
-            </template>
-          </el-table-column>
+        <el-table-column label="当日营业收入" align="center" width="95px">
+          <template slot-scope="scope">
+            {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
+          </template>
         </el-table-column>
 
-        <el-table-column label="当月" align="center">
           <el-table-column label="营收目标" align="center" min-width="95px">
             <template slot-scope="scope">
               {{ unit2TenThousand(scope.row.total_tips, isTenThound) }}
@@ -132,7 +129,6 @@
               </template>
             </el-table-column>
           </template>
-        </el-table-column>
       </el-table>
     </el-row>
 
@@ -177,9 +173,9 @@ export default {
 
     let allIndex = -1;
     let wanYuIndex = -1;
-    this.cp_companies = this.cp_companies.map((item,index) => {
+    this.cp_companies = this.cp_companies.map((item, index) => {
       let label = '';
-      
+
       if (item.label === '所有公司') {
         allIndex = index;
         label = '所有公司'
@@ -198,11 +194,11 @@ export default {
     })
 
 
-    if(allIndex !== -1) {
+    if (allIndex !== -1) {
       this.companyNo = this.cp_companies[allIndex].value;
-    } else if(wanYuIndex !== -1){
+    } else if (wanYuIndex !== -1) {
       this.companyNo = this.cp_companies[wanYuIndex].value;
-    }else {
+    } else {
       this.companyNo = this.cp_companies[0].value;
     }
 

src/components/newResults/department.vue

@@ -17,7 +17,7 @@
     </div>
 
     <el-row style="margin-top: 10px; display: flex;width:100%;margin-top:10px" v-if="!isEmpty">
-      <el-table border size="mini" :data="list" :header-cell-class-name="setHeaderClassName" height="315px"
+      <el-table border size="mini" :data="list" :header-cell-class-name="setHeaderClassName"
         :cell-class-name="setCellClassName">
         <!-- <el-table-column fixed="left" label="公司" prop="company" align="center" width="45px" /> -->
         <el-table-column fixed="left" label="部门" prop="depart" align="center" width="60px">
@@ -27,18 +27,15 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column label="当日" align="center" min-width="120px">
-          <el-table-column label="营业收入" align="center">
+          <el-table-column label="当日营业收入" align="center"  min-width="105px">
             <template slot-scope="scope">{{ unit2TenThousand(scope.row.dayinfo.sale_total, isTenThound) }}</template>
           </el-table-column>
-        </el-table-column>
 
-        <el-table-column label="当月" align="center">
-          <el-table-column label="营收目标" align="center" min-width="115px">
+          <el-table-column label="当月营收目标" align="center" min-width="115px">
             <template slot-scope="scope">{{ unit2TenThousand(scope.row.total_tips, isTenThound) }}</template>
           </el-table-column>
 
-          <el-table-column label="营业收入(净)" align="center" min-width="120px">
+          <el-table-column label="当月营业收入(净)" align="center" min-width="120px">
             <template slot-scope="scope">
               <div style="display:flex;flex-direction: column;">
                 <div style="display:flex;flex-direction: column;">
@@ -61,7 +58,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="成本" align="center" min-width="120px" v-if="costField">
+          <el-table-column label="当月成本" align="center" min-width="120px" v-if="costField">
             <template slot-scope="scope">
               <div style="display:flex;flex-direction: column;">
                 <el-popover placement="top" :width="200" trigger="hover">
@@ -81,7 +78,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="毛利" min-width="120px">
+          <el-table-column align="center" label="当月毛利" min-width="120px">
             <template slot-scope="scope">
               <div style="display:flex;flex-direction: column;">
                 <el-popover placement="top" :width="200" trigger="hover">
@@ -101,7 +98,6 @@
               </div>
             </template>
           </el-table-column>
-        </el-table-column>
       </el-table>
     </el-row>
 

src/pages/newResults.vue

@@ -26,8 +26,8 @@
 
       <div class="container">
         <result-company :companies="companies" :isTenThound="isTenThound" :costField="costField" />
-        <result-company-month :companies="companies" :isTenThound="isTenThound" :costField="costField" />
         <result-department :companies="companies" :isTenThound="isTenThound" :costField="costField" />
+        <result-company-month :companies="companies" :isTenThound="isTenThound" :costField="costField" />
       </div>
     </div>