kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

无等级网格版合并

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
src/apps/AppMonitoringObject/Add.vue
View File

@@ -85,7 +85,7 @@
</div>
<div class="right">
<input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"
placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="isEdit"/>
placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" disabled/>
</div>
</div>
</div>
@@ -100,18 +100,6 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i>*</i>
<span>共同生活家庭人口数</span>
</div>
<div class="right">
<input placeholder="请输入" type="idcard" v-model="form.familyCount" :maxlength="20"
placeholder-style="color: #999; font-size: 30rpx;" :disabled="isEdit"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -495,7 +483,6 @@ export default {
foreignWorkers: '',
foreignWorkersAddress: '',
houseIdNumber: '',
familyCount: '',
},
$areaId: '',
girdInfo: {},
@@ -620,9 +607,6 @@ export default {
if (!this.form.idNumber) {
return this.$u.toast('请输入身份证号')
}
if (!this.form.familyCount) {
return this.$u.toast('请输入家庭人口数')
}
if (!this.form.phone) {
return this.$u.toast('请输入联系方式')
}
@@ -739,14 +723,14 @@ export default {
this.guaranteeCheckList[index].checked = true
})
}
if(res.data.healthyStatusList) {
res.data.healthyStatusList = res.data.healthyStatus.split(',')
this.helthList.map(items => {
items.checked = res.data.healthyStatusList.includes(items.dictValue)
})
}
this.form = { ...this.form, ...res.data }
if (this.form.photo) {

22
src/apps/AppMonitoringObject/Detail.vue
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 => {

8
src/apps/AppMonitoringObject/MonitorAddLog.vue
View File

@@ -54,7 +54,7 @@ export default {
}else {
document.title = this.id ? '编辑走访日志' : '添加走访日志'
}
},
methods: {
getInfo() {
@@ -80,7 +80,7 @@ export default {
return this.$u.toast('请输入走访内容')
}
}
this.flag = true
this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
detail: this.detail,
@@ -98,7 +98,7 @@ export default {
delta: 1
})
}, 300)
}
})
}
@@ -109,7 +109,7 @@ export default {
<style lang="scss">
.form {
padding-bottom: 120px;
.help {
padding: 32px;
box-sizing: border-box;

8
src/apps/AppMonitoringObject/MonitorAddView.vue
View File

@@ -69,10 +69,10 @@ export default {
}
if(this.status == 1) {
url = '/app/apppreventionreturntopoverty/relieve' // 解除
} else if (this.status == 4 || this.status == 3) {
} else if (this.status == 4 || this.status == 3) {
if(!this.riskType) {
return this.$u.toast('请选择风险因素')
}
}
url = `/app/apppreventionreturntopoverty/examine` // 纳入监测
}
} else { // 网格员
@@ -94,7 +94,7 @@ export default {
this.filesList = files.join(',')
}
if(this.status == 0 || this.status == 3 || this.status == 4) {
if(this.status == 0 || this.status == 3 || this.status == 4) {
url = `/app/apppreventionreturntopoverty/examine` // 纳入监测申请
} else {
url = `/app/apppreventionreturntopoverty/relieve` // 消除申请
@@ -161,4 +161,4 @@ export default {
left: 0;
}
}
</style>
</style>

4
src/apps/AppMonitoringObject/MonitorFamilySituation.vue
View File

@@ -319,8 +319,8 @@ export default {
this.id = query.id
this.girdId = query.girdId
this.girdName = query.girdName
},
onShow() {

2
src/apps/AppMonitoringObject/MonitorIncome.vue
View File

@@ -214,7 +214,7 @@ export default {
methods: {
getInfo(id) {
this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
// var arr = ['income1','income2','income3','income4','income5','income6','income8','income9','income10','income11','income12','income13','income14','income15']
// var newArr = {}

2
src/apps/AppMonitoringObject/MonitorRemoveView.vue
View File

@@ -259,4 +259,4 @@ export default {
left: 0;
}
}
</style>
</style>

4
src/apps/AppMonitoringObject/familyRisk.vue
View File

@@ -272,7 +272,7 @@ export default {
}
}
.form-item__wrappers {
font-size: 32px;
.top {
@@ -344,4 +344,4 @@ export default {
background: #3192F4;
}
}
</style>
</style>

30
src/apps/AppMonitoringObject/residentDetail.vue
View File

@@ -23,19 +23,19 @@
<div class="more-info">
<div class="item-info">
<label>身份证号</label>
<span>{{ info.idNumber }}</span>
<span>{{ info.idNumber }}</span>
</div>
<div class="item-info">
<label>性别</label>
<span>{{ $dict.getLabel('sex', info.sex) }}</span>
<span>{{ $dict.getLabel('sex', info.sex) }}</span>
</div>
<div class="item-info">
<label>出生日期</label>
<span>{{ info.birthDate }}</span>
<span>{{ info.birthDate }}</span>
</div>
<div class="item-info">
<label>民族</label>
<span>{{ $dict.getLabel('fpNation', info.nation) }}</span>
<span>{{ $dict.getLabel('fpNation', info.nation) }}</span>
</div>
<div class="item-info">
<label>政治面貌</label>
@@ -54,20 +54,16 @@
<span>
<span v-for="(item, index) in healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{$dict.getLabel("fpHealth", item)}}</span>
</span>
<!-- <span v-for="(item,index) in">{{ $dict.getLabel('fpHealth', info.healthyStatus) }}</span> -->
</div>
<div class="item-info">
<label>残疾类别</label>
<span>{{ $dict.getLabel('fpDisabilityType', info.disabilityType) }}</span>
<span>{{ $dict.getLabel('fpDisabilityType', info.disabilityType) }}</span>
</div>
<div class="item-info">
<label>残疾证办证年度</label>
<span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span>
</div>
<div class="item-info">
<label>家庭人口数</label>
<span>{{ info.familyCount }}</span>
<span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span>
</div>
<!-- 基础保障 -->
<h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">基础保障</h4>
@@ -123,19 +119,19 @@
<h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">务工就业</h4>
<div class="item-info">
<label>劳动技能</label>
<span>{{ $dict.getLabel('fpLaborSkills', info.labourStatus) }}</span>
<span>{{ $dict.getLabel('fpLaborSkills', info.labourStatus) }}</span>
</div>
<div class="item-info">
<label>是否会讲普通话</label>
<span>{{ $dict.getLabel('fpYesOrNo', info.mandarin) }}</span>
<span>{{ $dict.getLabel('fpYesOrNo', info.mandarin) }}</span>
</div>
<div class="item-info">
<label>就业渠道</label>
<span>{{ $dict.getLabel('fpEmploymentChannels', info.employmentChannels) }}</span>
<span>{{ $dict.getLabel('fpEmploymentChannels', info.employmentChannels) }}</span>
</div>
<div class="item-info">
<label>务工企业名称</label>
<span>{{ info.migrantEnterprises }}</span>
<span>{{ info.migrantEnterprises }}</span>
</div>
<div class="item-info">
<label>务工时间/月</label>
@@ -188,7 +184,7 @@ export default {
if (res.code === 0) {
this.info = res.data
this.healthyStatusList = res.data.healthyStatus.split(',')
}
})
},
@@ -283,4 +279,4 @@ export default {
color: #FFFFFF;
}
}
</style>
</style>