diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index 2fa2dc1d3..76bf83305 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -321,7 +321,7 @@
人员标签
-
+
@@ -598,7 +598,6 @@ export default {
opctionUrl: 'sys/dict/data/dictlist',
opctionParams: { dictType: 'oldPeople_categories' },
opction:[]
-
},
{
label: "居住情况",
@@ -1202,10 +1201,12 @@ export default {
if (this.form.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) {
const _id = this.form.baseInfoDto.idNum.substr(0, 6)
- const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum)
- this.form.baseInfoDto.birthday = birth
- this.form.baseInfoDto.gender = sex == 1 ? '1' : '2'
- this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0
+ const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
+ this.form.baseInfoDto.birthday = birth;
+ this.form.baseInfoDto.gender = sex == 1 ? '1' : '2';
+ // this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
+ let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0}
+ this.$refs['stafftag'].updatedForm(obj);
// this.form.IS_BDHJ = huji == _id ? '1' : ''
// 身份证前端验证角色方法 因原型没有注释
// this.validateIdcard(this.form.idNum)
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ca9cd879d..73865aa08 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -427,6 +427,16 @@ export default {
label: "邪教人员",
value: "xiejiaorenyuan",
children: null
+ },
+ {
+ label: "统战人员",
+ value: "tongzhanrenyuan",
+ children: null
+ },
+ {
+ label: "信访人员",
+ value: "xinfangrenyaun",
+ children: null
}
],
careerStatusList: [],
@@ -440,6 +450,7 @@ export default {
ageEnd: '',
integrityScoreFrom: null,//居民信息完整度はじめ
integrityScoreTo: null,//居民信息完整度end
+ identity:'',
gender: '',
cultureLevel: '',
localResidenceFlag: '',
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 1b5048f7e..d6f8247bb 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -602,48 +602,6 @@ export default {
this.$refs.myResiSearch.form.categoryKey = categoryKey;
this.$refs.myResiSearch.form.agencyId = agencyId;
}
-
- // if (this.valueb == '党员') {
- // _obj.partyFlag = 1
- // this.getTableData(_obj);
- // // console.log("this.valueb",this.valueb)
- // } if (this.valueb == '残疾人') {
- // _obj.healthStatus.push('DISABILITY_FLAG');
- // this.getTableData(_obj);
- // } if (this.valueb == '退役军人') {
- // _obj.attentionCrowds.push('VETERAN_FLAG');
- // _obj.partyFlag = 1
- // this.getTableData(_obj);
- // }
- // else {
- // // 处理 categoryKey
- // if (Array.isArray(categoryKey) && categoryKey.length) {
- // _obj.categoryKey = categoryKey.join(",");
- // } else {
- // _obj.categoryKey = "";
- // }
- // // 处理 agencyId
- // if (Array.isArray(agencyId) && agencyId.length) {
- // _obj.agencyId = agencyId[agencyId.length - 1];
- // } else {
- // _obj.agencyId = "";
- // }
- // _obj.level = level || "";
- // _obj.orgType = level || "";
- // _obj = { ..._obj, ...this.searchAgencyObj };
- // if (type) {
- // this.currentPage = 1;
- // }
- // console.log("this.valueb", _obj)
- // this.getTableData(_obj);
- // this.searchForm = _obj;
- // // 还原form的值
- // this.$refs.myResiSearch.form.categoryKey = categoryKey;
- // this.$refs.myResiSearch.form.agencyId = agencyId;
- // }
-
-
-
},
// 居民多选是否禁止选中
// checkSelectable (row, index) {
@@ -1199,18 +1157,35 @@ export default {
this.$refs.myResiSearch.form.healthStatus = [];
this.$refs.myResiSearch.form.specialCategoryCodes = [];
this.$refs.myResiSearch.form.partyFlag=null;
- if (newVal.params.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.params.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.params.category === 'VETERAN_FLAG'|| newVal.params.category === 'ENSURE_HOUSE_FLAG'|| newVal.params.category === 'OLD_PEOPLE_FLAG') {
+ if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG') {
this.$refs.myResiSearch.form.attentionCrowds.push(
- newVal.params.category
+ newVal.query.category
);
- } else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){
+ } else if(newVal.query.category === 'CHRONIC_DISEASE_FLAG' ||newVal.query.category === 'SERIOUS_ILLNESS_FLAG'||newVal.query.category === 'DISABILITY_FLAG'){
this.$refs.myResiSearch.form.healthStatus.push(
- newVal.params.category
+ newVal.query.category
);
- }else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){
- this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"];
- }else if(newVal.params.category === 'PARTY_FLAG'){
+ }else if(newVal.query.category === 'SQJZ_FLAG' || newVal.query.category === 'AZBJ_FLAG' || newVal.query.category === 'DRUG_FLAG' || newVal.query.category === 'XJRY_FLAG' || newVal.query.category === 'ZSZHJSB_FLAG' || newVal.query.category === 'UNITED_FRONT_FLAG'|| newVal.query.category === 'PETITION_OFFICER_FLAG' || newVal.query.category === 'BLQSN_FLAG'){
+ let obj = {
+ SQJZ_FLAG:'shequjiaozheng',
+ AZBJ_FLAG:'anzhibangjiao',
+ DRUG_FLAG:'xidurenyuan',
+ XJRY_FLAG:'xiejiaorenyuan',
+ ZSZHJSB_FLAG:'zhaoshizhaohuojingshenbing',
+ UNITED_FRONT_FLAG:'tongzhanrenyuan',
+ PETITION_OFFICER_FLAG:'xinfangrenyaun',
+ BLQSN_FLAG:'buliangqingshaonian'
+ }
+ this.$refs.myResiSearch.form.specialCategoryCodes = [obj[newVal.query.category]];
+ }else if(newVal.query.category === 'PARTY_FLAG'){
this.$refs.myResiSearch.form.partyFlag =1;
+ }else if(newVal.query.category === 'BUILDING_CHIEF_FLAG' || newVal.query.category === 'VOLUNTEER_FLAG' || newVal.query.category === 'UNIT_CHIEF_FLAG' || newVal.query.category ==='PUBLIC_WELFARE_FLAG'){
+ console.log(newVal.query.category);
+ this.$refs.myResiSearch.form.identity = newVal.query.category;
+ }else if(newVal.query.category === 'MASS_FLAG'){
+ this.$refs.myResiSearch.form.partyFlag = 0;
+ }else if(newVal.query.category === 'LEAGUE_FLAG'){
+ this.$refs.myResiSearch.form.partyFlag = 2;
}
this.handleSearchFrom();
});
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 844f56cc4..58b95ff24 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -630,7 +630,7 @@ export default {
handelClickToResi(e){
this.$router.push({
name: "base-resi",
- params: {
+ query: {
category: e.residentCategory || null,
},
});
diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
index f0a896b1b..14dc06c46 100644
--- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue
+++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
@@ -69,10 +69,10 @@ export default {
label: '慢病',
value: 'chronicDiseaseFlag'
},
- {
- label: '死亡',
- value: 'deathFlag'
- }
+ // {
+ // label: '死亡',
+ // value: 'deathFlag'
+ // }
]
},
{
@@ -109,7 +109,7 @@ export default {
value: 'floatingFlag'
},{
label: '新阶层人士',
- value: 'newstratumflag'
+ value: 'newStratumFlag'
}
]
},
@@ -170,8 +170,17 @@ export default {
console.log(error);
}
},
- updatedForm() {
+ updatedForm(val) {
this.formData.tableData[0].value = 0;
+ if(val){
+ for (let key in val) {
+ if (val[key] === 1) {
+ this.formData.tableData[2].value.push(key);
+ }else{
+ this.formData.tableData[2].value = this.formData.tableData[2].value.filter(item => item !== key);
+ }
+ }
+ }
if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return;
const updateValue = (flag, dataIndex) => {
const { tableData } = this.formData;
@@ -208,6 +217,8 @@ export default {
updateValue('specialSupportFlag', 2);
updateValue('fertileWomanFlag', 2);
updateValue('bereavedPersonFlag', 2);
+ updateValue('floatingFlag', 2);
+ updateValue('newstratumflag', 2);
updateValue('volunteerFlag', 4);
updateValue('buildingChiefFlag', 4);
updateValue('unitChiefFlag', 4);