Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/router/index.js

@@ -152,7 +152,7 @@ export const routes = [
     children: [
       { path: '/audit/talent', name: '人才申报审核', component: () => import('@/views/audit/talent/Index.vue'), meta: { title: '人才申报审核', icon: '', noCache: true } },
       { path: '/talent/preliminary', name: '人才预审', component: () => import('@/views/audit/talent/Index.vue'), meta: { title: '人才预审', icon: '', noCache: true } },
-      { path: '/talent/assign', name: '人才分配', component: () => import('@/views/audit/talent/Index.vue'), meta: { title: '人才分配', icon: '', noCache: true } },
+      { path: '/talent/assign', name: '人才分配', component: () => import('@/views/talentAssign/index.vue'), meta: { title: '人才分配', icon: '', noCache: true } },
       { path: '/talent/final', name: '人才终审', component: () => import('@/views/audit/talent/Index.vue'), meta: { title: '人才终审', icon: '', noCache: true } },
     ]
   },

src/views/peAssign/projKeyAssign.vue

@@ -46,13 +46,15 @@
       </template>
       <template slot="assignInfo" slot-scope="record">
         <a-tag v-if="!record.expertList||record.expertList.length===0" :color="'red'">未分配</a-tag>
-        <a-tooltip v-else v-for="data in record.expertList" :key="data.id" placement="topLeft">
+        <template v-else>
+          <a-tooltip v-for="data in record.expertList" :key="data.id" placement="topLeft">
             <template slot="title">
               <span>{{ data.workUnit }}</span>
             </template>
             <a-tag :color="data.expertType == 1 ? technology : finance" @click="evaluationView(data)">{{data.personName}}</a-tag>
           </a-tooltip>
         </template>
+      </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'edit')">修改</a-button>
         <a-button type="link" size="small" @click="recordClick(record, 'delete')" v-if="!record.projectList||record.projectList.length===0">删除</a-button>

src/views/peAssign/projKnowledgeAssign.vue

@@ -50,7 +50,9 @@
       </template>
       <template slot="assignInfo" slot-scope="record">
         <a-tag v-if="!record.expertList||record.expertList.length===0" :color="'red'">未分配</a-tag>
-        <a-tag v-else v-for="data in record.expertList" :key="data.id" :color="'orange'" @click="evaluationView(data)">{{data.personName}}</a-tag>
+        <template v-else>
+          <a-tag v-for="data in record.expertList" :key="data.id" :color="'orange'" @click="evaluationView(data)">{{data.personName}}</a-tag>
+        </template>
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'edit')">修改</a-button>