build

src/components/newResults/company-month.vue

@@ -171,6 +171,25 @@ export default {
         })
       };
 
+      if(this.companyNo === ""){
+        result.data.forEach((item) => item.total_tips = 0);
+
+        for(const c of this.cp_companies.filter(({value}) => value !== "")){
+          const res = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: c.value });
+          result.data = result.data.reduce((prev,curr,index) => {
+            return [
+              ...prev,
+              {
+                ...curr,
+                total_tips:Number(addition(Number(curr.total_tips).toFixed(2),Number(res.data[index].total_tips).toFixed(2))).toFixed(2)
+              }
+            ]
+          },[])
+
+
+        }
+      }
+
       
       switch(Number(result.code)){
         case 0:

src/components/newResults/department.vue

@@ -7,12 +7,26 @@
       </el-select>
 
       <div style="display:flex;align-items:center">
-        <el-switch :disabled="isEmpty" style="margin-right: 10px;" v-model="isTenThound" active-text="万元"
-          inactive-text="元" />
-        <el-date-picker :disabled="isEmpty" class="fr picker" v-model="daytime"
-          :picker-options="{ disbaledData(time) { return time.getTime() > Date.now(); } }" placeholder="选择日期"
+        <el-switch 
+            :disabled="isEmpty" 
+            :inline-prompt="true" 
+            style="margin-right: 10px;" 
+            v-model="isTenThound" 
+            active-text="万元"
+            inactive-text="元" 
+          />
+        
+        <el-date-picker 
+          :disabled="isEmpty" 
+          class="fr picker" 
+          v-model="daytime"
+          :picker-options="{ disbaledData(time) { return time.getTime() > Date.now(); } }" 
           style=";width:140px" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :editable="false" :clearable="false"
-          :size="'small'" align="right" type="date" />
+          placeholder="选择日期"
+          :size="'small'" 
+          align="right" 
+          type="date"
+         />
       </div>
     </div>
 
@@ -211,7 +225,6 @@ export default {
     async requestData() {
       this.loading = true;
       this.list = [];
-
       const res = await asyncRequest.departmentEveryDay({ daytime: this.daytime, companyNo: this.companyNo });
 
       if (res.code === 0 && res.data && res.data.length > 0) {
@@ -283,6 +296,7 @@ export default {
     justify-content:space-between;
   }
 
+
   .table-size {
     display: flex;
     border-top: 1px solid #ebeef5;

src/pages/newResults.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="new-results" v-loading="state.loading" style="min-height:300px">
     <div v-if="!state.error && isShow">
+      <div style="color:red;font-weight: 700;padding-left:10px">
+        <i class="el-icon-warning-outline"></i> 以下报表一小时更新一次
+      </div>
       <result-company :companies="companies" :costField="costField" />
       <result-company-month :companies="companies" :costField="costField" />
       <result-department :companies="companies" :costField="costField" />

src/pages/results.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="app" v-cloak v-loading="state.loading" style="min-height: 300px;">
     <template v-if="!state.error && isShow">
+      <div style="color:red;position:absolute;top:30px;left:10px;font-weight: 700;">
+        <i class="el-icon-warning-outline"></i> 以下报表一小时更新一次
+      </div>
       <control-display :companyArr="companyArr" :hasPlatformDimension="hasPlatformDimension"  />
     </template>
     <template v-else-if="!state.loading">