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

src/views/peAssign/projKeyAssign.vue

@@ -51,7 +51,7 @@
       <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>
-        <a-button type="link" size="small" @click="recordClick(record, 'assign')" v-if="record.projectList&&record.projectList.length>0">分配</a-button>
+        <a-button type="link" size="small" @click="recordClick(record, 'assign')" v-if="record.projectList&&record.projectList.length>0">分配专家</a-button>
         <!-- <a-button type="link" size="small" @click="recordClick(record, 'expertView')" v-if="!record.expertList||record.expertList.length!==0">专家明细</a-button> -->
       </template>
       <a-table style="margin:5px" slot="expandedRowRender" size="small" rowKey="index" :columns="innerColumns" :loading="loading" :data-source="innerData" :pagination="false">