build

src/components/newResults/company.vue

@@ -23,17 +23,15 @@
         :cell-class-name="setCellClassName">
         <el-table-column fixed="left" label="公司" prop="companyName" align="center" width="65px">
           <template slot-scope="scope">
-            <div v-if="scope.row.companyName.indexOf('普润') === -1 &&scope.row.companyName.indexOf('万宇') === -1">
+            <div v-if="scope.row.companyName.indexOf('普润') === -1">
               {{ mapCompany[scope.row.companyName] || scope.row.companyName }}
             </div>
 
             <div v-else>
-              <el-popover placement="top" width="200" trigger="hover" 
-                :content="scope.row.companyName.indexOf('普润') !== -1 ? '普润&锦兴&知事' : '不含业务公司供应商端数据'"
-              >
+              <el-popover placement="top" width="200" trigger="hover" content="普润&锦兴&知事">
                 <template #reference>
                   <i class="el-icon-warning-outline" style="font-size:14px;cursor:pointer"></i>
-                  {{scope.row.companyName.indexOf('普润') !== -1 ? '普润' : '万宇'}}
+                  普润
                 </template>
               </el-popover>
             </div>
@@ -283,7 +281,7 @@ export default {
         return base;
       }
 
-      return base;
+      return base
     },
     setHeaderClassName({ column }) {
       const { label } = column;

src/components/newResults/department.vue

@@ -1,7 +1,14 @@
 <template>
   <div v-loading="loading">
     <div class="search clear">
-      <div style="float:left;line-height:30px">部门完成情况</div>
+      <div style="float:left;line-height:30px;display:flex;align-items:center">
+        <el-popover placement="top" width="200" trigger="hover" content="不含业务公司供应商端数据">
+          <template #reference>
+            <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer;padding-top:5px;padding-right:5px;display:inline-block"></i>
+          </template>
+        </el-popover>
+        部门完成情况
+      </div>
 
       <div style="float:right">
         <el-select size="small" style="margin-right:10px;width:135px" v-model="companyNo" @change="requestData"
@@ -27,77 +34,77 @@
             </p>
           </template>
         </el-table-column>
-          <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 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">
-            <template slot-scope="scope">
-              <div style="display:flex;flex-direction: column;">
-                <div style="display:flex;flex-direction: column;">
-                  <el-popover placement="top" :width="200" trigger="hover">
-                    <div class="table-size">
-                      <p>直营/自营: {{ unit2TenThousand(scope.row.currentMonthPure[0].zy, isTenThound) }}</p>
-                      <p>支付渠道: {{ unit2TenThousand(scope.row.currentMonthPure[0].qd, isTenThound) }}</p>
-                    </div>
-                    <template #reference>
+        <el-table-column label="当日营业收入" align="center" min-width="105px">
+          <template slot-scope="scope">{{ unit2TenThousand(scope.row.dayinfo.sale_total, isTenThound) }}</template>
+        </el-table-column>
 
-                      <p
-                        :style="`text-align: center;${getCurrentValueStyle(scope.row.monthinfo.monthNetSales, scope.row.total_tips)}`">
-                        <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                        {{ unit2TenThousand(scope.row.monthinfo.monthNetSales, isTenThound) }}
-                      </p>
-                    </template>
-                  </el-popover>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
+        <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" v-if="costField">
-            <template slot-scope="scope">
+        <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;">
                 <el-popover placement="top" :width="200" trigger="hover">
                   <div class="table-size">
-                    <p>直营/自营: {{ unit2TenThousand(scope.row.zy_cost, isTenThound) }}</p>
-                    <p>渠道: {{ unit2TenThousand(scope.row.qd_cost, isTenThound) }}</p>
+                    <p>直营/自营: {{ unit2TenThousand(scope.row.currentMonthPure[0].zy, isTenThound) }}</p>
+                    <p>支付渠道: {{ unit2TenThousand(scope.row.currentMonthPure[0].qd, isTenThound) }}</p>
                   </div>
                   <template #reference>
-                    <p style="text-align: center;">
-                      <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                      {{
-                unit2TenThousand(Number(addition(scope.row.zy_cost, scope.row.qd_cost)).toFixed(2), isTenThound) }}
-                    </p>
-                  </template>
-                </el-popover>
-              </div>
-            </template>
-          </el-table-column>
 
-          <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">
-                  <div class="table-size">
-                    <p>直营/自营: {{ unit2TenThousand(scope.row.zy_gross, isTenThound) }}</p>
-                    <p>支付渠道: {{ unit2TenThousand(scope.row.qd_gross, isTenThound) }}</p>
-                  </div>
-                  <template #reference>
-                    <p style="text-align: center;">
+                    <p
+                      :style="`text-align: center;${getCurrentValueStyle(scope.row.monthinfo.monthNetSales, scope.row.total_tips)}`">
                       <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                      {{
-                        unit2TenThousand(Number(addition(scope.row.zy_gross, scope.row.qd_gross)).toFixed(2), isTenThound)
-                      }}
+                      {{ unit2TenThousand(scope.row.monthinfo.monthNetSales, isTenThound) }}
                     </p>
                   </template>
                 </el-popover>
               </div>
-            </template>
-          </el-table-column>
+            </div>
+          </template>
+        </el-table-column>
+
+        <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">
+                <div class="table-size">
+                  <p>直营/自营: {{ unit2TenThousand(scope.row.zy_cost, isTenThound) }}</p>
+                  <p>渠道: {{ unit2TenThousand(scope.row.qd_cost, isTenThound) }}</p>
+                </div>
+                <template #reference>
+                  <p style="text-align: center;">
+                    <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
+                    {{
+                      unit2TenThousand(Number(addition(scope.row.zy_cost, scope.row.qd_cost)).toFixed(2), isTenThound) }}
+                  </p>
+                </template>
+              </el-popover>
+            </div>
+          </template>
+        </el-table-column>
+
+        <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">
+                <div class="table-size">
+                  <p>直营/自营: {{ unit2TenThousand(scope.row.zy_gross, isTenThound) }}</p>
+                  <p>支付渠道: {{ unit2TenThousand(scope.row.qd_gross, isTenThound) }}</p>
+                </div>
+                <template #reference>
+                  <p style="text-align: center;">
+                    <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
+                    {{
+                      unit2TenThousand(Number(addition(scope.row.zy_gross, scope.row.qd_gross)).toFixed(2), isTenThound)
+                    }}
+                  </p>
+                </template>
+              </el-popover>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
 
@@ -132,7 +139,7 @@ export default {
       companyNo: "",
       loading: false,
       isEmpty: false,
-      cp_companies:[]
+      cp_companies: []
     }
   },
   computed: {
@@ -149,8 +156,8 @@ export default {
     }))
 
 
-    const wuYuIndex =  this.cp_companies.findIndex(item => item.label === '平台公司: 万宇')
-    if(wuYuIndex !== -1) {
+    const wuYuIndex = this.cp_companies.findIndex(item => item.label === '平台公司: 万宇')
+    if (wuYuIndex !== -1) {
       this.companyNo = this.companies[wuYuIndex].value;
     } else {
       this.companyNo = this.companies[0].value;

src/pages/newResults.vue

@@ -141,8 +141,8 @@ export default {
           break
         default:
           this.state.error = true;
-          this.state.message = result.message;
           openid && removeOpenid();
+          this.state.message = result.message;
           break;
       }
     },