From 5b4e3323925bd1cbfc1b3503d27550b78af0be1a Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Tue, 17 Mar 2020 13:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90new=E3=80=91=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E5=8F=91=E5=B1=95-=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/manpower/manpower.js             |  18 +--
 src/components/ebiz/manpower/NavItem.vue      |   5 +-
 .../ebiz/manpower/UserInfoHeader.vue          |  16 ++-
 src/views/ebiz/manpower/ActiveManagement.vue  |   1 -
 src/views/ebiz/manpower/Navigation.vue        |   8 +-
 src/views/ebiz/manpower/PersonalCenter.vue    | 114 +++++++++++++-----
 src/views/ebiz/manpower/Training.vue          |   4 +-
 7 files changed, 112 insertions(+), 54 deletions(-)

diff --git a/src/api/ebiz/manpower/manpower.js b/src/api/ebiz/manpower/manpower.js
index 679b0518a..f5c3b8d72 100644
--- a/src/api/ebiz/manpower/manpower.js
+++ b/src/api/ebiz/manpower/manpower.js
@@ -1,6 +1,15 @@
 import request from '@/assets/js/utils/request'
 import getUrl from '@/assets/js/utils/get-url'
 
+// 个人中心 - 查询接口
+export function getPersonalInfo(data) {
+  return request({
+    url: getUrl('/agent/personal/getInfo', 1),
+    method: 'post',
+    data
+  })
+}
+
 // 人才库列表查询接口
 export function getAgentPersonnelList(data = {}) {
   return request({
@@ -43,15 +52,6 @@ export function queryWeekly(data) {
   })
 }
 
-// 查询日志页面人才库列表
-export function queryListFirst(data) {
-  return request({
-    url: getUrl('/agent/personnel/queryListFirst', 1),
-    method: 'post',
-    data
-  })
-}
-
 // 查询日志页面增员列表
 export function queryRecordList(data) {
   return request({
diff --git a/src/components/ebiz/manpower/NavItem.vue b/src/components/ebiz/manpower/NavItem.vue
index 9a0cedb26..79a26052e 100644
--- a/src/components/ebiz/manpower/NavItem.vue
+++ b/src/components/ebiz/manpower/NavItem.vue
@@ -3,8 +3,9 @@
   <!-- <div class="nav-item"> -->
   <van-cell is-link class="relative" @click="rout(config)">
     <template slot="title">
-      <img class="t-cell-icon" :src="config.src" alt="config" />
-      <span class="custom-title">{{ config.title }}</span>
+      <van-icon v-if="config.icon" class="t-cell-icon" size="6.4vw" :name="config.icon" />
+      <img v-else class="t-cell-icon" :src="config.src" alt="config" />
+      <span class="custom-title"> {{ config.title }}</span>
     </template>
   </van-cell>
   <!-- </div> -->
diff --git a/src/components/ebiz/manpower/UserInfoHeader.vue b/src/components/ebiz/manpower/UserInfoHeader.vue
index ff6f4d4b3..b2153d1ef 100644
--- a/src/components/ebiz/manpower/UserInfoHeader.vue
+++ b/src/components/ebiz/manpower/UserInfoHeader.vue
@@ -25,10 +25,18 @@ export default {
   methods: {
     async getInfo() {
       // 获取代理人信息
-      const res = await getAgentInfo({})
-      console.log(res)
-      if (res.result == 0) {
-        this.userInfo = res
+      let userInfo = localStorage.getItem('userInfo')
+      if (userInfo) {
+        this.userInfo = JSON.parse(userInfo)
+      } else {
+        const res = await getAgentInfo({})
+        if (res.result == 0) {
+          this.userInfo = res
+          localStorage.setItem('agentCode', res.jobNo)
+          localStorage.setItem('userInfo', JSON.stringify(res))
+        } else {
+          this.$toast(res.resultMessage)
+        }
       }
     }
   },
diff --git a/src/views/ebiz/manpower/ActiveManagement.vue b/src/views/ebiz/manpower/ActiveManagement.vue
index c45e4071c..cb19aed63 100644
--- a/src/views/ebiz/manpower/ActiveManagement.vue
+++ b/src/views/ebiz/manpower/ActiveManagement.vue
@@ -112,7 +112,6 @@ export default {
   },
   mounted() {
     this.queryWeekly()
-    this.queryListFirst()
     this.getAgentPersonnelListFirst()
     this.queryRecordList()
   },
diff --git a/src/views/ebiz/manpower/Navigation.vue b/src/views/ebiz/manpower/Navigation.vue
index ffcf995f3..202634ccb 100644
--- a/src/views/ebiz/manpower/Navigation.vue
+++ b/src/views/ebiz/manpower/Navigation.vue
@@ -25,22 +25,22 @@ export default {
       navList: [
         {
           title: '个人中心',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'user-o',
           path: '/manpower/PersonalCenter'
         },
         {
           title: '增员工具',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'friends-o',
           path: '/manpower/IncreaseStaffTools'
         },
         {
           title: '活动量管理',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'todo-list-o',
           path: '/manpower/ActiveManagement'
         },
         {
           title: '培训上岗',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'records',
           path: '/manpower/Training'
         }
       ]
diff --git a/src/views/ebiz/manpower/PersonalCenter.vue b/src/views/ebiz/manpower/PersonalCenter.vue
index 8e5449478..00e712bd3 100644
--- a/src/views/ebiz/manpower/PersonalCenter.vue
+++ b/src/views/ebiz/manpower/PersonalCenter.vue
@@ -1,76 +1,78 @@
 <template>
-  <div class="personal-center-main">
+  <div class="personal-center-main" v-if="success">
     <van-cell-group class="pl15 mt10">
-      <van-cell title="姓名" :value="'业务员工号value'" />
-      <van-cell title="入职职级" :value="'业务员工号value'" />
-      <van-cell title="现任职级" :value="'业务员工号value'" />
-      <van-cell title="入职时间" :value="'业务员工号value'" />
-      <van-cell title="现任职级时间" :value="'业务员工号value'" />
+      <van-cell title="姓名" :value="agentInfo.name" />
+      <van-cell title="入职职级" :value="agentInfo.entryGrade" />
+      <van-cell title="现任职级" :value="agentInfo.presentGrade" />
+      <van-cell title="入职时间" :value="agentInfo.entryTime" />
+      <van-cell title="现任职级时间" :value="agentInfo.presentGradeTime" />
     </van-cell-group>
 
     <van-tabs v-model="active" class="mt10" sticky>
       <van-tab title="团队人力架构">
         <van-cell-group class="pl15">
-          <van-cell title="直辖组人力" :value="'业务员工号value'" />
-          <van-cell title="直辖部人力" :value="'业务员工号value'" />
-          <van-cell title="直辖部主管数" :value="'业务员工号value'" />
-          <van-cell title="大直辖人力" :value="'业务员工号value'" />
-          <van-cell title="直接增援人数" :value="'业务员工号value'" />
-          <van-cell title="直接育成主管数量" :value="'业务员工号value'" />
-          <van-cell title="直接育成部门数量" :value="'业务员工号value'" />
-          <van-cell title="全辖团队人力" :value="'业务员工号value'" />
+          <van-cell title="直辖组人力" :value="teamInfo.jurisdictionGroupNum" />
+          <van-cell title="直辖部人力" :value="teamInfo.jurisdictionDepartNum" />
+          <van-cell title="直辖部主管数" :value="teamInfo.jurisdictionGroupManagerNum" />
+          <van-cell title="大直辖人力" :value="teamInfo.majorJurisdictionNum" />
+          <van-cell title="直接增援人数" :value="teamInfo.directReinforceNum" />
+          <van-cell title="直接育成主管数量" :value="teamInfo.directBredManagerNum" />
+          <van-cell title="直接育成部门数量" :value="teamInfo.directBredDepartNum" />
+          <van-cell title="全辖团队人力" :value="teamInfo.allTeamNum" />
         </van-cell-group>
       </van-tab>
       <van-tab title="实时新增数据">
         <van-grid :border="true" :column-num="2" class="p15">
           <van-grid-item>
             当月个人新增
-            <span class="c-gray-darker fwb mt20">345</span>
+            <span class="c-gray-darker fwb mt20">{{ realAddDataInfo.currentMonthPersonalAdd }}</span>
           </van-grid-item>
           <van-grid-item>
             直辖组新增
-            <span class="c-gray-darker fwb mt20">234</span>
+            <span class="c-gray-darker fwb mt20">{{ realAddDataInfo.jurisdictionGroupAdd }}</span>
           </van-grid-item>
           <van-grid-item>
             直辖部新增
-            <span class="c-gray-darker fwb mt20">111</span>
+            <span class="c-gray-darker fwb mt20">{{ realAddDataInfo.jurisdictionDepartAdd }}</span>
           </van-grid-item>
           <van-grid-item>
             大直辖新增
-            <span class="c-gray-darker fwb mt20">6436</span>
+            <span class="c-gray-darker fwb mt20">{{ realAddDataInfo.majorJurisdictionAdd }}</span>
           </van-grid-item>
         </van-grid>
       </van-tab>
       <van-tab title="人力架构">
         <van-collapse v-model="activeNames" accordion>
-          <van-collapse-item :name="item" v-for="item of 2" :key="item">
-            <div slot="title"><span class="tagJOB">SMS</span> 标题{{ item }}</div>
+          <van-collapse-item v-for="(item, index) of frameworkInfoLstAdmin" :name="item.gradeChineseName" :key="index">
+            <div slot="title">
+              <span class="tagJOB">{{ item.gradeEnglishName }}</span>
+              {{ item.gradeChineseName }} ({{ item.manageStaffNum }})
+            </div>
             <van-grid :border="true" :column-num="2" class="p15">
               <van-grid-item>
                 当月个人新增
-                <span class="c-gray-darker fwb mt20">345</span>
+                <span class="c-gray-darker fwb mt20">{{ item.personalRealAddDataInfo.currentMonthPersonalAdd }}</span>
               </van-grid-item>
               <van-grid-item>
                 直辖组新增
-                <span class="c-gray-darker fwb mt20">234</span>
+                <span class="c-gray-darker fwb mt20">{{ item.personalRealAddDataInfo.jurisdictionGroupAdd }}</span>
               </van-grid-item>
               <van-grid-item>
                 直辖部新增
-                <span class="c-gray-darker fwb mt20">111</span>
+                <span class="c-gray-darker fwb mt20">{{ item.personalRealAddDataInfo.jurisdictionDepartAdd }}</span>
               </van-grid-item>
               <van-grid-item>
                 大直辖新增
-                <span class="c-gray-darker fwb mt20">6436</span>
+                <span class="c-gray-darker fwb mt20">{{ item.personalRealAddDataInfo.majorJurisdictionAdd }}</span>
               </van-grid-item>
             </van-grid>
           </van-collapse-item>
         </van-collapse>
-
         <van-cell-group class="">
-          <van-cell>
+          <van-cell v-for="(item, index) of frameworkInfoLstNotAdmin" :key="index">
             <div slot="title">
-              <span class="tagJOB">SMS</span>
-              <span class="name">标题</span>
+              <span class="tagJOB">{{ item.gradeEnglishName }}</span>
+              <span class="name">{{ item.gradeChineseName }}</span>
             </div>
           </van-cell>
         </van-cell-group>
@@ -80,8 +82,18 @@
 </template>
 
 <script>
-import { Cell, CellGroup, Tab, Tabs, Grid, GridItem, Collapse, CollapseItem } from 'vant'
+const isAdmin = {
+  BD: true,
+  SBM: true,
+  BM: true,
+  SAS: true,
+  AS: true,
+  CM: false,
+  CA: false
+}
 
+import { Cell, CellGroup, Tab, Tabs, Grid, GridItem, Collapse, CollapseItem } from 'vant'
+import { getPersonalInfo } from '@/api/ebiz/manpower/manpower'
 export default {
   name: 'PersonalCenter',
   components: {
@@ -96,12 +108,50 @@ export default {
   },
   data() {
     return {
-      activeNames: {},
-      active: ''
+      activeNames: [],
+      active: '',
+      success: false,
+      agentInfo: null,
+      realAddDataInfo: null,
+      frameworkInfoLst: null,
+      teamInfo: null
+    }
+  },
+  computed: {
+    frameworkInfoLstAdmin: function() {
+      if (this.frameworkInfoLst) {
+        return this.frameworkInfoLst.filter(item => {
+          return isAdmin[item.gradeEnglishName]
+        })
+      }
+      return []
+    },
+    frameworkInfoLstNotAdmin: function() {
+      if (this.frameworkInfoLst) {
+        return this.frameworkInfoLst.filter(item => {
+          return !isAdmin[item.gradeEnglishName]
+        })
+      }
+      return []
     }
   },
   watch: {},
-  created() {},
+  created() {
+    getPersonalInfo({
+      agentCode: localStorage.getItem('agentCode')
+    })
+      .then(res => {
+        if (res.result == 0) {
+          for (let key of Object.keys(res.content)) {
+            this[key] = res.content[key]
+          }
+          this.success = true
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+      .catch(() => {})
+  },
   mounted() {},
   methods: {}
 }
diff --git a/src/views/ebiz/manpower/Training.vue b/src/views/ebiz/manpower/Training.vue
index a90223e31..9078a0192 100644
--- a/src/views/ebiz/manpower/Training.vue
+++ b/src/views/ebiz/manpower/Training.vue
@@ -25,13 +25,13 @@ export default {
       navList: [
         {
           title: '增员分享',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'cluster-o',
           path: '/',
           share: true
         },
         {
           title: '增员审批',
-          src: 'http://localhost:8080/favicon.ico',
+          icon: 'comment-o',
           path: '/agentEenter/approve/ApproveList'
         }
       ]