diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 2af73e933..da3fff19e 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1253,12 +1253,12 @@ export default { children: [{ label: '入职时间', itemType: "datepicker1", - formName: "hiredate", + formName: "hireData", opction: [] }, { label: '岗位类型', itemType: "select1", - formName: "jobPost", + formName: "postTypes", multiple:true, collapseTags:true, opction: [] @@ -1528,8 +1528,8 @@ export default { specialCategoryCode: [] }, postDto: { - hiredate: '',//入职时间 - jobPost: [],//岗位类型 + hireData: '',//入职时间 + postTypes: [],//岗位类型 userId: '' }, birthRecordDTO: { @@ -1775,7 +1775,7 @@ export default { await this.getDictData('chronic_disease_code', 'chronicDiseaseCode') }, async getWelfareDict () { - await this.getDictData('public_welfare_post_type', 'jobPost') + await this.getDictData('public_welfare_post_type', 'postTypes') }, async getUnemployment () { await this.getDictData('unemployment_reason', 'unemploymentReason') @@ -2705,13 +2705,13 @@ export default { // 公益岗人员信息详情 getWelfareDetailById (id) { if (this.newForm.postDto) return - this.$http.post(`/actual/base/publicWelfarePost/detail`, { id: id }).then(({ data: res }) => { + this.$http.get(`/actual/base/resiCategorized/publicWelfarePost/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); } else { this.form.postDto = res.data ? res.data : { - hiredate: '',//入职时间 - jobPost: [], //岗位类型 + hireData: '',//入职时间 + postTypes: [], //岗位类型 userId: id } diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index d7bfb9be9..fb2a56f04 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -1426,7 +1426,7 @@
入职时间:
{{ - postDto.hiredate ? postDto.hiredate : "--" + postDto.hireData ? postDto.hireData : "--" }}
@@ -1574,7 +1574,7 @@ export default { PostText() { let text = "--"; this.PostDictonArr.forEach((item) => { - if (item.value == this.postDto.jobPost) { + if (item.value == this.postDto.postTypes) { text = item.label; } }); @@ -2029,6 +2029,7 @@ export default { } else if (tab._props.label == "更新记录") { this.getChangeRecordDetailById(); } else if (tab._props.label == "公益岗人员") { + this.getPostNation(); this.getChangepostDtoById(); } }, @@ -2062,9 +2063,8 @@ export default { }, async getChangepostDtoById() { try { - const { data } = await this.$http.post( - `/actual/base/publicWelfarePost/detail`, - { id: this.resiId } + const { data } = await this.$http.get( + `/actual/base/resiCategorized/publicWelfarePost/detail/${this.resiId}` ); if (data.data == null) { this.postDto = {}; @@ -2448,7 +2448,7 @@ export default { async getPostNation() { try { let { data } = await this.$http.post("sys/dict/data/dictlist", { - dictType: "welfare_post", + dictType: "public_welfare_post_type", }); this.PostDictonArr = data.data; } catch (error) {