无等级网格版合并

This commit is contained in:
aixianling
2022-06-13 09:57:52 +08:00
parent 3afde14618
commit c75a2b7fd3
130 changed files with 841 additions and 13020 deletions

View File

@@ -162,7 +162,7 @@
<div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog()"></div>
</AiFixedBtn>
<!-- 0待纳入1监测中2待解除3已解除4已驳回 -->
<div v-if="checkType == 1 && currIndex != 1">
<div v-if="checkType == 1 && currIndex != 1">
<div class="footer-btn" v-if="info.status == 1">
<div class="confirm-btn" @click="toAddView('您确认要申请解除此监测对象的风险吗?', '')">申请解除风险</div>
</div>
@@ -189,9 +189,9 @@
<div class="footer-btn" v-if="(info.status == 4 || info.status == 3) && userInfo != ''">
<div @click="del" v-if="$permissions('app_apppreventionreturntopoverty_del')">删除人员</div>
<div class="confirm-btn" @click="toAddView('您确认要将此居民纳入监测对象吗?', 1)">纳入监测</div>
</div>
</div>
</div>
</div>
</template>
@@ -252,8 +252,8 @@ export default {
return false
}
return (this.info.income1 || this.info.income2 || this.info.income3 || this.info.income4
|| this.info.income5|| this.info.income6|| this.info.income7|| this.info.income8 || this.info.income9 ||
this.info.income10 || this.info.income11 || this.info.income12 ||
|| this.info.income5|| this.info.income6|| this.info.income7|| this.info.income8 || this.info.income9 ||
this.info.income10 || this.info.income11 || this.info.income12 ||
this.info.income13 || this.info.income14 || this.info.income15)
},
@@ -276,7 +276,7 @@ export default {
this.isGirdUser()
this.getInfo()
})
this.id = query.id
this.getUserPopup()
},
@@ -374,7 +374,7 @@ export default {
this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
if (res.code === 0) {
this.info = res.data
let ylbxCount = 0
let ylCount = 0
if(res.data.family && res.data.family.length) {
@@ -386,14 +386,14 @@ export default {
ylCount = ylCount + 1
}
})
this.endNum = res.data.family.filter(item =>
this.endNum = res.data.family.filter(item =>
(item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
)
this.endNum = res.data.family.filter(v=>
this.endNum = res.data.family.filter(v=>
(v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
)
}
this.info.ylbxCount = ylbxCount
this.info.ylCount = ylCount
this.pageShow = true
@@ -411,7 +411,7 @@ export default {
uni.navigateTo({url: `./MonitorAddView?pass=${pass}&id=${this.info.id}&status=${this.info.status}`})
})
},
del() {
this.$confirm('', '您确认要要删除此监测对象的信息吗?').then(() => {
this.$http.post(`/app/apppreventionreturntopoverty/delete?ids=${this.id}`).then(res => {