diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index c0253248..2eb74061 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -176,53 +176,33 @@
-
-
-
- * - 个人健康状况 -
- -
-
-
{{ e.dictName }}
- - - - -
-
-
-
-
- - - - + +
-
-
+
+
* - 残疾类别 + 残疾类别(可多选)
-
- +
+
+
{{ e.dictName }}
+
@@ -242,23 +222,15 @@
-
-
- - 基础保险（可多选） +
+
+ * + 基础保险(可多选)
-
- - - - {{ e.dictName }} - - +
+
+
{{ e.dictName }}
+
@@ -267,23 +239,15 @@
-
-
+
+
* - 保障措施（可多选） + 保障措施(可多选)
-
- - - - {{ e.dictName }} - - +
+
+
{{ e.dictName }}
+
@@ -550,32 +514,17 @@ export default { }, computed: { ...mapState(['user']), - - // userChange() { - // if(this.userList.length) { - // this.isEdit = true; - // this.form.name = this.userList[0].name - // this.form.idNumber = this.userList[0].idNumber - // return [this.isEdit,this.form.name,this.form.idNumber] - // } - // }, - // sexChange() { - // if(this.form.idNumber) { - // return this.form.sex = this.form.idNumber.substr(16, 1) % 2 == 0 ? '1' : '0' - // } - // } - }, watch:{ userList:{ handler: function (newValue,oldValue) { - this.isEdit = true; + this.isEdit = true; this.form.name =newValue[0].name this.form.idNumber = newValue[0].idNumber this.form.sex = this.form.idNumber.substr(16, 1) % 2 == 0 ? '1' : '0' - },deep:true + }, + deep: true, }, - }, onLoad(query) { @@ -632,15 +581,6 @@ export default { console.log(0,v); } }) - // this.helthList.filter((v)=>{ - // if(v.checked == true){ - // console.log(0); - // } - // arr.push(v.checked == true) - - // }) - // console.log(arr); - // this.formDataList[indexs][index].checkList[i].checked = !this.formDataList[indexs][index].checkList[i].checked }, userClick(row, i) { @@ -662,10 +602,6 @@ export default { this.sickList = this.namelist.map(v=>v.dictValue).join(',') }, - checkboxGroupChange(e) { - // console.log(e) - }, - nextStep() { const rules = this.rules() diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index f4f56999..9c439e92 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -16,8 +16,7 @@

{{ info.phone }}

- - 编辑 + 详情
@@ -27,166 +26,6 @@ {{ info.currentAddress }}
-
-
- - {{ $dict.getLabel('fpNation', info.nation) }} -
-
- - {{ $dict.getLabel('fpNation', info.nation) }} -
-
- - {{ $dict.getLabel('fpNation', info.nation) }} -
-
- - {{ $dict.getLabel('fpNation', info.nation) }} -
-
- - {{ $dict.getLabel('fpPoliticalOutlook', info.politicsStatus) }} -
-
- - {{ $dict.getLabel('fpEducation', info.education) }} -
-
- - {{ $dict.getLabel('fpStudentsInSchool', info.schoolStatus) }} -
-
- - {{ $dict.getLabel('fpHealth', info.healthyStatus) }} -
- -
- - {{ $dict.getLabel('fpNation', info.nation) }} -
-
- - {{ $dict.getLabel('fpNation', info.nation) }} -
- -

基础保障

-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.specialPovertySupport) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', info.specialPovertySupport) }} -
- -

务工就业

-
- - {{ $dict.getLabel('fpLaborSkills', info.labourStatus) }} -
-
- - {{ $dict.getLabel('fpLaborSkills', info.labourStatus) }} -
-
- - {{ $dict.getLabel('fpLaborSkills', info.labourStatus) }} -
-
- - {{ $dict.getLabel('fpLaborSkills', info.labourStatus) }} -
-
- - {{ info.workeMonths }} -
-
- - {{ info.workeMonths }} -
-
- - {{ info.workeMonths }} -
-
- - {{ info.workeMonths }} -
-
- - {{ info.workArea }} -
-
-
{{viewAll ? '收起详情 ' : '展开详情 '}}
-
@@ -229,14 +68,6 @@
编辑
-
{{ $dict.getLabel('fpPrtpStatus', info.status) || '-' }} @@ -347,9 +178,6 @@
-
申请解除风险
@@ -402,28 +230,21 @@ export default { } }, - computed: { ...mapState(['user']), isIncome() { if (!this.info.id) { return false } - return this.info.income8 > 0 || this.info.income8 > 0; - - }, isPoorStatus() { if (!this.info.id) { return false } - return (this.info.industrialAssistance || this.info.healthAssistance || this.info.employmentAssistance || this.info.educationalAssistance || this.info.financialAssistance || this.info.socialAssistance || this.info.publicWelfarePostAssistance); - - }, isFamilySituation() { @@ -569,13 +390,6 @@ export default { toAddView(text, pass) { this.$confirm('', text).then(() => { uni.navigateTo({url: `./MonitorAddView?pass=${pass}&id=${this.info.id}&status=${this.info.status}`}) - // this.$http.post(`/app/apppreventionreturntopoverty/examine?id=${this.id}&pass=${pass}`).then(res => { - // if (res.code === 0) { - // this.$u.toast('操作成功') - // uni.$emit('reload') - // this.getInfo() - // } - // }) }) }, @@ -596,13 +410,6 @@ export default { toRemove(text, pass,type) { this.$confirm('', text).then(() => { uni.navigateTo({url: `./MonitorRemoveView?pass=${pass}&id=${this.info.id}&status=${this.info.status}&type=${type}`}) - // this.$http.post(`/app/apppreventionreturntopoverty/relieve?id=${this.id}&pass=${pass}`).then(res => { - // if (res.code === 0) { - // this.$u.toast('操作成功') - // uni.$emit('reload') - // this.getInfo() - // } - // }) }) }, diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue index 7a36b96d..46506520 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue @@ -15,65 +15,9 @@ {{ item.age }}岁
-
-
- - {{ $dict.getLabel('fpNation', item.nation) }} -
-
- - {{ $dict.getLabel('fpPoliticalOutlook', item.politicsStatus) }} -
-
- - {{ $dict.getLabel('fpEducation', item.education) }} -
-
- - {{ $dict.getLabel('fpStudentsInSchool', item.schoolStatus) }} -
-
- - {{ $dict.getLabel('fpHealth', item.healthyStatus) }} -
-
- - {{ $dict.getLabel('fpLaborSkills', item.labourStatus) }} -
-
- - {{ item.workArea }} -
-
- - {{ item.workeMonths }}月 -
-
- - {{ $dict.getLabel('fpYesOrNo', item.basicMedicalTreatment) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', item.seriousIllnessInsurance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', item.endowmentInsurance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', item.subsistenceAllowance) }} -
-
- - {{ $dict.getLabel('fpYesOrNo', item.specialPovertySupport) }} -
-
-
-
- {{ item.isShow ? '收起详情' : '展开详情' }} - 编辑 + 查看详情 + 删除
@@ -128,7 +72,6 @@ export default { methods: { toAdd() { uni.navigateTo({ - // url: './MonitorAddFamilyMember?id=' + this.id url: `./MonitorAddFamilyMember?houseIdNumber=${this.houseIdNumber}&objectType=${this.objectType}` }) }, @@ -152,8 +95,8 @@ export default { }) }, - showMore(index) { - this.list[index].isShow = !this.list[index].isShow + showMore(id) { + uni.navigateTo({url: `./residentDetail?id=${id}`}) }, getInfo() { @@ -230,11 +173,13 @@ export default { .item-bottom { display: flex; + justify-content: space-between; + padding: 0 32px; + box-sizing: border-box; align-items: center; height: 94px; span { - flex: 1; height: 100%; line-height: 96px; color: #3975C6; diff --git a/src/apps/AppMonitoringObject/residentDetail.vue b/src/apps/AppMonitoringObject/residentDetail.vue new file mode 100644 index 00000000..84926ec8 --- /dev/null +++ b/src/apps/AppMonitoringObject/residentDetail.vue @@ -0,0 +1,271 @@ + + + + + \ No newline at end of file