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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

Browse Source
This commit is contained in:
yanran200730
2022-03-29 16:30:45 +08:00
parent 47d9213b70 0a66569d4e
commit 0e0feb30e4
8 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,17 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i style="opacity: 0;">*</i>
<span>详细地址</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -113,17 +124,6 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i style="opacity: 0;">*</i>
<span>详细地址</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -295,6 +295,8 @@ export default {
girdName: '',
healthyStatus: '',
age: '',
birthday: '',
isHousehold: ''
},
$areaId: '',
isEdit: false,
@@ -360,6 +362,7 @@ export default {
this.form.girdName = this.girdInfo.girdName
this.form.householdIdNumber = this.form.idNumber
this.form.householdRelation = '01'
this.form.isHousehold = 1
this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
...this.form,
id: this.isEdit ? this.id : ''
@@ -371,6 +374,8 @@ export default {
delta: 1
})
}
}).catch((err) => {
this.$u.toast(err)
})
},
@@ -403,6 +408,7 @@ export default {
}
var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
this.form.sex = info.gender
this.form.birthDate = info.birthday
var myDate = new Date();
var month = myDate.getMonth() + 1;
var day = myDate.getDate();

9
src/apps/AppMonitoringObject/Detail.vue
View File

@@ -192,7 +192,7 @@
</div>
<div class="right">
<span>{{ item.createTime }}</span>
<image src="/static/images/more.png" @click="edit(item.id)"/>
<u-icon name="list" color="#999" size="28" @click="edit(item.id)" style="margin-left:16px;"></u-icon>
</div>
</div>
<p>{{ item.detail }}</p>
@@ -223,6 +223,10 @@
<div @click="examine('您确认要驳回此居民的监测对象申请吗？', 0)">驳回申请</div>
<div class="confirm-btn" @click="examine('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
</div>
<div class="footer-btn" v-if="info.status == 1">
<div @click="del">删除人员</div>
<div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
</div>
<div class="footer-btn" v-if="info.status == 2">
<div @click="examine('您确认要继续监测该居民？', 0)">继续监测</div>
<div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
@@ -233,7 +237,6 @@
</div>
<div class="footer-btn" v-if="info.status == 4">
<div @click="del">删除人员</div>
<div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
</div>
</div>
@@ -305,7 +308,7 @@ export default {
this.id = query.id
},
onShow() {
document.title = '居民详情'
document.title = '监测对象详情'
uni.$on('reload', () => {
this.getInfo()
})

1
src/apps/AppMonitoringObject/List.vue
View File

@@ -302,7 +302,6 @@ export default {
.right-bottom {
p{
height: 36px;
font-size: 26px;
font-family: PingFangSC-Regular, PingFang SC;
color: #999;

28
src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
View File

@@ -78,6 +78,17 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i style="opacity: 0;">*</i>
<span>详细地址</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -113,17 +124,6 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<i style="opacity: 0;">*</i>
<span>详细地址</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="form-item">
@@ -294,6 +294,8 @@ export default {
girdId: '',
girdName: '',
healthyStatus: '',
birthday: '',
isHousehold: '',
},
id: '',
$areaId: '',
@@ -381,6 +383,7 @@ export default {
this.form.girdName = this.girdInfo.girdName
this.form.householdIdNumber = this.householdIdNumber
this.form.objectType = this.objectType
this.form.isHousehold = 0
this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
...this.form,
id: this.id || ''
@@ -392,6 +395,8 @@ export default {
delta: 1
})
}
}).catch((err) => {
this.$u.toast(err)
})
},
@@ -410,6 +415,7 @@ export default {
}
var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
this.form.sex = info.gender
this.form.birthDate = info.birthday
var myDate = new Date();
var month = myDate.getMonth() + 1;
var day = myDate.getDate();

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

@@ -28,20 +28,29 @@ export default {
return {
detail: '',
pid: '',
files: []
files: [],
id: ''
}
},
onShow() {
document.title = '添加帮扶日志'
},
onLoad(query) {
this.pid = query.pid
if(query.id) {
this.id = query.id
this.getInfo()
}
},
onShow() {
document.title = this.id ? '编辑帮扶日志' : '添加帮扶日志'
},
methods: {
getInfo() {
this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${this.id}`).then(res => {
if (res.code == 0) {
this.detail = res.data.detail
this.files = res.data.files || []
}
})
},
submit() {
if (!this.detail) {
return this.$u.toast('请输入帮扶内容')
@@ -50,6 +59,7 @@ export default {
detail: this.detail,
files: this.files,
pid: this.pid,
id: this.id
}).then(res => {
if (res.code === 0) {
this.$u.toast('提交成功')

3
src/apps/AppMonitoringObject/MonitorFamilyMember.vue
View File

@@ -7,7 +7,8 @@
<h2>{{ item.name }}</h2>
<span>{{ item.idNumber }}</span>
</div>
<span>{{ $dict.getLabel('fpRelationship', item.relationship) }}</span>
<span v-if="item.isHousehold == 1">户主</span>
<span v-else>{{ $dict.getLabel('fpRelationship', item.householdRelation) }}</span>
</div>
<div class="bottom">
<span>{{ $dict.getLabel('sex', item.sex) }}</span>

8
src/apps/AppPageRevitalize/AppPageRevitalize.vue
View File

@@ -15,22 +15,22 @@ export default {
{
name: '产业振兴',
icon: require('./img/cyzx.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=c7d4e2c46b56477c9a581af7f16e10d9&listName=产业资讯'
url: '../AppServicePublic/AppServicePublic?moduleId=c7d4e2c46b56477c9a581af7f16e10d9&listName=产业振兴'
},
{
name: '组织振兴',
icon: require('./img/zzzx.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=a33a855416d44b77a006b93599c9618d&listName=组织动态'
url: '../AppServicePublic/AppServicePublic?moduleId=a33a855416d44b77a006b93599c9618d&listName=组织振兴'
},
{
name: '人才振兴',
icon: require('./img/rczx.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=6aa884de2b814967bdbb18a363904083&listName=人才工作'
url: '../AppServicePublic/AppServicePublic?moduleId=6aa884de2b814967bdbb18a363904083&listName=人才振兴'
},
{
name: '文化振兴',
icon: require('./img/whzx.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=feaf0264251f422db9b10c5e9f6c1c56&listName=生态建设'
url: '../AppServicePublic/AppServicePublic?moduleId=feaf0264251f422db9b10c5e9f6c1c56&listName=文化振兴'
},
{
name: '生态振兴',

7
src/apps/AppWarningMonitoring/detail.vue
View File

@@ -17,6 +17,7 @@
</div>
</div>
<div class="line"></div>
<div class="user-info">
<div class="item-info">
<label>风险类型:</label>
@@ -126,12 +127,10 @@
<div class="btn" @click="toResult" v-if="checkType == 1 && tabIndex==0 && !data.visitUserName">
<span v-if="(data.status==0 || data.status==1)">走访核实</span>
<!-- <span v-if="(data.status==2 || data.status==3)">处理结果</span> -->
</div>
<div class="btn" @click="toResult" v-if="checkType == 2 && tabIndex==0" !data.auditUserName>
<!-- <span v-if="(data.status==0 || data.status==1)">走访核实</span> -->
<span v-if="(data.status==2 || data.status==3)">处理结果</span>
<div class="btn" @click="toResult" v-if="checkType == 2 && tabIndex==0 && !data.auditUserName">
<span>处理结果</span>
</div>
</div>