This commit is contained in:
liuye
2022-03-18 09:20:57 +08:00
12 changed files with 105 additions and 94 deletions

View File

@@ -77,7 +77,7 @@
</div>
<div class="item">
<div>积分类别</div>
<div>{{ form.auditIntegralType }}</div>
<div>{{ $dict.getLabel('atWillReportType', form.auditIntegralType) }}</div>
</div>
<div class="item">
<div>积分事项</div>

View File

@@ -39,10 +39,6 @@ export default {
</script>
<style lang="scss" scoped>
uni-page-body {
height: 100%!important;
background-color: #fff!important;
}
.AppPeopleList{
height: 100%;
padding-top: 16px;
@@ -65,4 +61,4 @@ uni-page-body {
}
}
}
</style>
</style>

View File

@@ -41,9 +41,9 @@
<span>身份证号</span>
<span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
</div>
<div class="spacial" v-if="item.idNumber == data.resident.idNumber">
<!-- <div class="spacial" v-if="item.idNumber == data.resident.idNumber">
<span v-for="(e,index) in spacialList" :key="index">{{e.applicationName}}</span>
</div>
</div> -->
</div>
</div>
</div>
@@ -63,7 +63,7 @@ export default {
id: '',
data: [],
resident: {},
spacialList: [],
// spacialList: [],
}
},
computed: {},
@@ -85,7 +85,7 @@ export default {
this.$forceUpdate()
this.$nextTick(() => {
this.resident = res.data.resident
this.spacialList = res.data.resident.tsrqInfos
// this.spacialList = res.data.resident.tsrqInfos
this.$forceUpdate()
})
}
@@ -197,14 +197,14 @@ export default {
.rightBottom {
margin-top: 20px;
}
.spacial {
margin-top: 10px;
white-space: wrap;
span {
margin-right: 10px;
color: #ff4466;
}
}
// .spacial {
// margin-top: 10px;
// white-space: wrap;
// span {
// margin-right: 10px;
// color: #ff4466;
// }
// }
}
}
.card:nth-child(2n-1) {

View File

@@ -1,30 +1,34 @@
<template>
<div class="PeopleList">
<div class="areatop">
<!-- <div>区域选择</div>
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
<u-icon name="photo"></u-icon> -->
<!-- @select="areaSelect" -->
<u-form label-width="auto">
<u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj" :name.sync="areaName"></AiAreaPicker>
</u-form-item>
</u-form>
</div>
<AiTopFixed>
<div class="areatop">
<!-- <div>区域选择</div>
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
<u-icon name="photo"></u-icon> -->
<!-- @select="areaSelect" -->
<u-form label-width="auto">
<u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"
:name.sync="areaName"></AiAreaPicker>
</u-form-item>
</u-form>
</div>
<div class="line"></div>
<div class="line"></div>
<u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
<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>
</div>
<u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
<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>
</div>
</AiTopFixed>
<div class="dataes" v-if="datas.length > 0">
<div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
<div class="left">
<img :src="item.photo" alt="" v-if="item.photo" />
<img src="./components/img/4.png" alt="" v-else />
<img :src="item.photo" alt="" v-if="item.photo"/>
<img src="./components/img/4.png" alt="" v-else/>
</div>
<div class="right">
@@ -54,11 +58,10 @@
</template>
<script>
import { mapState } from 'vuex'
import {mapState} from 'vuex'
export default {
name: 'PeopleList',
components: {},
props: {},
data() {
return {
@@ -89,7 +92,7 @@ export default {
onLoad() {
this.areaId = this.user.areaId
this.areaName = this.user.areaName
uni.$on('reload',()=>{
uni.$on('reload', () => {
this.current = 1
this.getList()
})
@@ -102,23 +105,23 @@ export default {
getList() {
var residentType = ['', 0, 1][this.currentTabs]
this.$http
.post('/app/appresident/list', null, {
params: {
size: 20,
current: this.current,
con: this.keyword,
areaId: this.areaId,
residentType: residentType,
auditStatus: 1
},
})
.then((res) => {
if (res.code == 0) {
this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
.post('/app/appresident/list', null, {
params: {
size: 20,
current: this.current,
con: this.keyword,
areaId: this.areaId,
residentType: residentType,
auditStatus: 1
},
})
.then((res) => {
if (res.code == 0) {
this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
this.pages = res.data.pages
}
})
this.pages = res.data.pages
}
})
},
change(index) {
@@ -129,7 +132,7 @@ export default {
},
toDetailCard(item) {
uni.navigateTo({ url: `./DetailCard?id=${item.id}` })
uni.navigateTo({url: `./DetailCard?id=${item.id}`})
},
seachObj(e) {
@@ -164,7 +167,8 @@ export default {
}
uni.hideLoading()
})
}).catch(() => {})
}).catch(() => {
})
}
},
onReachBottom() {
@@ -175,11 +179,9 @@ export default {
</script>
<style scoped lang="scss">
uni-page-body {
height: 100%;
}
.PeopleList {
height: 100%;
.areatop {
display: flex;
justify-content: space-between;
@@ -200,17 +202,20 @@ uni-page-body {
::v-deep .u-form {
width: 100%;
.areaIds {
.u-form-item__body {
.u-form-item--right {
.u-form-item--right__content {
display: flex;
align-items: center;
.u-form-item--right__content__slot {
.AiAreaPicker {
width: 100%;
display: flex;
justify-content: flex-end;
.areaSelector {
.location {
opacity: 0;
@@ -218,6 +223,7 @@ uni-page-body {
}
}
}
.u-form-item--right__content__icon {
margin-bottom: 8px;
}
@@ -229,9 +235,11 @@ uni-page-body {
.dataes {
background: #fff;
.datass {
display: flex;
padding: 24px 32px;
.left {
img {
width: 80px;
@@ -239,25 +247,29 @@ uni-page-body {
border-radius: 50%;
}
}
.right {
display: flex;
flex-direction: column;
margin-left: 32px;
width: 100%;
.rightTop {
font-size: 32px;
font-weight: 500;
color: #333333;
display: flex;
justify-content: space-between;
.btn{
img{
.btn {
img {
width: 48px;
height: 48px;
margin-left: 40px;
}
}
}
.rightBottom {
display: flex;
justify-content: space-between;
@@ -271,6 +283,7 @@ uni-page-body {
background: #f5f5f5;
margin: 0;
}
.addBtn {
width: 100%;
height: 112px;
@@ -282,20 +295,24 @@ uni-page-body {
position: fixed;
bottom: 0;
}
.empty{
.empty {
height: 100%;
img{
img {
width: 282px;
height: 306px;
margin: 168px 0 0 234px;
}
p{
p {
text-align: center;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
color: #999;
line-height: 44px;
span{
span {
color: #467DFE;
}
}

View File

@@ -108,7 +108,7 @@ export default {
return this.user.girdCheckType != 0
},
isAdmin() {
return this.user.girdCheckType == 1
return this.user.girdCheckType == 2
},
},
created() {
@@ -217,8 +217,11 @@ export default {
},
del(row) {
this.$confirm('确定删除该数据?').then(() => {
uni.showLoading()
this.$http.post("/app/appapplicationinfo/delete", null, {params: {ids: row.id}}).then((res) => {
uni.showLoading({})
let {id: ids, appId} = row
this.$http.post("/app/appapplicationinfo/delete", null, {
params: {ids, appId}
}).then((res) => {
if (res?.code == 0) {
this.$u.toast('删除成功!')
this.getUserList()

View File

@@ -190,7 +190,6 @@ export default {
selectName: '',
selectList: [],
selectShow: false,
id: ''
}
},
computed: {
@@ -205,8 +204,10 @@ export default {
onShow() {
if (this.isEdit) {
document.title = "编辑人员"
this.appId = this.$route.query.appId
this.getDetail()
if (!this.appId) {
let {appId: value} = this.$route.query
this.typeConfirm([{value}]).then(() => this.getDetail())
}
} else {
document.title = '新增人员'
if (this.$route.query.appId && !this.appId) {
@@ -238,7 +239,7 @@ export default {
typeConfirm(e) {
this.appId = e[0].value
this.appName = e[0].label
this.$http.post(`/app/appapplicationinfo/queryApplicationInfo?appId=${this.appId}`).then((res) => {
return this.$http.post(`/app/appapplicationinfo/queryApplicationInfo?appId=${this.appId}`).then((res) => {
if (res?.data) {
this.formData = {}
let data = res.data
@@ -410,7 +411,7 @@ export default {
}
if (items.type == 'upload') { //附件 只传id
let files = [];
[form[items.fieldDbName]]?.flat()?.map(item => files.push(item.url))
[form[items.fieldDbName]]?.flat()?.map(item => item?.url&&files.push(item.url))
form[items.fieldDbName] = files?.toString()
}
// if (items.type == 'onOff') { //开关
@@ -436,8 +437,7 @@ export default {
if (!isValid) return
this.$http.post(`/app/appapplicationinfo/addOrUpdate?appId=${this.appId}`, {
...form,
id: this.id || ''
...form
}).then(res => {
if (res?.code == 0) {
this.$u.toast('提交成功')
@@ -469,13 +469,14 @@ export default {
},
getDetail() {
let {id, appId} = this.$route.query
id && this.$http.post("/app/appapplicationinfo/queryDetailById", null, {
return id ? this.$http.post("/app/appapplicationinfo/queryDetailById", null, {
params: {id, appId}
}).then(res => {
if (res?.data) {
this.formData = res.data
this.$forceUpdate()
}
})
}) : Promise.resolve()
}
}
}

View File

@@ -219,14 +219,8 @@ export default {
</script>
<style lang="scss" scoped>
uni-page-body {
height: 100%;
background: #fff;
}
.AppWalkask {
height: 100%;
.header-middle {
.currentLeft,
.currentRight {