diff --git a/src/router/index.js b/src/router/index.js index b25af7dd2..4de359e98 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -147,7 +147,17 @@ export const moduleRoutes = { isTab: true, title: "新增居民", }, - } + }, + { + path: "edit-resi", + props: true, + name: "edit-resi", + component: () => import("@/views/components/editResi"), + meta: { + isTab: true, + title: "编辑居民", + }, + } ], }; // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一 diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index fc105c67a..76657a86d 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -402,8 +402,8 @@ - + @@ -1293,9 +1293,15 @@ export default { } else if (index == 3) { if (event) { this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1; + if(value == 'unitedFrontFlag' || value == 'petitionOfficerFlag'){ + this.form.baseInfoDto.categoryInfo[value] = 1 + } this.form.specialDto.specialCategoryCodes.push(value); } else { this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value); + if(value == 'unitedFrontFlag' || value == 'petitionOfficerFlag'){ + this.form.baseInfoDto.categoryInfo[value] = 0 + } } } const map = { diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 791665279..5ffb29baf 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1,950 +1,1452 @@ + + + + + 取消 + 保存 + + + + + + + + - - diff --git a/src/views/components/editResiCopy.vue b/src/views/components/editResiCopy.vue new file mode 100644 index 000000000..791665279 --- /dev/null +++ b/src/views/components/editResiCopy.vue @@ -0,0 +1,950 @@ + + + + + + diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue new file mode 100644 index 000000000..321e2f478 --- /dev/null +++ b/src/views/components/resiExpand/editExpand.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue index ca51e964d..52003689c 100644 --- a/src/views/components/resiExpand/index.vue +++ b/src/views/components/resiExpand/index.vue @@ -69,7 +69,7 @@ - + 取消 保存 @@ -163,7 +163,7 @@ export default { childName: null,//子女姓名 childGender: null,//子女性别 childDeathDate: null,//子女死亡日期 - childDisabilityCategoyCode: null,//伤残类别 + childDisabilityCategoryCode: null,//伤残类别 childDisabilityLevel: null,//伤残等级 }, // 志愿者 @@ -192,11 +192,16 @@ export default { }, }; }, - props: {}, + props: { + operationType:{ + type:String, + default:'' + } + }, created() { - this.getOrgTree() }, activated() { + this.getOrgTree() }, mounted() { }, @@ -234,6 +239,7 @@ export default { }).catch((error) => { console.error('Error fetching options:', error); }); + this.getOrgTree() console.log(this.form, '子组件form'); console.log(this.formList, '子组件formList'); }) @@ -250,7 +256,6 @@ export default { this.$emit('hideExpand', this.formType) }, handleClickSUbmitExpand() { - console.log(this.form.parymemberInfoDto, '子组件提交的'); this.$emit('submitExpand', this.form, this.formType) }, handlePartyOrgCascadarChange(selectedNode) { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 962821f43..0a2ff28fc 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -24,7 +24,6 @@ -
@@ -274,8 +273,8 @@
- -
@@ -291,9 +290,9 @@ 提交
- - - --> + + - +
@@ -904,17 +904,19 @@ export default { handelClickCheckPassword() { this.$refs.checkPasswordFrom.validate(async vali => { if (vali) { - const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.checkPasswordFrom.password}`; + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; let parm = { - password + password: this.checkPasswordFrom.password } const { data, code, msg } = await requestPost(url, parm); if (code === 0) { - this.formName = "编辑居民"; - this.formType = 'edit' - this.dialogVisible = true; - this.$refs.baseForm.old_from(data); + // this.formName = "编辑居民"; + // this.formType = 'edit' + // this.dialogVisible = true; + // this.$refs.baseForm.old_from(data); this.showCheckPassword = false + this.$router.push({ name: 'edit-resi', query: { id: this.editUserId } , params: { idNum: data.idNum,mobile:data.mobile } }); + this.checkPasswordFrom.password = '' } else { this.$message.error(msg); } @@ -967,7 +969,7 @@ export default { }, async handleAdd() { - // 实现跳转新增后删除 + // 1.0版本弹框形式居民新增 // this.formType = 'add' // this.formName = "新增居民"; // this.editUserId = ""; diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue index 43764bfdc..ef295a470 100644 --- a/src/views/modules/plugins/change/resichange.vue +++ b/src/views/modules/plugins/change/resichange.vue @@ -283,7 +283,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiChangeTransfer from '../../../components/resiChangeTransfer.vue' diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index 35611ff0b..171580983 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -325,7 +325,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue index f4ca9a53c..ef2ed3ef9 100644 --- a/src/views/modules/plugins/change/resiwelfare.vue +++ b/src/views/modules/plugins/change/resiwelfare.vue @@ -278,7 +278,7 @@ import nextTick from 'dai-js/tools/nextTick' import deathSearch from '../../../components/deathSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index af035a396..de09574dc 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -278,7 +278,7 @@ import nextTick from 'dai-js/tools/nextTick' import resiSearch from '../../../components/blackSearch.vue' import resiForm from '../../../components/resiForm.vue' -import editResi from '../../../components/editResi.vue' +import editResi from '../../../components/editResiCopy.vue' import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../../components/resiTransfer.vue' diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index cff08638a..a6209b36c 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -157,9 +157,7 @@ export default { { index: 4, province: '身份', - value: [ - - ], + value: [], type: 'checkbox', option: [ { @@ -191,15 +189,14 @@ export default { }, formType: { type: String, - default: 'detail' + default: '' } }, created() { }, methods: { updatedForm() { - console.log(this.userInfo.baseInfoDto.categoryInfo); - if (!this.userInfo.baseInfoDto.categoryInfo) return; + if (this.formType == 'add'|| !this.userInfo.baseInfoDto.categoryInfo) return; const updateValue = (flag, dataIndex) => { const { tableData } = this.formData; const valueArray = tableData[dataIndex].value; @@ -223,6 +220,7 @@ export default { updateValue('subsistenceAllowanceFlag', 2); updateValue('veteranFlag', 2); updateValue('ensureHouseFlag', 2); + updateValue('specialSupportFlag', 2); updateValue('fertileWomanFlag', 2); updateValue('bereavedPersonFlag', 2); updateValue('volunteerFlag', 4); diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 36bc8659e..f16ffecaa 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -269,9 +269,9 @@
关系图谱
- +
人员标签
- +
{{ sectionItem.title }}