diff --git a/public/downloadFile/expertTemplate.xlsx b/public/downloadFile/expertTemplate.xlsx index 4689d337fbfe057fdadd61fce361ebc22065d26b..a7ffd288f63a5abfe23250fa53d92f7f0e893d95 100644 Binary files a/public/downloadFile/expertTemplate.xlsx and b/public/downloadFile/expertTemplate.xlsx differ diff --git a/src/views/expert/components/expertEdit.vue b/src/views/expert/components/expertEdit.vue index 8b5ed918ba7495f92943144e757494032e0dee2a..0c8e564a74b0851e032f1b0e5dc715091f2fda8d 100644 --- a/src/views/expert/components/expertEdit.vue +++ b/src/views/expert/components/expertEdit.vue @@ -64,6 +64,26 @@ </a-form-model-item> </a-col> </a-row> + <a-row> + <a-col :span="4" class="bg-gray"> + <div class="required">学历</div> + </a-col> + <a-col :span="20"> + <a-form-model-item ref="education" prop="education"> + <para-select v-model="formData.education" :typeId="8" :width="180" /> + </a-form-model-item> + </a-col> + </a-row> + <!-- <a-row> + <a-col :span="4" class="bg-gray"> + <div class="required">学位</div> + </a-col> + <a-col :span="20"> + <a-form-model-item prop="degree"> + <para-select v-model="formData.degree" :width="180" :typeId="9" /> + </a-form-model-item> + </a-col> + </a-row> --> <a-row type="flex"> <a-col :span="4" class="bg-gray"> <div class="special-middle"> @@ -125,7 +145,7 @@ export default { return { loading: true, isShow: false, - formData: { id: null, personName: null, sex: '', birthday: null, certId: null, mobile: null, remark: null, email: null, title: null, specList: [], treeCode: null }, + formData: { id: null, personName: null, sex: '', birthday: null, certId: null, mobile: null, remark: null, email: null, education: null, degree: null, title: null, specList: [], treeCode: null }, rules: { certId: [ { required: true, message: '请输入证件号', trigger: 'blur' }, @@ -162,6 +182,8 @@ export default { ], personName: [{ required: true, message: '请输入姓名', trigger: 'blur' }], workUnit: [{ required: false, message: '请输入工作单位', trigger: 'blur' }], + education: [{ required: true, message: '请选择学历', trigger: 'change' }], + // degree: [{ required: true, message: '请选择学位', trigger: 'change' }], sex: [{ required: true, message: '请选择性别', trigger: 'change' }], title: [{ required: true, message: '请选择职称', trigger: 'change' }], treeCode: [{ required: false, message: '请选择单位', trigger: 'change' }], diff --git a/src/views/expert/components/expertImport.vue b/src/views/expert/components/expertImport.vue index 02180ac5c823a104aa3844d469abb2a378d35bd5..a9158efadba38c8bdd80f1c57e8409966e62849b 100644 --- a/src/views/expert/components/expertImport.vue +++ b/src/views/expert/components/expertImport.vue @@ -47,6 +47,7 @@ export default { { title: "手机号", dataIndex: "mobile", align: 'center' }, { title: "邮箱", dataIndex: "email", align: 'center' }, { title: "职称", dataIndex: "titleName", align: 'center' }, + { title: "学历", dataIndex: "educationName", align: 'center' }, { title: "专业", dataIndex: "specName", align: 'center' }, { title: '工作单位', dataIndex: 'unitName', align: 'center' }, { title: '验证结果', scopedSlots: { customRender: 'msg' }, align: 'center' }, @@ -92,6 +93,9 @@ export default { if (!!!e.专业) { msg += ';专业不能为空!' } + if (!!!e.学历) { + msg += ';学历不能为空!' + } if (!!!e.职称) { msg += ';职称不能为空!' } @@ -107,7 +111,7 @@ export default { birthday = personBirthday(certId) + ' 00:00:00' } - let expert = { personName: e.姓名, certId: certId, sex: gender, birthday: birthday, mobile: e.手机号, email: e.邮箱, specName: e.专业, titleName: e.职称, unitName: e.工作单位, msg: msg } + let expert = { personName: e.姓名, certId: certId, sex: gender, birthday: birthday, mobile: e.手机号, email: e.邮箱, specName: e.专业, educationName: e.学历, titleName: e.职称, unitName: e.工作单位, msg: msg } exportList.push(expert) certList.push(e.证件号) mobileList.push(e.手机号) diff --git a/src/views/expert/components/expertView.vue b/src/views/expert/components/expertView.vue index f9d7919b1272cfd2818df57c5e97b0aac6da7a41..bafdf22a1e417d5b1273cc3ccd1998179728fb13 100644 --- a/src/views/expert/components/expertView.vue +++ b/src/views/expert/components/expertView.vue @@ -29,6 +29,20 @@ {{expertInfo.titleName}} </a-col> </a-row> + <a-row> + <a-col :span="4" class="bg-gray"> + 学历: + </a-col> + <a-col :span="20"> + {{expertInfo.educationName}} + </a-col> + <!-- <a-col :span="4" class="bg-gray"> + 学位: + </a-col> + <a-col :span="8"> + {{expertInfo.degreeName}} + </a-col> --> + </a-row> <a-row> <a-col :span="4" class="bg-gray"> 联系电话: diff --git a/src/views/expert/index.vue b/src/views/expert/index.vue index 9dc5347b85c1e48f4c1ad7d4e9c93e8e3c3dd418..612d2ff6fb1c22c6bbdae07185f91f2f1825595a 100644 --- a/src/views/expert/index.vue +++ b/src/views/expert/index.vue @@ -31,7 +31,7 @@ <a-divider style="height: 1px; background-color: #e8e8e8;" /> <div class="submit-btn"> <a-button type="primary" @click="addExpert">添加</a-button> - <a-button type="primary" @click="importExcel" v-if="isTopGov">导入</a-button> + <a-button type="primary" @click="importExcel">导入</a-button> <a-button type="primary" @click="exporExcel">导出excel</a-button> </div> <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">