diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 7f9bfbac2..411771526 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -1336,7 +1336,7 @@ export default { 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} + let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0,sex,age} this.form.baseInfoDto.categoryInfo.fertileWomanFlag = this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0; this.$refs['stafftag'].updatedForm(obj); this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag']; diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index ba68bc4e8..b2dbead49 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -144,7 +144,7 @@
-
居民信息更新情况 (数据截止到{{yesterdayDate}})
居民信息更新情况 (数据截止到{{yesterdayDate}})
更新设置
diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index e1cacc797..c5a05b80f 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -10,7 +10,7 @@ - {{ item.label }} @@ -19,7 +19,7 @@ v-if="scope.row.type == 'checkbox'"> {{ item.label }} @@ -83,7 +83,8 @@ export default { option: [ { label: '老年人', - value: 'oldPeopleFlag' + value: 'oldPeopleFlag', + disabled:false }, { label: '低保', @@ -195,6 +196,9 @@ export default { this.formData.tableData[2].value.push(key); }else{ this.formData.tableData[2].value = this.formData.tableData[2].value.filter(item => item !== key); + this.formData.tableData[2].option[0].disabled = val.age<60; + this.formData.tableData[2].option[6].disabled = val.age>14; + this.formData.tableData[2].option[4].disabled = val.sex === '1'; } } }