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
2021-12-31 15:45:13 +08:00
parent 787c412fae 821d78433b
commit c09f92baf8
9 changed files with 106 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/apps/AppAskForm/AddForm.vue
View File

@@ -192,11 +192,6 @@ export default {
} }
}) })
}, },
onShow () {
localStorage.removeItem("toFiledConfig")
},
methods: { methods: {
toSetting() { toSetting() {
let {formConfig} = this let {formConfig} = this

11
src/apps/AppAskForm/FiledConfig.vue
View File

@@ -146,9 +146,12 @@ import {components} from './components/config'
export default { export default {
data() { data() {
let params = localStorage.getItem("toFiledConfig") let params = localStorage.getItem("toFiledConfig") || {}
params && (params = JSON.parse(params)) if (params) {
params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0] params = JSON.parse(params)
params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
localStorage.removeItem("toFiledConfig")
}
return { return {
...params, ...params,
isShowType: false, isShowType: false,
@@ -250,7 +253,7 @@ export default {
this.config.options.splice(index, 1) this.config.options.splice(index, 1)
}, },
back() { back() {
uni.navigateBack({}) uni.navigateBack({})
}, },

19
src/apps/AppResidentActivitie/Add.vue
View File

@@ -207,9 +207,9 @@ export default {
if (this.showStartTime == true) { if (this.showStartTime == true) {
var nowTime = new Date().getTime() * 1 var nowTime = new Date().getTime() * 1
var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
if (nowTime > historyTime) { if (nowTime > beginTimes) {
this.forms.beginTime = '' this.forms.beginTime = ''
return this.$u.toast('开始时间应大于当前时间') return this.$u.toast('开始时间应大于当前时间')
} else { } else {
@@ -217,15 +217,18 @@ export default {
} }
} }
if (this.showEndTime == true) { if (this.showEndTime == true) {
var nowTime = new Date().getTime() * 1 if (!this.forms.beginTime) {
return this.$u.toast('请先选择开始时间')
}
var beginTimes = new Date(this.forms.beginTime).getTime() * 1
var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
if (nowTime > historyTime) { if (endTimes > beginTimes && endTimes != beginTimes) {
this.forms.endTime = ''
return this.$u.toast('结束时间应大于当前时间')
} else {
this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00' this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
} else {
this.forms.endTime = ''
return this.$u.toast('结束时间应大于开始时间')
} }
} }
}, },

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

@@ -85,7 +85,7 @@ export default {
}) })
}, },
onShow() { onShow() {
document.title = '通知公告' document.title = '通知公告'
}, },
methods: { methods: {
getList() { getList() {
@@ -172,7 +172,7 @@ uni-page-body {
height: 100%; height: 100%;
::v-deep .AiCard { ::v-deep .AiCard {
background: #f3f6f9; background: #f5f5f5;
.start { .start {
background: #fff; background: #fff;
@@ -220,7 +220,7 @@ uni-page-body {
} }
.u-load-more-wrap { .u-load-more-wrap {
background: #f3f6f9 !important; background: #f5f5f5 !important;
margin: 0 !important; margin: 0 !important;
padding: 34px 0; padding: 34px 0;
} }

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

@@ -9,11 +9,11 @@
<div class="currentLeft"> <div class="currentLeft">
<div class="currentLeft-top"> <div class="currentLeft-top">
<div class="left"> <div class="left">
<AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color:#fff;"> <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
<img :src="$cdn+'location.svg'" alt="" style="width:18px;height:18px;margin-right:4px;vertical-align: middle;"> <img :src="$cdn + 'location.svg'" alt="" style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle" />
<span class="label" v-if="areaName">{{ areaName }}</span> <span class="label" v-if="areaName">{{ areaName }}</span>
<span v-else>请选择</span> <span v-else>请选择</span>
<u-icon name="arrow-down" color="#fff" size="28" style="margin-left:4px;" /> <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
</AiAreaPicker> </AiAreaPicker>
</div> </div>
@@ -21,12 +21,12 @@
</div> </div>
<template v-if="data.length > 0"> <template v-if="data.length > 0">
<AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)"> <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)" :ref="item.id">
<template #custom> <template #custom>
<div class="cards-left"> <div class="cards-left">
<span class="walkName">走访对象：{{ item.name }}</span> <span class="walkName">走访对象：{{ item.name }}</span>
<span class="tags">{{ item.menuLevel3Name }}</span> <span class="tags" v-if="item.menuLevel3Name">{{ item.menuLevel3Name }}</span>
<span class="tags">{{ $dict.getLabel('realityStatus', item.reality) }}</span> <span class="tags" v-if="item.reality">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
</div> </div>
<div class="cards-hint">{{ item.title }}</div> <div class="cards-hint">{{ item.title }}</div>
@@ -42,7 +42,7 @@
</template> </template>
<template #menu v-if="item.createUserId == user.id"> <template #menu v-if="item.createUserId == user.id">
<div class="menu" @tap.stop="goDetail(item, 2)">编辑</div> <div class="menu" @tap.stop="toAdd(item, 2)">编辑</div>
<div class="menu" @tap.stop="toDetele(item)">删除</div> <div class="menu" @tap.stop="toDetele(item)">删除</div>
</template> </template>
</AiCard> </AiCard>
@@ -53,7 +53,7 @@
<div class="addBtns"> <div class="addBtns">
<span> 点击</span> <span> 点击</span>
<span class="toAdds" @click="goDetail()">新增按钮</span> <span class="toAdds" @click="toAdd()">新增按钮</span>
<span> 试试试吧~</span> <span> 试试试吧~</span>
</div> </div>
</div> </div>
@@ -62,7 +62,7 @@
<u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal> <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
<div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" /> <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
</template> </template>
</div> </div>
</template> </template>
@@ -152,11 +152,13 @@ export default {
}, },
areaSelect(e) { areaSelect(e) {
this.data = []
this.areaId = e this.areaId = e
this.getList() this.getList()
}, },
change(index) { change(index) {
this.data = []
this.areaId = this.user.areaId this.areaId = this.user.areaId
this.keyword = '' this.keyword = ''
this.currentTabs = index this.currentTabs = index
@@ -164,9 +166,18 @@ export default {
}, },
goDetail(item, hint) { goDetail(item, hint) {
if (item?.id) {
this.$refs?.[item.id]?.[0]?.handleClose()
}
if (hint == 1) { if (hint == 1) {
uni.navigateTo({ url: `./detail?id=${item.id}` }) uni.navigateTo({ url: `./detail?id=${item.id}` })
} }
},
toAdd(item, hint) {
if (item?.id) {
this.$refs?.[item.id]?.[0]?.handleClose()
}
if (hint == 2) { if (hint == 2) {
uni.navigateTo({ url: `./add?id=${item.id}` }) uni.navigateTo({ url: `./add?id=${item.id}` })
} else { } else {
@@ -177,6 +188,7 @@ export default {
toDetele(item) { toDetele(item) {
this.deletShow = true this.deletShow = true
this.deletId = item.id this.deletId = item.id
this.$refs?.[item.id]?.[0]?.handleClose()
}, },
delet() { delet() {
@@ -219,6 +231,7 @@ uni-page-body {
height: 100%; height: 100%;
background: #fff; background: #fff;
} }
.AppWalkask { .AppWalkask {
height: 100%; height: 100%;

30
src/apps/AppWalkask/add.vue
View File

@@ -24,17 +24,18 @@
<div class="line"></div> <div class="line"></div>
<u-form-item label="入户走访事项" prop="title" required label-position="top"> <u-form-item label="入户走访事项" prop="title" required label-position="top" :border-bottom="false">
<u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" maxlength="30" /> <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" :maxlength="30" />
<div>{{ forms.title.length }}/30</div>
</u-form-item> </u-form-item>
<div class="hint">{{ forms.title.length }}/30</div>
<div class="line"></div> <div class="line"></div>
<u-form-item label="入户走访内容" prop="description" label-position="top"> <u-form-item label="入户走访内容" prop="description" label-position="top" :border-bottom="false">
<u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" maxlength="500" /> <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" :maxlength="500" />
<div>{{ forms.description.length }}/500</div> <!-- <div>{{ forms.description.length }}/500</div> -->
</u-form-item> </u-form-item>
<div class="hint">{{ forms.description.length }}/500</div>
<div class="line"></div> <div class="line"></div>
@@ -75,6 +76,7 @@ export default {
reality: '', reality: '',
realityValue: '', realityValue: '',
menuLevel3Name: '', menuLevel3Name: '',
applicationId: '',
title: '', title: '',
description: '', description: '',
images: [], images: [],
@@ -104,8 +106,8 @@ export default {
}) })
uni.$on('goBack', (data) => { uni.$on('goBack', (data) => {
console.log(data)
this.forms.menuLevel3Name = data.applicationName this.forms.menuLevel3Name = data.applicationName
this.forms.applicationId = data.applicationId
this.forms.name = data.selectUser.name this.forms.name = data.selectUser.name
this.forms.optionId = data.selectUser.id this.forms.optionId = data.selectUser.id
}) })
@@ -165,7 +167,8 @@ export default {
applicationId: this.forms.applicationId, applicationId: this.forms.applicationId,
name: this.forms.name, name: this.forms.name,
optionId: this.forms.optionId, optionId: this.forms.optionId,
menuLevel3Name: this.forms.menuLevel3Name, // menuLevel3Name: this.forms.menuLevel3Name,
applicationId: this.forms.applicationId,
reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality, reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
title: this.forms.title, title: this.forms.title,
@@ -192,7 +195,6 @@ export default {
}, },
areaSelect(e) { areaSelect(e) {
console.log(e)
this.forms.areaId = e this.forms.areaId = e
}, },
@@ -210,10 +212,6 @@ export default {
}, },
toWalkObject() { toWalkObject() {
if (this.id) return
// this.addList = false
// this.comp = 'selectType'
// this.paramss = 111
uni.navigateTo({ url: `./selectType` }) uni.navigateTo({ url: `./selectType` })
}, },
}, },
@@ -283,6 +281,12 @@ export default {
background: #f3f6f9; background: #f3f6f9;
} }
.hint {
padding: 4px 32px 8px 0;
text-align: right;
color: #999;
}
.avatars { .avatars {
.u-form-item__body { .u-form-item__body {
.default { .default {

57
src/apps/AppWalkask/selectType.vue
View File

@@ -17,7 +17,7 @@
<div class="cards" v-for="(item, i) in typeList" :key="i" @click="toUserSelect(item)"> <div class="cards" v-for="(item, i) in typeList" :key="i" @click="toUserSelect(item)">
<img src="./img/tx@2x.png" alt="" /> <img src="./img/tx@2x.png" alt="" />
<div class="right"> <div class="rightes">
<div class="applicationNames">{{ item.applicationName }}</div> <div class="applicationNames">{{ item.applicationName }}</div>
<img src="./img/2.png" alt="" class="imgs" /> <img src="./img/2.png" alt="" class="imgs" />
@@ -38,10 +38,9 @@
<img src="./img/tx@2x.png" alt="" class="avatras" /> <img src="./img/tx@2x.png" alt="" class="avatras" />
</div> </div>
<div class="right"> <div class="rights">
<div class="applicationNames">{{ e.name }}</div> <div class="applicationNames">{{ e.name }}</div>
<div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</div>
<!-- <img src="./img/2.png" alt="" class="imgs" /> -->
</div> </div>
</div> </div>
</div> </div>
@@ -71,6 +70,7 @@ export default {
current: 1, current: 1,
showType: true, showType: true,
applicationName: '', applicationName: '',
applicationId: '',
selectUser: {}, selectUser: {},
} }
}, },
@@ -104,9 +104,22 @@ export default {
}) })
}, },
getUser(data) { // getUser(data) {
this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => { // this.applicationId = data.id
// this.appId = data.id
// this.getUsers()
// },
getUsers() {
uni.showLoading({
title: '加载中',
})
this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
uni.showToast({
title: '加载完毕',
icon: 'none',
})
res.data.records.map((item) => { res.data.records.map((item) => {
item.isChecked = false item.isChecked = false
}) })
@@ -116,15 +129,21 @@ export default {
}, },
submit() { submit() {
uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName }) if (this.selectUser.id != null) {
uni.navigateBack() uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
// uni.navigateTo({ url: `./add` }) uni.navigateBack()
} else {
return this.$u.toast('请选择人员')
}
}, },
toUserSelect(item) { toUserSelect(item) {
this.applicationName = item.applicationName this.applicationName = item.applicationName
this.applicationId = item.id
this.appId = item.id
this.getUsers()
this.showType = false this.showType = false
this.getUser(item)
}, },
back() { back() {
@@ -137,17 +156,18 @@ export default {
}, },
handerSearch(e) { handerSearch(e) {
if (this.showType) { if (!this.showType) {
this.keyword = e this.keyword = e
this.current = 1 this.current = 1
this.getUser() // this.getUser()
this.getUsers()
} }
}, },
handerClear() { handerClear() {
this.keyword = '' this.keyword = ''
this.current = 1 this.current = 1
this.getUser() this.getUsers()
}, },
}, },
} }
@@ -163,6 +183,7 @@ export default {
} }
.header-middle { .header-middle {
padding-bottom: 140px;
.hint { .hint {
padding: 0 20px 0 32px; padding: 0 20px 0 32px;
height: 112px; height: 112px;
@@ -191,7 +212,7 @@ export default {
height: 74px; height: 74px;
border-radius: 8px; border-radius: 8px;
} }
.right { .rightes {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -238,21 +259,21 @@ export default {
} }
} }
.right { .rights {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-left: 32px; margin-left: 32px;
border-bottom: 1px solid #e4e5e6; border-bottom: 1px solid #e4e5e6;
padding-right: 40px;
.applicationNames { .applicationNames {
font-size: 36px; font-size: 36px;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.imgs { .idNumbers {
width: 40px; color: #666;
height: 40px;
} }
} }
} }

5
src/sass/AppAskForm/AddForm.vue
View File

@@ -192,11 +192,6 @@ export default {
} }
}) })
}, },
onShow () {
localStorage.removeItem("toFiledConfig")
},
methods: { methods: {
toSetting() { toSetting() {
let {formConfig} = this let {formConfig} = this

11
src/sass/AppAskForm/FiledConfig.vue
View File

@@ -146,9 +146,12 @@ import {components} from './components/config'
export default { export default {
data() { data() {
let params = localStorage.getItem("toFiledConfig") let params = localStorage.getItem("toFiledConfig") || {}
params && (params = JSON.parse(params)) if (params) {
params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0] params = JSON.parse(params)
params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
localStorage.removeItem("toFiledConfig")
}
return { return {
...params, ...params,
isShowType: false, isShowType: false,
@@ -250,7 +253,7 @@ export default {
this.config.options.splice(index, 1) this.config.options.splice(index, 1)
}, },
back() { back() {
uni.navigateBack({}) uni.navigateBack({})
}, },