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

ct

Browse Source
This commit is contained in:
liuye
2022-03-18 09:20:57 +08:00
parent 496f97568b 4d34feccf5
commit 9a990f22ae
12 changed files with 105 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/AppIntegralAudit/detail.vue
View File

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

6
src/apps/AppPeopleList/AppPeopleList.vue
View File

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

24
src/apps/AppPeopleList/DetailCard.vue
View File

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

115
src/apps/AppPeopleList/PeopleList.vue
View File

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

9
src/apps/AppSpecialPeople/AppSpecialPeople.vue
View File

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

19
src/apps/AppSpecialPeople/add.vue
View File

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

6
src/apps/AppWalkask/AppWalkask.vue
View File

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

3
src/components/AiAreaPicker.vue
View File

@@ -76,7 +76,7 @@ export default {
dataRange() { dataRange() {
let rules = [10, 8, 6, 3, 0], let rules = [10, 8, 6, 3, 0],
level = 0 level = 0
if (this.all) return (level = 0) if (this.all || this.disabled) return (level = 0)
rules.some((e, i) => { rules.some((e, i) => {
let reg = new RegExp(`0{${e}}`, 'g') let reg = new RegExp(`0{${e}}`, 'g')
if (reg.test(this.root)) { if (reg.test(this.root)) {
@@ -236,6 +236,7 @@ export default {
getAreaName(area, name) { getAreaName(area, name) {
name ? this.areaName = name : this.getFullArea(area).then(list => { name ? this.areaName = name : this.getFullArea(area).then(list => {
let arr = JSON.parse(JSON.stringify(list)) let arr = JSON.parse(JSON.stringify(list))
console.log(arr)
this.areaName = arr?.reverse()?.[0]?.name this.areaName = arr?.reverse()?.[0]?.name
}) })
let fullName = this.fullArea.map(e => e.name).join("") let fullName = this.fullArea.map(e => e.name).join("")

2
src/components/AiPagePicker.vue
View File

@@ -44,7 +44,7 @@ export default {
handleJump() { handleJump() {
let {config, nodeKey} = this, let {config, nodeKey} = this,
selected = this.value || this.selected?.map(e => e[nodeKey]) selected = this.value || this.selected?.map(e => e[nodeKey])
uni.$once('pagePicker', data => { uni.$once('pagePicker:' + this.type, data => {
this.$emit("update:selected", data) this.$emit("update:selected", data)
this.$emit("select", data) this.$emit("select", data)
this.$emit("change", data.map(e => e[nodeKey])) this.$emit("change", data.map(e => e[nodeKey]))

6
src/components/pages/selectGird.vue
View File

@@ -88,13 +88,13 @@ export default {
if (params.isDisabledOneGird) { if (params.isDisabledOneGird) {
this.isDisabledOneGird = params.isDisabledOneGird this.isDisabledOneGird = params.isDisabledOneGird
} }
if(this.isGirdUser){ if (this.isGirdUser) {
if (this.isMyGird) { if (this.isMyGird) {
this.getMyGird() this.getMyGird()
} else { } else {
this.getTree() this.getTree()
} }
}else this.$u.toast('当前人员不是网格员或网格管理员') } else this.$u.toast('当前人员不是网格员或网格管理员')
}, },
methods: { methods: {
getMyGird() { getMyGird() {
@@ -185,7 +185,7 @@ export default {
if (this.SelectGird.id != null) { if (this.SelectGird.id != null) {
uni.navigateBack({ uni.navigateBack({
success: () => { success: () => {
uni.$emit("pagePicker", [this.SelectGird]) uni.$emit("pagePicker:gird", [this.SelectGird])
} }
}) })
} else { } else {

2
src/components/pages/selectResident.vue
View File

@@ -96,7 +96,7 @@ export default {
} else { } else {
uni.navigateBack({ uni.navigateBack({
success: () => { success: () => {
uni.$emit("pagePicker", checkList) uni.$emit("pagePicker:resident", checkList)
} }
}) })
} }

5
src/saas/AppGridManagement/AddGird.vue
View File

@@ -113,14 +113,13 @@ export default {
uni.hideLoading() uni.hideLoading()
let isRepeat = false //判断网格长网格员是否选择相同人员 let isRepeat = false //判断网格长网格员是否选择相同人员
this.form[obj] = res.userList?.map(e => ({id: e.openUserId})) || [] this.form[obj] = res.userList?.map(e => ({id: e.openUserId})) || []
this.form.girdMemberList.map((item) => { this.form.girdMemberList?.map((item) => {
this.form.girdMemberManageList.map((items) => { this.form.girdMemberManageList?.map((items) => {
if (item.id == items.id) { if (item.id == items.id) {
isRepeat = false isRepeat = false
} }
}) })
}) })
if (isRepeat) { if (isRepeat) {
this.form[obj] = [] this.form[obj] = []
return this.$u.toast('网格长网格员不能选择相同人员') return this.$u.toast('网格长网格员不能选择相同人员')