xujun

src/views/report/talent/Index.vue

@@ -24,8 +24,8 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <span class="form-description"> ※填报时间：{{ description }}</span>
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
-      <template slot="stateSwitch" slot-scope="record">
-        <a-switch checked-children="启用" un-checked-children="停用" :checked="checkedState(record)" @change="switchChange($event, record)" />
+      <template slot="talentInfo" slot-scope="record">
+        <a @click="recordClick(record, 'view')">{{record.personName}}</a>
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record,'view')">查看</a-button>
@@ -37,17 +37,21 @@
     <a-modal v-model="visibleEdit" v-if="visibleEdit" title="人才申报创建/修改" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <talent-create v-model="id" @close="closeWindow"></talent-create>
     </a-modal>
+    <a-modal v-model="visibleView" title="查看" width="700px" :footer="null" destroyOnClose>
+      <talent-info v-model="id"></talent-info>
+    </a-modal>
   </div>
 </template>
 
 <script>
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common"
 import talentCreate from "@/views/report/talent/components/talentCreate"
+import talentInfo from "@/views/report/talent/components/talentInfo"
 
 export default {
   name: "reportTalent",
   components: {
-    talentCreate
+    talentCreate, talentInfo
   },
   data() {
     return {
@@ -65,7 +69,7 @@ export default {
       tableData: [],
       columns: [
         { title: "身份证号", dataIndex: 'certId', align: 'center' },
-        { title: '姓名', scopedSlots: { customRender: 'personInfo' }, align: 'center' },
+        { title: '姓名', scopedSlots: { customRender: 'talentInfo' }, align: 'center' },
         { title: '性别', dataIndex: 'sex', align: 'center' },
         { title: '手机号', dataIndex: 'mobile', align: 'center' },
         { title: '专业', dataIndex: 'specName', align: 'center' },

src/views/report/talent/components/resumeInfo.vue

+<template>
+  <div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: "resumeInfo",
+  props: {
+    budget: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+
+  },
+};
+</script>
\ No newline at end of file

src/views/report/talent/components/talentEdit.vue

@@ -340,13 +340,7 @@
         </a-row>
       </div>
       <div v-if="stepsArray[1].showStatus">
-        <a-row>
-          <a-col :span="24" style="border-top: 0px;text-align: center;">
-            <div class="main-title">
-              <span>申报人简历</span>
-            </div>
-          </a-col>
-        </a-row>
+        <resume-edit :resumeList.sync="formData.resumeList" ref="talentResume" />
       </div>
       <div v-if="stepsArray[2].showStatus">
       </div>
@@ -366,11 +360,12 @@ import { isEmptyParams } from "@/views/utils/common"
 import paraRadio from '@/views/components/common/paraRadio'
 import paraCheck from '@/views/components/common/paraCheck'
 import cascaderSelect from '@/views/components/common/cascaderSelect'
+import resumeEdit from '@/views/report/talent/components/resumeEdit'
 
 export default {
   name: "talentEdit",
   components: {
-    paraRadio, paraCheck, cascaderSelect
+    paraRadio, paraCheck, cascaderSelect, resumeEdit
   },
   props: {
     value: {
@@ -479,7 +474,6 @@ export default {
     getTalentApplyById() {
       this.$api.talent.getTalentApplyById({ id: this.value }).then(({ data = {} }) => {
         if (data) {
-          console.log(data)
           // 处理字符串转数组
           if (typeof data.talentType === 'string' && data.talentType) {
             data.talentType = data.talentType.split(',')
@@ -638,7 +632,38 @@ export default {
       //console.log('getObj处理后的数据:', obj)
       return obj
     },
-    checkInfo (step) {
+    checkResumeList() {
+      this.$refs.talentResume.mergeResumeList()
+      // 检查每种类型是否都有记录
+      const resumeList = this.formData.resumeList || []
+      // 检查学历记录
+      const hasEducation = resumeList.some(item => 
+        item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f01'
+      )
+      if (!hasEducation) {
+        this.$message.error('请至少添加一条学历记录！')
+        return false
+      }
+      // 检查研修经历
+      const hasStudy = resumeList.some(item => 
+        item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f02'
+      )
+      if (!hasStudy) {
+        this.$message.error('请至少添加一条研修经历！')
+        return false
+      }
+      // 检查工作经历
+      const hasWork = resumeList.some(item => 
+        item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f03'
+      )
+      if (!hasWork) {
+        this.$message.error('请至少添加一条工作经历！')
+        return false
+      }
+      
+      return true
+    },
+    checkInfo(step) {
       switch (step) {
         case 0:
           if (this.formData.certId == "" || this.formData.certId == null) {
@@ -651,6 +676,7 @@ export default {
           } else return true
           break;
         case 1:
+          return this.checkResumeList()
           break;
         case 2:
           break;