diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index a3329fca..dcbf5263 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -111,30 +111,15 @@ {{ info.income9 }}元 - + +

风险解除跟踪

({{ isPoorStatus ? '已填写' : '未填写' }})
- 编辑 + 编辑
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue index ce6980d6..098b2086 100644 --- a/src/apps/AppMonitoringObject/MonitorAddView.vue +++ b/src/apps/AppMonitoringObject/MonitorAddView.vue @@ -54,45 +54,18 @@ export default { }, methods: { submit() { + var url = '' + var params = { + pass: this.pass, + opinion: this.opinion, + files: this.filesList, + id: this.id, + } if(this.pass == 1) { if(this.status == 1) { // 解除 - this.$http.post(`/app/apppreventionreturntopoverty/relieve`,null,{ - params: { - pass: this.pass, - opinion: this.opinion, - files: this.filesList, - id: this.id, - } - }).then(res => { - if (res.code == 0) { - this.$u.toast('提交成功') - uni.$emit('reload') - setTimeout(() =>{ - uni.navigateBack({ - delta: 2 - }) - },600) - } - }) + url = '/app/apppreventionreturntopoverty/relieve' } else if (this.status == 4 || this.status == 3 || this.status == 0) { // 纳入监测 - this.$http.post(`/app/apppreventionreturntopoverty/examine`,null,{ - params: { - pass: this.pass, - opinion: this.opinion, - files: this.filesList, - id: this.id, - } - }).then(res => { - if (res.code == 0) { - this.$u.toast('提交成功') - uni.$emit('reload') - setTimeout(() =>{ - uni.navigateBack({ - delta: 2 - }) - },600) - } - }) + url = `/app/apppreventionreturntopoverty/examine` } } else { if(this.status == '0') { @@ -114,47 +87,27 @@ export default { } if(this.status == 0) { // 纳入监测 - this.$http.post(`/app/apppreventionreturntopoverty/examine`, null,{ - params: { - // pass: this.pass, - id: this.id, - riskType: this.riskType, - opinion: this.opinion, - files: this.filesList, - } - }).then(res => { - if (res.code === 0) { - this.$u.toast('提交成功') - uni.$emit('reload') - setTimeout(() => { - uni.navigateBack({ - delta: 2 - }) - },600) - } - }) - } else { // 驳回 - this.$http.post(`/app/apppreventionreturntopoverty/relieve`, null,{ - params: { - // pass: this.pass, - id: this.id, - riskEliminationMethod: this.riskEliminationMethod, - opinion: this.opinion, - files: this.filesList, - } - }).then(res => { - if (res.code === 0) { - this.$u.toast('提交成功') - uni.$emit('reload') - setTimeout(() => { - uni.navigateBack({ - delta: 2 - }) - },600) - } - }) + url = `/app/apppreventionreturntopoverty/examine` + } else { + url = `/app/apppreventionreturntopoverty/relieve` // 驳回 } } + + let fromData = new FormData() + for (let key in params) { + fromData.append(key, params[key]) + } + this.$http.post(url , formData).then(res => { + if (res.code === 0) { + this.$u.toast('提交成功') + uni.$emit('reload') + setTimeout(() => { + uni.navigateBack({ + delta: 2 + }) + },600) + } + }) } }, } diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue index d6ab38be..426e0c9f 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue @@ -20,7 +20,7 @@ 住房面积(m²)
- +
@@ -31,7 +31,7 @@ 与村主干路距离(公里)
- +
@@ -42,7 +42,7 @@ 入户路类型
- +
@@ -53,7 +53,7 @@ 主要燃料类型
- +
@@ -91,8 +91,8 @@ 是否住房损坏
-
-
+
+
@@ -103,8 +103,8 @@ 是否饮水设施损坏
-
-
+
+
@@ -115,8 +115,8 @@ 是否有卫生厕所
-
-
+
+
@@ -127,8 +127,8 @@ 是否通生活用电
-
-
+
+
@@ -139,8 +139,8 @@ 是否通广播电视
-
-
+
+
@@ -155,7 +155,7 @@ 耕地面积(亩)
- +
@@ -167,7 +167,7 @@ 林果面积(亩)
- +
@@ -179,7 +179,7 @@ 林地面积(亩)
- +
@@ -191,7 +191,7 @@ 退耕还林面积(亩)
- +
@@ -202,7 +202,7 @@ 牧草地面积(亩)
- +
@@ -213,7 +213,7 @@ 水面面积(亩)
- +
@@ -227,8 +227,8 @@ 是否有龙头企业带动
-
-
+
+
@@ -239,8 +239,8 @@ 是否通生产用电
-
-
+
+
@@ -251,8 +251,8 @@ 是否加入农民专业合作社
-
-
+
+
@@ -263,8 +263,8 @@ 是否有创业致富带头人带动
-
-
+
+
@@ -281,9 +281,27 @@ export default { return { form: { objectType: '', - dilapidatedHousehold: '02', - drinkingWaterSafety: '02', - move: '02' + dilapidatedHousehold: '', + drinkingWaterSafety: '', + move: '02', + houseArea: '', + trunkRoadDistance: '', + houseRoadType: '', + fuelType:'', + houseDamage: '', + drinkingWaterDamage: '', + toilet: '', + electric: '', + television: '', + cultivatedLandArea: '', // 耕地面积 + orchardArea: '', + woodlandArea: '', + grainForGreenArea: '', + grazingGrasslandArea: '', + longtouqiye: '', + produceElectric: '', + nongheshe: '', + cyzfdtr: '', }, id: '', girdId: '', @@ -294,7 +312,7 @@ export default { onLoad(query) { - this.$dict.load(['fpYesOrNo', 'fpRiskType']).then(() => { + this.$dict.load(['fpYesOrNo', 'fpRiskType','fpHouseRoadType','fpFuelType']).then(() => { this.getInfo(query.id) }) this.id = query.id @@ -374,6 +392,9 @@ export default { } } } + ::v-deep .AiSelect .display { + justify-content: flex-end; + } .form-group { background: #fff; diff --git a/src/apps/AppMonitoringObject/MonitorIncome.vue b/src/apps/AppMonitoringObject/MonitorIncome.vue index 7b4a33bc..5ef68ce8 100644 --- a/src/apps/AppMonitoringObject/MonitorIncome.vue +++ b/src/apps/AppMonitoringObject/MonitorIncome.vue @@ -6,28 +6,6 @@
工资性收入(元)
-
- -
- - -
-
-
- 生产经营收入(元) -
-
- -
-
-
-
-
-
- 计划生育金(元) -
@@ -37,7 +15,7 @@
- 资产收益扶贫分红收入 + 生产经营收入(元)
+
+
+
+ 计划生育金(元) +
+
+ +
+
+
+
+
+
+ 资产收益扶贫分红收入 +
+
+ +
+
+
养老保险金(元)
-
@@ -64,7 +64,7 @@ 低保金(元)
-
@@ -75,7 +75,7 @@ 特困供养金(元)
-
@@ -86,7 +86,7 @@ 生态补偿金(元)
-
@@ -97,7 +97,7 @@ 财产性收入(元)
-
@@ -108,7 +108,7 @@ 其他财产性收入
-
@@ -119,7 +119,7 @@ 转移性收入(元)
-
@@ -130,7 +130,7 @@ 其他转移性收入(元)
-
@@ -141,7 +141,7 @@ 生产经营性支出(元)
-
@@ -152,7 +152,7 @@ 纳入监测对象的收入参考范围
-
@@ -163,7 +163,7 @@ 纳入监测对象的人均收入参考范围
-
@@ -186,7 +186,14 @@ export default { income4: '', income5: '', income6: '', - income7: '' + income8: '', + income9: '', + income10: '', + income11: '', + income12: '', + income13: '', + income14: '', + income15: '', }, id: '', girdId: '', diff --git a/src/apps/AppMonitoringObject/MonitorPoorStatus.vue b/src/apps/AppMonitoringObject/MonitorPoorStatus.vue index 7b442a62..1bd3f17f 100644 --- a/src/apps/AppMonitoringObject/MonitorPoorStatus.vue +++ b/src/apps/AppMonitoringObject/MonitorPoorStatus.vue @@ -8,7 +8,7 @@ 工资性收入情况
- +
@@ -19,7 +19,7 @@ 生产经营性收入情况
- +
@@ -30,7 +30,7 @@ 财产性收入情况
- +
@@ -38,10 +38,10 @@
* - 理财收入情况 + 理赔收入情况
- +
@@ -52,7 +52,7 @@ 转移性收入情况
- +
@@ -63,7 +63,7 @@ 生产经营支出情况
- +
@@ -74,7 +74,7 @@ 合规自然支出情况
- +
@@ -92,16 +92,13 @@ export default { return { result: '', form: { - isRisk: '02', - riskEliminationMethod: '', - riskEliminationDate: '', - industrialAssistance: '', - healthAssistance: '', - employmentAssistance: '', - educationalAssistance: '', - financialAssistance: '', - socialAssistance: '', - publicWelfarePostAssistance: '', + fxxcIncome1: '', + fxxcIncome2: '', + fxxcIncome3: '', + fxxcIncome4: '', + fxxcIncome5: '', + fxxcIncome6: '', + fxxcIncome7: '', }, id: '', girdId: '', diff --git a/src/apps/AppMonitoringObject/familyRisk.vue b/src/apps/AppMonitoringObject/familyRisk.vue index 3e5b2f09..2d17f2dc 100644 --- a/src/apps/AppMonitoringObject/familyRisk.vue +++ b/src/apps/AppMonitoringObject/familyRisk.vue @@ -19,7 +19,7 @@ 脱贫年度
- +
@@ -33,7 +33,7 @@ 风险因素
- +
@@ -44,7 +44,7 @@ 因自然灾害事项
- +
@@ -58,8 +58,8 @@ 是否军烈属
-
-
+
+
@@ -70,8 +70,8 @@ 是否义务阶段失学辍学
-
-
+
+
@@ -82,7 +82,7 @@ 义务阶段未上学原因
- +
@@ -97,15 +97,27 @@ export default { name: 'familyRisk', data() { return { - form: {}, + form: { + objectType: '', + povertyYear: '', + riskType: '', + naturalDisasterType: '', + militaryMartyrs: '', + dropOutOfSchool: '', + dropOutOfSchoolReason: '', + }, value: '', } }, + onLoad() { + this.$dict.load('fpYera','fpType','fpRiskType','fpNaturalDisaster') + }, onShow() { document.title = '家庭风险情况' }, - onLoad() {}, - methods: {} + methods: { + + } }