Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev

src/api/ebiz/manpower/manpower.js

@@ -106,3 +106,30 @@ export function getShareKey(data) {
     data
   })
 }
+
+// 根据问卷编码获取问卷详细信息
+export function answerDetail(data = {}) {
+  return request({
+    url: getUrl('/customer/answer/detailByQnCode', 1),
+    method: 'post',
+        data
+      })
+    }
+    
+//DISC性格分析列表
+export function discAnalysisList(data) {
+  return request({
+    url: getUrl('/customer/answer/queryList', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 答卷提交接口
+export function answerSubmit(data) {
+  return request({
+    url: getUrl('/customer/answer/submit', 1),
+    method: 'post',
+    data
+  })
+}

src/assets/js/utils/request.js

@@ -67,7 +67,10 @@ let survey = [
   //'/customer/question/getTableId', // id 查询 -- ok
   '/customer/question/getAgentInfo' // 代理人详情
 ]
-let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey]
+let manpower = [
+  '/customer/answer/queryList' //DISC性格分析
+]
+let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...manpower]
 
 // let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale]
 

src/components/ebiz/manpower/TalentPoolItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left" @click="edit(talentPoolInfo.personnelCode)" >
+  <van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left" @click="edit(talentPoolInfo.personnelCode)">
     <van-icon slot="icon" :name="talentPoolInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="24" />
     <span>{{ talentPoolInfo.sameCompany }}</span>
     <van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#ee0a24" size="24" />

src/router/ebiz/manpower.js

@@ -19,7 +19,13 @@ const TalentPoolEdit = () => import('@/views/ebiz/manpower/talentPool/Edit')
 const ActivityLogList = () => import('@/views/ebiz/manpower/activityLog/List')
 const ActivityLogEdit = () => import('@/views/ebiz/manpower/activityLog/Edit')
 
-export default [{
+const DiscAnalysisList = () => import('@/views/ebiz/manpower/discAnalysis/List')
+const DiscAnalysisQuestion = () => import('@/views/ebiz/manpower/discAnalysis/Question')
+const DiscAnalysisResult = () => import('@/views/ebiz/manpower/discAnalysis/Result')
+const DiscAnalysisShare = () => import('@/views/ebiz/manpower/discAnalysis/Share')
+
+export default [
+  {
     // 人力发展
     path: '/manpower/Navigation',
     name: 'Navigation',
@@ -148,5 +154,45 @@ export default [{
       title: '日志详情',
       index: 100
     }
+  },
+  {
+    // DISC性格分析
+    path: '/manpower/DiscAnalysis/List',
+    name: 'DiscAnalysisList',
+    component: DiscAnalysisList,
+    meta: {
+      title: 'DISC性格分析',
+      index: 200
+    }
+  },
+  {
+    // DISC性格分析结果
+    path: '/manpower/DiscAnalysis/Result',
+    name: 'DiscAnalysisResult',
+    component: DiscAnalysisResult,
+    meta: {
+      title: 'DISC性格分析结果',
+      index: 201
+    }
+  },
+  {
+    // DISC性格分析 分享
+    path: '/manpower/DiscAnalysis/Share',
+    name: 'DiscAnalysisShare',
+    component: DiscAnalysisShare,
+    meta: {
+      title: 'DISC性格分析',
+      index: 202
+    }
+  },
+  {
+    // DISC性格分析结果 -做题
+    path: '/manpower/DiscAnalysis/Question',
+    name: 'DiscAnalysisQuestion',
+    component: DiscAnalysisQuestion,
+    meta: {
+      title: 'DISC性格分析结果',
+      index: 203
+    }
   }
 ]

src/views/app/Home.vue

@@ -29,6 +29,7 @@
           <li><router-link to="/nbs/list">nbs列表</router-link></li>
           <li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li>
           <li><router-link to="/survey/surveyList">问卷调查</router-link></li>
+          <li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li>
         </ul>
       </li>
     </ul>

src/views/ebiz/manpower/IncreaseStaffTools.vue

@@ -33,12 +33,16 @@ export default {
           title: '政策方案',
           icon: 'orders-o',
           path: '/manpower/increaseStaffTools/PolicyOptions'
-        }
-        ,
+        },
         {
           title: '产品信息',
           icon: 'bookmark-o',
           path: '/product/productList'
+        },
+        {
+          title: 'DISC性格分析',
+          icon: 'newspaper-o',
+          path: '/manpower/DiscAnalysis/List'
         }
         // {
         //   title: '培训体系',

src/views/ebiz/manpower/activityLog/Edit.vue

@@ -106,7 +106,12 @@ export default {
           value: '1'
         }
       ],
-      resultArr: [{ id: '0', text: '不加盟' }, { id: '1', text: '考虑中' }, { id: '2', text: '进班了解' }, { id: '3', text: '同意加盟' }],
+      resultArr: [
+        { id: '0', text: '不加盟' },
+        { id: '1', text: '考虑中' },
+        { id: '2', text: '进班了解' },
+        { id: '3', text: '同意加盟' }
+      ],
       occupationArr: [
         { id: '001', text: '一般内勤职员' },
         { id: '002', text: '其他金融行业' },

src/views/ebiz/manpower/increaseStaffTools/PolicyOptions.vue

@@ -27,6 +27,6 @@ export default {
         routerInfo: { path: `/manpower/increaseStaffTools/PdfShare?pdf=${num}` }
       })
     }
-  },
+  }
 }
 </script>

src/views/ebiz/manpower/js/verification.js

@@ -1,5 +1,2 @@
-
 //验证
-export function demo(par) {
-  
-}
+export function demo(par) {}

src/views/ebiz/manpower/talentPool/List.vue

@@ -1,7 +1,7 @@
 <!-- 人才库-人才列表 -->
 <template>
   <div class="container">
-    <van-search placeholder="请输入要查询人的姓名" v-model="searchName" @change="searchList" @keyup.enter="searchList"/>
+    <van-search placeholder="请输入要查询人的姓名" v-model="searchName" @change="searchList" @keyup.enter="searchList" />
     <div v-if="hasTalentPoolList" class="mb60">
       <van-index-bar :index-list="indexList">
         <div v-for="(item, key) in talentPoolList" :key="key" class="bg-white mb10 mr20">