diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ca3e58948..1335645c9 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -610,7 +610,7 @@ export default {
ageEnd: '',
integrityScoreFrom: null,//居民信息完整度はじめ
integrityScoreTo: null,//居民信息完整度end
- identity:'',
+ identity:null,
gender: '',
cultureLevel: '',
localResidenceFlag: '',
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 54014aa16..1009a8eec 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -568,7 +568,7 @@ export default {
clickAgencyItem(item) {
console.log(item);
if (item.level === 'neighborHood') {
- this.$router.push('/homeDetails/index?id=' + item.id)
+ this.$router.push('/homeDetails/index?id=' + item.id + '&breadList='+JSON.stringify(this.breadList))
} else {
this.toBread({
orgId: item.id,
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 39d0b2c7e..dfe271647 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -102,10 +102,10 @@
confirmBatch(command)">
+ @command="(command) => confirmBatch(command)" v-if="updeBtn" >
信息无误确认
- 全部确认
+ 全部确认
批量确认
@@ -212,7 +212,7 @@
变更记录
死亡登记
迁出登记
- 信息无误确认
+
@@ -295,6 +295,7 @@ export default {
},
data() {
return {
+ updeBtn:false,
showSercahStatus: false,
exportLoading:false,
exportBtn: false,
@@ -743,7 +744,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
+ // 确认无误居民信息提交
confirmBatch(command) {
+
if(command === '1'){
this.$confirm("是否全部确认信息", "提示", {
confirmButtonText: "确定",
@@ -1114,10 +1117,31 @@ export default {
}
})
},
-
+ //处理参数
+ extractSpecificKeys(obj, keys) {
+ const resultArray = [];
+ keys.forEach(key => {
+ if (key in obj) {
+ const value = obj[key];
+ if (Array.isArray(value)) {
+ resultArray.push(...value); // 展开数组并加入结果数组
+ } else if(value){
+ resultArray.push(value); // 将非数组的值加入结果数组
+ }
+ }
+ });
+ return resultArray;
+ },
async confirresiBatch(ids) {
- const url = `/actual/base/residentCategoryUpdateInfo/unchangePartUpdate`;
- let params = {ids};
+ this.valueb = this.$route.query.param1;
+ let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
+ _obj.attentionCrowds = _obj.attentionCrowds.flat()
+ let updateCategorys = this.extractSpecificKeys(_obj,['attentionCrowds','healthStatus','specialCategoryCodes','identity'])
+ const url = `/actual/base/residentCategoryUpdateInfo/${ids?'unchangePartUpdate':'unchangeMultiUpdate'}`;
+ let params = {ids,partyFlag:_obj.partyFlag,updateCategorys};
+ if(!ids){
+ params = { ..._obj,updateCategorys}
+ }
const { data, code, msg } = await requestPost(url, params);
if (code !== 0) {
return this.$message.error(msg);
@@ -1242,7 +1266,12 @@ export default {
watch: {
$route: {
handler: function (newVal, oldVal) {
- if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type){
+ if(newVal.name == "base-resi" && newVal.query.type === 'residentCategory'){
+ this.updeBtn = true
+ }else {
+ this.updeBtn = false
+ }
+ if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type ==='updateResi'){
this.$nextTick(()=>{
this.$refs.myResiSearch.form.updateCategory = newVal.query.category;
this.handleSearchFrom();
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 1ef1bd252..ba68bc4e8 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -144,7 +144,7 @@
-