xujun

src/views/talentAssign/components/groupDetail.vue

@@ -34,8 +34,8 @@
           <template slot="talentName" slot-scope="record">
             <a @click="recordClick(record)">{{record.personName}}</a>
           </template>
-          <template slot="talentCategory" slot-scope="record">
-            {{ record.talentCategory == 1 ? "一般项目" : "重点项目" }}
+          <template slot="operation" slot-scope="record">
+            <a-button type="danger" @click="deleteGroupDetail(record)">删除</a-button>
           </template>
         </a-table>
         <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />
@@ -50,14 +50,13 @@
 
 <script>
 import talentView from "@/views/report/talent/components/talentView"
-import projectSelect from '@/views/peAssign/components/projectSelect'
 import { isEmptyParams, hideIdCard } from '@/views/utils/common'
 import groupExpertDetail from '@/views/talentAssign/components/groupExpertDetail'
 
 export default {
   name: "GroupDetail",
   components: {
-    talentView, projectSelect, groupExpertDetail
+    talentView, groupExpertDetail
   },
   props: {
     value: {
@@ -81,11 +80,12 @@ export default {
       tableData: [],
       columns: [
         { title: '证件号', dataIndex: 'certId', align: 'center' },
-        { title: "姓名", scopedSlots: { customRender: 'talentName' }, ellipsis: true },
-        { title: "人才类别", scopedSlots: { customRender: 'talentCategory' }, align: 'center' },
+        { title: "姓名", scopedSlots: { customRender: 'talentName' }, align: 'center', ellipsis: true },
+        { title: "人才类别", dataIndex: 'talentCategory', align: 'center' },
         { title: '单位', dataIndex: 'appUnitName', align: 'center' },
         { title: '手机号', dataIndex: 'mobile', align: 'center' },
-        { title: '学科名称', dataIndex: 'specName', align: 'center' }
+        { title: '学科名称', dataIndex: 'specName', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'operation' }, align: 'center', width: 100 }
       ],
       pagination: {
         pageIndex: 1,
@@ -112,6 +112,10 @@ export default {
       this.$api.talentAssign.getTalentDetailListbyPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
+          if (dataList === null || dataList.length <= 0) {
+            this.$message.error('没有查询到分配数据！')
+            this.$emit('close')
+          }
           dataList.forEach(e => {
             e.certId = hideIdCard(e.certId)
           })
@@ -142,7 +146,7 @@ export default {
       this.visibleView = true
       this.talentId = record.talentId
     },
-    deleteGroupTalent (record) {
+    deleteGroupDetail (record) {
       let self = this
       this.$confirm({
         title: '',

src/views/talentAssign/components/talentSelectIntoGroup.vue

@@ -97,7 +97,6 @@ export default {
       this.$api.talentAssign.getUnAssignTalentListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
-          console.log(dataList)
           dataList.forEach(e => {
             e.certId = hideIdCard(e.certId)
           });
@@ -140,13 +139,13 @@ export default {
     },
     submit () {
       if (this.talentSelectedRowKeys.length == 0) {
-        this.$message.warning('请选择项目！')
+        this.$message.warning('请选择人才！')
         return
       }
       let Ids = this.talentSelectedRowKeys
       this.loading = true
       this.$api.talentAssign.InsertTalentGroup({ Ids: Ids, groupId: this.value }).then(({ data = {} }) => {
-        if (data === '项目分组成功！') {
+        if (data === '人才分组成功！') {
           this.$message.success(data)
           this.$emit('close')
         } else {

src/views/talentAssign/index.vue

@@ -84,7 +84,7 @@
       <talent-select-into-group v-model="groupId" @close="closeTalentIntoGroupWindow" ref="childEdit"></talent-select-into-group>
     </a-modal>
     <a-modal v-model="talentDetailVisible" :title="talentGroupTitle" width="95%" :dialog-style="{ top: '8%' }" :footer="null" class="custom-modal" destroyOnClose>
-      <group-detail v-model="groupId" @close="() =>  this.talentDetailVisible = false" />
+      <group-detail v-model="groupId" @close="closeGroupDetail" />
     </a-modal>
   </div>
 </template>
@@ -318,7 +318,7 @@ export default {
       this.evaluationVisible = false
       this.getListByPage()
     },
-    closeProjDetail () {
+    closeGroupDetail () {
       this.talentDetailVisible = false
       this.getListByPage()
     },