build

src/pages/invData.vue

@@ -1,66 +1,125 @@
 <template>
   <div class="new-report" v-loading="state.loading" style="min-height:300px">
     <div v-if="!state.error && isShow">
+
+      <div style="
+        color:red;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width:100%;
+        padding:5px 10px;
+        box-sizing:border-box;
+        position: fixed;
+        top:0px;
+        left:5px;
+        background-color: #fff;
+        z-index: 1000;
+        ">
+
+        <el-popover placement="top-start" :width="200" trigger="hover" content="每晚7:00更新">
+          <template #reference>
+            <i class="el-icon-warning-outline" style="font-size:22px;cursor:pointer"></i>
+          </template>
+        </el-popover>
+
+        <el-switch v-model="isTenThound" active-text="万元" inactive-text="元" />
+      </div>
+
+
+
       <div v-loading="dayCompanyLoading">
         <div class="main-title">
           <p class="title">业务公司维度</p>
 
           <div style="display: flex;">
-            <ElDatePicker style="width:135px" placeholder="日期" v-model="companyDayDate" :clearable="false"
-              @change="requestCompanyDay" size="mini" datetype="year" value-format="yyyy-MM-dd" />
+            <ElDatePicker class="fr picker no-padding"" style=" width:95px;padding:0px" placeholder="日期"
+              v-model="companyDayDate" :clearable="false" @change="requestCompanyDay" size="mini" datetype="year"
+              value-format="yyyy-MM-dd" />
           </div>
         </div>
         <el-table size="small" border :data="dayCompany">
-          <el-table-column label="业务公司" prop="companyName" width="160px" show-overflow-tooltip fixed="left" />
-          <el-table-column label="当日开票收入" min-width="100px" prop="invDay" />
-          <el-table-column label="当月开票收入目标" min-width="140px" prop="inv_tips" />
-          <el-table-column label="当月开票收入" min-width="100px" prop="invMonth" />
-          <el-table-column label="当月开票完成比" min-width="120px" prop="monthInvRate" />
-          <el-table-column label="当月开票成本" min-width="120px" prop="costMonth" />
-          <el-table-column label="毛利目标" min-width="100px" prop="cost_tips" />
-          <el-table-column label="毛利完成比" min-width="100px" prop="costRate" />
+          <el-table-column label="业务公司" prop="companyName" width="70px" show-overflow-tooltip fixed="left" />
+          <el-table-column label="当日开票收入" min-width="100px" prop="invDay" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.invDay, isTenThound) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="当月">
+            <el-table-column label="开票收入目标" min-width="100px" prop="inv_tips" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.inv_tips, isTenThound) }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="开票收入" min-width="80px" prop="invMonth" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.invMonth, isTenThound) }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="开票完成比" min-width="100px" prop="monthInvRate" show-overflow-tooltip />
+
+            <el-table-column label="开票成本" min-width="100px" prop="costMonth" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.costMonth, isTenThound) }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="毛利目标" min-width="100px" prop="cost_tips" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.cost_tips, isTenThound) }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="毛利完成比" min-width="90px" prop="costRate" />
+          </el-table-column>
         </el-table>
       </div>
 
 
       <div v-loading="dayAccountLoading">
         <div class="main-title">
-          <p class="title">业务经理维度</p>
-          <ElDatePicker style="width:135px" placeholder="日期" v-model="dayDate" :clearable="false"
-            @change="requestAccountDay" size="mini" value-format="yyyy-MM-dd" />
+          <p class="title">人员维度</p>
+          <ElDatePicker class="fr picker no-padding"" style=" width:95px" placeholder="日期" v-model="dayDate"
+            :clearable="false" @change="requestAccountDay" size="mini" value-format="yyyy-MM-dd" />
         </div>
 
         <el-table size="small" border :data="dayAccount">
-          <el-table-column label="业务经理" prop="uname" width="100px" show-overflow-tooltip fixed="left" />
-          <el-table-column label="当日开票收入" prop="invDay" min-width="120px" />
-          <el-table-column label="当月开票收入目标" prop="inv_tips" min-width="140px" />
-          <el-table-column label="当月开票收入" prop="invMonth" min-width="100px" />
-          <el-table-column label="当月开票完成比" prop="invMonthRate" min-width="120px" />
-          <el-table-column label="当月开票成本" prop="costMonthTotal" min-width="100px" />
-          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips" />
-          <el-table-column label="毛利完成比" min-width="100px" show-overflow-tooltip prop="costMonthRate" />
+          <el-table-column label="人员" prop="uname" width="70px" show-overflow-tooltip fixed="left" />
+
+          <el-table-column label="当日开票收入" prop="invDay" min-width="100px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.invDay, isTenThound) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="当月">
+            <el-table-column label="开票收入目标" prop="inv_tips" min-width="100px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.inv_tips, isTenThound) }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="开票收入" prop="invMonth" min-width="80px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.invMonth, isTenThound) }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="开票完成比" prop="invMonthRate" min-width="100px" show-overflow-tooltip />
+            <el-table-column label="开票成本" prop="costMonthTotal" min-width="80px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ unit2TenThousand(scope.row.costMonthTotal, isTenThound) }}
+              </template>
+            </el-table-column>
+          </el-table-column>
         </el-table>
       </div>
 
 
-      <!-- <div v-loading="dayAccountLoading">
-        <div class="main-title">
-          <p class="title">业务经理维度(补录)</p>
-          <ElDatePicker style="width:135px" placeholder="日期" v-model="blDayDate" :clearable="false"
-            @change="requestAccountDayBl" size="mini" value-format="yyyy-MM-dd" />
-        </div>
-
-        <el-table size="small" border :data="blDayAccount">
-          <el-table-column label="业务经理" prop="uname" width="100px" show-overflow-tooltip fixed="left" />
-          <el-table-column label="当日开票收入" prop="invDay" min-width="120px" />
-          <el-table-column label="当月开票收入目标" prop="inv_tips" min-width="120px" />
-          <el-table-column label="当月开票收入" prop="invMonth" min-width="100px" />
-          <el-table-column label="当月开票完成比" prop="invMonthRate" min-width="120px" />
-          <el-table-column label="当月开票成本" prop="costMonthTotal" min-width="100px" />
-          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips" />
-          <el-table-column label="毛利完成比" min-width="100px" show-overflow-tooltip prop="costMonthRate" />
-        </el-table>
-      </div> -->
 
 
       <div v-loading="monthCompanyLoading">
@@ -68,21 +127,39 @@
           <p class="title">年度业务公司维度</p>
 
           <div style="display: flex;">
-            <ElSelect v-model="monthCompanyNo" @change="requestCompanyMonth" size="mini" style="margin-right: 10px">
+            <ElSelect v-model="monthCompanyNo" @change="requestCompanyMonth" size="mini"
+              style="width:80px;margin-right: 10px">
               <ElOption v-for="comp in companies" :label="comp.companyName" :value="comp.companyNo" />
             </ElSelect>
 
-            <ElDatePicker size="mini" style="width:135px" placeholder="日期" v-model="companyMonthDate" :clearable="false"
-              @change="requestCompanyMonth" value-format="yyyy" type="year" />
+            <ElDatePicker class="fr picker no-padding" size="mini" style="width:70px" placeholder="日期"
+              v-model="companyMonthDate" :clearable="false" @change="requestCompanyMonth" value-format="yyyy"
+              type="year" />
           </div>
         </div>
         <el-table size="small" border :data="monthCompany">
           <el-table-column label="月份" width="80px" show-overflow-tooltip prop="month" fixed="left" />
-          <el-table-column label="开票收入目标" min-width="120px" show-overflow-tooltip prop="inv_tips" />
-          <el-table-column label="开票收入" min-width="80px" show-overflow-tooltip prop="invMonth" />
+          <el-table-column label="开票收入目标" min-width="100px" show-overflow-tooltip prop="inv_tips">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.inv_tips, isTenThound) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="开票收入" min-width="80px" show-overflow-tooltip prop="invMonth">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.invMonth, isTenThound) }}
+            </template>
+          </el-table-column>
           <el-table-column label="开票完成比" min-width="100px" show-overflow-tooltip prop="monthInvRate" />
-          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips" />
-          <el-table-column label="毛利完成" min-width="80px" show-overflow-tooltip prop="costMonth" />
+          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.cost_tips, isTenThound) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="毛利完成" min-width="80px" show-overflow-tooltip prop="costMonth">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.costMonth, isTenThound) }}
+            </template>
+          </el-table-column>
           <el-table-column label="毛利完成比" min-width="100px" show-overflow-tooltip prop="costMonthRate" />
         </el-table>
       </div>
@@ -94,21 +171,45 @@
           <p class="title">年度业务经理维度</p>
 
           <div style="display: flex;justify-self: end;">
-            <UserSelect :value.sync="monthUser" :year="monthDate" style="margin-right: 10px"
+            <UserSelect :value.sync="monthUser" :year="monthDate" style="margin-right: 10px;width: 100px"
               @change="requestAccountMonth" @clear="monthAccount = []" />
 
-            <ElDatePicker size="mini" style="width:135px" placeholder="日期" v-model="monthDate" :clearable="false"
-              @change="requestAccountMonth" value-format="yyyy" type="year" />
+            <ElDatePicker class="no-padding" size="mini" style="width:70px" placeholder="日期" v-model="monthDate"
+              :clearable="false" @change="requestAccountMonth" value-format="yyyy" type="year" />
           </div>
         </div>
 
         <el-table size="small" border :data="monthAccount">
           <el-table-column label="月份" width="80px" show-overflow-tooltip prop="month" fixed="left" />
-          <el-table-column label="开票收入目标" min-width="110px" show-overflow-tooltip prop="inv_tips" />
-          <el-table-column label="开票收入" min-width="80px" show-overflow-tooltip prop="invMonth" />
+
+          <el-table-column label="开票收入目标" min-width="110px" show-overflow-tooltip prop="inv_tips">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.inv_tips, isTenThound) }}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="开票收入" min-width="80px" show-overflow-tooltip prop="invMonth">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.invMonth, isTenThound) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="开票完成比" min-width="100px" show-overflow-tooltip prop="monthInvRate" />
-          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips" />
-          <el-table-column label="毛利完成" min-width="80px" show-overflow-tooltip prop="costMonth" />
+
+
+          <el-table-column label="毛利目标" min-width="80px" show-overflow-tooltip prop="cost_tips">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.cost_tips, isTenThound) }}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="毛利完成" min-width="80px" show-overflow-tooltip prop="costMonth">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.costMonth, isTenThound) }}
+            </template>
+          </el-table-column>
           <el-table-column label="毛利完成比" min-width="100px" show-overflow-tooltip prop="costMonthRate" />
         </el-table>
       </div>
@@ -131,7 +232,8 @@ import asyncRequest from "@/api/newResults";
 import userRequest from "@/api/index";
 import UserSelect from "@/components/userSelect/index.vue"
 
-import { addition, division, subtraction } from "./_utils";
+
+import { addition, division, subtraction, unit2TenThousand } from "./_utils";
 
 export default {
   name: "invData",
@@ -142,6 +244,7 @@ export default {
   },
   data() {
     return {
+      isTenThound: false,
       zxTotal: 0,
       isDisplay: false,
 
@@ -192,6 +295,7 @@ export default {
     addition,
     division,
     subtraction,
+    unit2TenThousand,
     isNotValidNum(num){
       return Number(num) === NaN || Number(num) === 0
     },
@@ -305,6 +409,18 @@ export default {
     },
 
     async requestCompanyDay() {
+      const mapCompany = {
+        "北京百辰荣达国际科贸有限公司": "百辰",
+        "北京泓源广诚国际商贸有限公司": "泓源",
+        "北京万宇恒通国际科贸有限公司": "万宇",
+        "北京锦兴弘昌科技有限公司": "锦兴",
+        "北京普润心堂商贸有限公司": "普润",
+        "北京知事文化产业发展有限公司": "知事",
+        "北京泰文创供应链管理有限公司": "泰文创",
+        "北京元隆雅图文化传播股份有限公司": "预订单E企购",
+        "结算单E企购": "结算单E企购",
+      }
+
       this.companyDayLoading = true
       const { data, code } = await asyncRequest.everyCompanyDay({ daytime: this.companyDayDate })
       this.companyDayLoading = false
@@ -322,7 +438,7 @@ export default {
 
           if (this.companies.map(({ companyNo }) => companyNo).includes(item.companyNo)){
             list.push({
-              companyName: item.companyName,
+              companyName: mapCompany[item.companyName],
               invDay,
               invMonth,
               inv_tips,
@@ -334,6 +450,8 @@ export default {
           }
         }
 
+
+        list.filter(item => !['预订单E企购', '结算单E企购'].includes(item.companyName))
         this.dayCompany = list
       }
     },
@@ -462,45 +580,57 @@ export default {
        const code = getParameterByName('code')
        const result = await userRequest.userinfo({  ...( openid ? { openid } :  { code })  })
 
-      // const result ={
-      // "code": 0,
-      // "message": "获取成功",
-      // "data": {
-		  //     "id": "1",
-		  //     "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
-		  //     "mobile": "",
-		  //     "gender": "0",
-		  //     "nickname": "雪寒",
-		  //     "avatar": "",
-		  //     "subscribe_time": "2022-12-21 15:52:14",
-		  //     "addr": "\/\/",
-		  //     "status": "1",
-		  //     "is_show": ["1", "2", "4", "10"],
-      //   "companyArr": [{
-      //     "companyNo": "GS2304031312553746",
-      //     "companyName": "北京锦兴弘昌科技有限公司",
-      //     "info": [1, 2, 10]
-      //   },{
-		  //     	"companyNo": "GS2302231125079621",
-		  //     	"companyName": "北京百辰荣达国际科贸有限公司",
-		  //     	"info": [1,2, 10]
-		  //     }, {
-		  //     	"companyNo": "GS2302231323386950",
-		  //     	"companyName": "北京泓源广诚国际商贸有限公司",
-		  //     	"info": [1,2, 10]
-		  //     }, {
-		  //     	"companyNo": "GS2302231124114965",
-		  //     	"companyName": "北京普润心堂商贸有限公司",
-		  //     	"info": [1, 2, 10]
-		  //     }, {
-		  //     	"companyNo": "GS2203161855277894",
-		  //     	"companyName": "北京万宇恒通国际科贸有限公司",
-		  //     	"info": [1, 2, 10]
-		  //     }],
-		  //     "addtime": "2023-04-10 18:11:07",
-		  //     "updatetime": "2023-05-09 16:22:33"
-      // 	}
-      // }
+      //  const result ={
+      //  "code": 0,
+      //  "message": "获取成功",
+      //  "data": {
+		  //      "id": "1",
+		  //      "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
+		  //      "mobile": "",
+		  //      "gender": "0",
+		  //      "nickname": "雪寒",
+		  //      "avatar": "",
+		  //      "subscribe_time": "2022-12-21 15:52:14",
+		  //      "addr": "\/\/",
+		  //      "status": "1",
+		  //      "is_show": ["1", "2", "4", "10"],
+      //    "companyArr": [{
+      //      "companyNo": "GS2304031312553746",
+      //      "companyName": "北京锦兴弘昌科技有限公司",
+      //      "info": [1, 2, 10]
+      //    },{
+		  //      	"companyNo": "GS2302231125079621",
+		  //      	"companyName": "北京百辰荣达国际科贸有限公司",
+		  //      	"info": [1,2, 10]
+		  //      }, {
+		  //      	"companyNo": "GS2302231323386950",
+		  //      	"companyName": "北京泓源广诚国际商贸有限公司",
+		  //      	"info": [1,2, 10]
+		  //      }, {
+		  //      	"companyNo": "GS2302231124114965",
+		  //      	"companyName": "北京普润心堂商贸有限公司",
+		  //      	"info": [1, 2, 10]
+		  //      }, {
+		  //      	"companyNo": "GS2203161855277894",
+		  //      	"companyName": "北京万宇恒通国际科贸有限公司",
+		  //      	"info": [1, 2, 10]
+		  //      }],
+		  //      "addtime": "2023-04-10 18:11:07",
+		  //      "updatetime": "2023-05-09 16:22:33"
+      //  	}
+      //  }
+
+      const mapCompany = {
+        "北京百辰荣达国际科贸有限公司": "百辰",
+        "北京泓源广诚国际商贸有限公司": "泓源",
+        "北京万宇恒通国际科贸有限公司": "万宇",
+        "北京锦兴弘昌科技有限公司": "锦兴",
+        "北京普润心堂商贸有限公司": "普润",
+        "北京知事文化产业发展有限公司": "知事",
+        "北京泰文创供应链管理有限公司": "泰文创",
+        "北京元隆雅图文化传播股份有限公司": "预订单E企购",
+        "结算单E企购": "结算单E企购",
+      }
       
         this.state.loading = false
         switch(Number(result.code)){
@@ -512,7 +642,10 @@ export default {
                 companyNo: current.companyNo,
                 companyName: current.companyName
               }] : prev
-            }, [])
+            }, []).map(item => ({
+              ...item,
+              companyName: mapCompany[item.companyName]
+            })).filter(item => !['预订单E企购', '结算单E企购'].includes(item.companyName))
 
           //  this.companies = result.data.companyArr.map(item => ({ companyNo: item.companyNo, companyName: item.companyName }))
            this.monthCompanyNo = this.companies[0].companyNo
@@ -544,6 +677,7 @@ export default {
     position: fixed;
     overflow: auto;
     padding: 10px;
+    padding-top: 30px;
 
   .title {
     font-size: 14px;