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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2021-12-31 15:48:42 +08:00
parent 97c9b83a3d c09f92baf8
commit 1f24e979de
2 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
<span class="label"><span class="tips">*</span>类型</span> <span class="label"><span class="tips">*</span>类型</span>
<div class="value" @click="showType=true"> <div class="value" @click="showType=true">
<span :class="appId ? '' : 'color-999'">{{appName}}</span> <span :class="appId ? '' : 'color-999'">{{appName}}</span>
<u-icon name="arrow-right" color="#cccccc" size="14"></u-icon> <u-icon name="arrow-right" color="#cccccc" :size="24"></u-icon>
</div> </div>
</div> </div>
<div class="info-content" v-for="(items, indexs) in formDataList" :key="indexs"> <div class="info-content" v-for="(items, indexs) in formDataList" :key="indexs">
@@ -43,7 +43,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value" @click="selectClick(item.fieldDbName, item.dict)"> <div class="value" @click="selectClick(item.fieldDbName, item.dict)">
<span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '请选择'}}</span> <span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '请选择'}}</span>
<u-icon name="arrow-right area-icon" color="#cccccc" size="14"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon>
</div> </div>
</div> </div>
<!-- 单选radio --> <!-- 单选radio -->
@@ -91,7 +91,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value"> <div class="value">
<AiAreaPicker v-model="formData[item.fieldDbName]" :areaId="user.areaId" :name.sync="formData[item.fieldDbName+'_name']"></AiAreaPicker> <AiAreaPicker v-model="formData[item.fieldDbName]" :areaId="user.areaId" :name.sync="formData[item.fieldDbName+'_name']"></AiAreaPicker>
<u-icon name="arrow-right area-icon" color="#cccccc" size="14"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon>
</div> </div>
</div> </div>
<!-- 人员选择 --> <!-- 人员选择 -->
@@ -106,7 +106,7 @@
formData[item.fieldDbName].length formData[item.fieldDbName].length
}}</em>人 }}</em>人
</template> </template>
<u-icon name="arrow-right" color="#cccccc" size="14"></u-icon> <u-icon name="arrow-right" color="#cccccc" :size="24"></u-icon>
</div> </div>
</div> </div>
<!-- 日期选择 / 日期带时分秒选择 / 时间-时分秒选择 --> <!-- 日期选择 / 日期带时分秒选择 / 时间-时分秒选择 -->
@@ -114,7 +114,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value" @click="dateClick(indexs, index)"> <div class="value" @click="dateClick(indexs, index)">
<span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{formData[item.fieldDbName] || '请选择'}}</span> <span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{formData[item.fieldDbName] || '请选择'}}</span>
<u-icon name="arrow-right area-icon" color="#cccccc" size="14"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon>
</div> </div>
</div> </div>
<u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2010" @confirm="dateConfirm" >请选择</u-picker> <u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2010" @confirm="dateConfirm" >请选择</u-picker>
@@ -498,7 +498,7 @@ export default {
.u-icon{ .u-icon{
vertical-align: super; vertical-align: super;
position: absolute; position: absolute;
top: 38px; top: 42px;
right: 16px; right: 16px;
} }
} }

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

@@ -2,27 +2,22 @@
<div class="AppWalkask"> <div class="AppWalkask">
<template v-if="isList"> <template v-if="isList">
<div class="header-top"> <div class="header-top">
<u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
</div> </div>
<div class="header-middle"> <div class="header-middle">
<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" <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
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>
<u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
@clear="handerClear"></u-search>
</div> </div>
<template v-if="data.length > 0"> <template v-if="data.length > 0">
@@ -37,8 +32,7 @@
<div class="cards-hint">{{ item.title }}</div> <div class="cards-hint">{{ item.title }}</div>
<div class="imgs"> <div class="imgs">
<img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" v-if="i < 3" />
@click.stop="previewImage(item.images, items.url)" v-if="i < 3"/>
</div> </div>
<div class="cards-bottom"> <div class="cards-bottom">
@@ -66,16 +60,15 @@
</div> </div>
</div> </div>
<u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
:show-title="false" @confirm="delet"></u-modal>
<div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()"/> <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import {mapState} from 'vuex' import { mapState } from 'vuex'
export default { export default {
name: 'AppWalkask', name: 'AppWalkask',
@@ -125,41 +118,41 @@ export default {
onShow() { onShow() {
document.title = '走访慰问' document.title = '走访慰问'
}, },
mounted() { mounted() {},
},
methods: { methods: {
getList() { getList() {
this.$http this.$http
.post('/app/appvisitvondolence/list', null, { .post('/app/appvisitvondolence/list', null, {
params: { params: {
size: this.size, size: this.size,
current: this.current, current: this.current,
areaId: this.areaId, areaId: this.areaId,
createUserId: this.currentTabs == 1 ? this.user.id : '', createUserId: this.currentTabs == 1 ? this.user.id : '',
title: this.keyword, title: this.keyword,
}, },
}) })
.then((res) => { .then((res) => {
if (res.code == 0) { if (res.code == 0) {
if (this.current > res.data.pages) { if (this.current > res.data.pages) {
return return
} }
this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
this.pages = res.data.pages this.pages = res.data.pages
if (this.data) { if (this.data) {
this.data.map((item) => { this.data.map((item) => {
if (item.images) { if (item.images) {
item.images = JSON.parse(item.images || '[]') item.images = JSON.parse(item.images || '[]')
} }
return item return item
}) })
}
} }
} })
})
}, },
areaSelect(e) { areaSelect(e) {
this.data = []
this.areaId = e this.areaId = e
this.getList() this.getList()
}, },
@@ -177,7 +170,7 @@ export default {
this.$refs?.[item.id]?.[0]?.handleClose() 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}` })
} }
}, },
@@ -186,9 +179,9 @@ export default {
this.$refs?.[item.id]?.[0]?.handleClose() 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 {
uni.navigateTo({url: `./add`}) uni.navigateTo({ url: `./add` })
} }
}, },