From 1a2a04f660570ebe48e270ddee453c198944b2c1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 20 Jun 2024 14:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=A6=81=E6=AD=A2=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/addResi.vue                    |  2 +-
 src/views/modules/home/index.vue                    |  2 +-
 src/views/modules/portrayal/jumin/cpts/staffTag.vue | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

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 @@
         </div>
 
         <div class="m-box m-tx" style="position: relative;">
-          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span> <span style="color: #ff1200;">（数据截止到{{yesterdayDate}}）</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
+          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span> <span style="color: #cccccc;">（数据截止到{{yesterdayDate}}）</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
                 src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</div>
           </div>
           <div style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box" >
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 @@
                         <el-form-item v-if="scope.row.type == 'radio'">
                             <el-radio-group v-model.trim="scope.row.value" v-for="(item, index) in scope.row.option"
                                 :key="index" @change="handeleClickRadio(item.value)">
-                                <el-radio :label="item.value" :disabled="formType == 'detail'"><span
+                                <el-radio :label="item.value" :disabled="formType == 'detail' || item.disabled"><span
                                         style="margin-right: 50px;" :value="item.value">{{ item.label
                                         }}</span></el-radio>
                             </el-radio-group>
@@ -19,7 +19,7 @@
                             v-if="scope.row.type == 'checkbox'">
                             <el-checkbox-group v-model.trim="scope.row.value">
                                 <el-checkbox @change="handeleClickchckbox(item, $event, scope.$index)"
-                                    :disabled="formType == 'detail'" v-for="(item, index) in scope.row.option"
+                                    :disabled="formType == 'detail' || item.disabled" v-for="(item, index) in scope.row.option"
                                     :key="index" :label="item.value">{{ item.label
                                     }}</el-checkbox>
                             </el-checkbox-group>
@@ -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';
                     }
                 }
             }