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-04-28 11:21:58 +08:00
parent fbce1efb22 4d6d714261
commit 6f3e56c002
3 changed files with 197 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>工资收入</span>
<span>工资性收入(元)</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income1" type="number"
@@ -15,7 +15,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>生产经营收入</span>
<span>生产经营收入(元)</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income2" type="number"
@@ -26,7 +26,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>财产性收入</span>
<span>计划生育金(元)</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income3" type="number"
@@ -37,7 +37,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>转移性收入</span>
<span>资产收益扶贫分红收入</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income4" type="number"
@@ -48,7 +48,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>理赔收入</span>
<span>养老保险金（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income8" type="number"
@@ -61,7 +61,7 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>生产经营支出</span>
<span>低保金（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income5" type="number"
@@ -72,7 +72,95 @@
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>合规自然支出</span>
<span>特困供养金（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>生态补偿金（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>财产性收入（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>其他财产性收入</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>转移性收入（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>其他转移性收入（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>生产经营性支出（元）</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>纳入监测对象的收入参考范围</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
<span>纳入监测对象的人均收入参考范围</span>
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
@@ -82,6 +170,7 @@
</div>
</div>
<p class="tips">*不填时默认为0元</p>
<div class="btn" hover-class="text" @click="submit">保存</div>
</div>
</template>

17
src/common/util.js
View File

@@ -233,7 +233,19 @@ const idCardNoUtil = {
return code && code.replace(/^(\d{10})\d{4}(.{4}$)/g, `$1${Array(5).join('*')}$2`) || "-"
}
}
/**
* 封装权限判断方法
*/
export const $permissions = flag => {
let buttons = []
if (localStorage.getItem('vuex')) {
const vuex = JSON.parse(localStorage.getItem('vuex'))
buttons = vuex.user.buttons
}
if (buttons && buttons.length > 0) {
return buttons.some(b => b.id == flag || b.permission == flag)
} else return false
}
export default {
dict,
confirm,
@@ -277,5 +289,6 @@ export default {
},
dayjs,
idCardNoUtil,
qs
qs,
$permissions
}

153
src/saas/AppGridManagement/FamilyList.vue
View File

@@ -1,20 +1,22 @@
<template>
<div class="FamilyList">
<div class="title">
<div>户主列表({{list.length || 0}})</div>
<div>户主列表({{ total }})</div>
<div v-if="list.length">
<span style="font-size: 14px; color: #2979ff;" @click="changeType" v-if="edit">修改</span>
<span style="font-size: 14px; color: #2979ff;" @click="edit = true" v-else>取消</span>
</div>
</div>
<div class="seachObjs">
<u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
<u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false"
bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch"
@clear="handerClear"></u-search>
</div>
<div class="main" v-if="list.length">
<ul v-for="(item,index) in list" :key="index">
<li>
<div class="user">
<div v-if="!edit">
<div v-if="!edit">
<img src="./components/img/xz.png" alt="" class="checkbox" v-if="!item.checked" @click="userClick(index)">
<img src="./components/img/xzh.png" alt="" class="checkbox" v-else @click="userClick(index)">
</div>
@@ -25,11 +27,11 @@
</div>
<div class="userInfo">
<div class="name">
<span class="user-name">{{item.name}}</span>
<span class="user-tel">{{item.phone}}</span>
<span class="user-name">{{ item.name }}</span>
<span class="user-tel">{{ item.phone }}</span>
</div>
<div class="idCard">{{item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")}}</div>
<div class="address">{{item.currentAreaName || ''}}{{ item.currentAddress || '' }}</div>
<div class="idCard">{{ item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/, "$1********$2") }}</div>
<div class="address">{{ item.currentAreaName || '' }}{{ item.currentAddress || '' }}</div>
</div>
</div>
</div>
@@ -47,8 +49,9 @@
export default {
data() {
return {
list:[],
current:1,
list: [],
total: 0,
current: 1,
userId: '',
edit: true,
checked: true,
@@ -66,14 +69,15 @@ export default {
this.keyword = ''
this.handerSearch()
},
getList(){
getList() {
this.$http.post(`/app/appgirdmemberresident/listByGirdMember?current=${this.current}&girdMemberId=${this.userId}&girdId=${this.girdId}&name=${this.keyword}`).then((res) => {
if (res.code == 0) {
this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
if (res?.data) {
this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
this.total = res.data.total
}
})
},
toAddFamily(){
toAddFamily() {
uni.navigateTo({url: `./AddFamily?id=${this.userId}&girdId=${this.girdId}`})
},
userClick(index) {
@@ -81,14 +85,14 @@ export default {
this.$forceUpdate()
},
// 点击删除
delFamily(){
delFamily() {
var ids = []
this.list.map((item) => {
if(item.checked) {
if (item.checked) {
ids.push(item.gmrId)
}
})
if(!ids.length) {
if (!ids.length) {
return this.$u.toast('请选中需要删除的家庭户主')
}
this.$confirm(`是否删除这些关联家庭信息？`).then(() => {
@@ -138,70 +142,84 @@ export default {
font-size: 34px;
font-weight: 800;
}
.main {
padding-bottom: 112px;
ul {
padding-left: 32px;
background-color: #fff;
li {
list-style-type: none;
.user {
display: flex;
justify-content: flex-start;
padding-top: 24px;
.checkbox{
margin-top: 20px;
margin-right: 32px;
width: 48px;
height: 48px;
}
.info {
list-style-type: none;
.user {
display: flex;
justify-content: flex-start;
width: 100%;
.userImg {
margin-right: 32px;
width: 80px;
height: 80px;
border-radius: 50%;
}
.userInfo {
width: 100%;
padding-right: 32px;
border-bottom: 1px solid #E4E5E6;
.name {
display: flex;
justify-content: space-between;
font-size: 32px;
margin-bottom: 8px;
.user-name {
font-weight: 800;
}
.user-tel {
font-size: 26px;
color: #999999 ;
}
}
.idCard {
margin-bottom: 16px;
font-size: 26px;
color: #999999;
}
.address {
max-width: 100%;
word-break:break-all;
margin-bottom: 18px;
font-size: 26px;
color: #999999;
}
padding-top: 24px;
.checkbox {
margin-top: 20px;
margin-right: 32px;
width: 48px;
height: 48px;
}
.info {
display: flex;
justify-content: flex-start;
width: 100%;
.userImg {
margin-right: 32px;
width: 80px;
height: 80px;
border-radius: 50%;
}
.userInfo {
width: 100%;
padding-right: 32px;
border-bottom: 1px solid #E4E5E6;
.name {
display: flex;
justify-content: space-between;
font-size: 32px;
margin-bottom: 8px;
.user-name {
font-weight: 800;
}
.user-tel {
font-size: 26px;
color: #999999;
}
}
.idCard {
margin-bottom: 16px;
font-size: 26px;
color: #999999;
}
.address {
max-width: 100%;
word-break: break-all;
margin-bottom: 18px;
font-size: 26px;
color: #999999;
}
}
}
}
}
}
}
}
.footer{
.footer {
position: fixed;
left: 0px;
bottom: 0px;
@@ -213,6 +231,7 @@ export default {
font-size: 36px;
color: #FFFFFF;
}
.seachObjs {
border-bottom: 2px solid #f5f5f5;
border-top: 2px solid #f5f5f5;