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

微心愿取消所属地区

Browse Source
This commit is contained in:
aixianling
2023-10-09 11:07:39 +08:00
parent 5a655f74f8
commit 0d06f67599
3 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/project/pingchang/AppPhotoReport/AppPhotoReport.vue
View File

@@ -11,16 +11,22 @@
<label>事件类型</label>
<span>{{ item.groupName }}</span>
</div>
<!-- <div class="photo-item__top&#45;&#45;info-item">-->
<!-- <label>所属地区</label>-->
<!-- <span>{{ item.areaName }}</span>-->
<!-- </div>-->
<div class="photo-item__top--info-item">
<label>所属地区</label>
<span>{{ item.areaName }}</span>
<label>事件描述</label>
<span class="row2">{{ item.content }}</span>
</div>
</div>
</div>
<div class="photo-item__bottom flex">
<div class="flex fill">
<i :class="'status-' + item.eventStatus"></i>
<span :class="'status-' + item.eventStatus">{{ $dict.getLabel('clapEventStatus',item.eventStatus) }}</span>
<span :class="'status-' + item.eventStatus">{{
$dict.getLabel('clapEventStatus', item.eventStatus)
}}</span>
</div>
<div v-if="item.eventStatus>1">
<div class="itemBtn" @click="toEvaluate(item.id)" v-show="!item.evaluation">去评价</div>
@@ -94,7 +100,7 @@ export default {
}).then(res => {
if (res.code == 0) {
this.total = res.data.total
this.list = this.current == 1? res.data.records : [...this.list, ...res.data.records]
this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records]
uni.hideLoading()
this.pageShow = true
}
@@ -171,6 +177,14 @@ export default {
span {
color: #333333;
font-size: 26px;
&.row2 {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
}

29
src/project/pingchang/AppPhotoReport/PhotoDetail.vue
View File

@@ -2,7 +2,9 @@
<div class="photo-detail" v-if="pageShow">
<AiGroup noBorder>
<h2>{{ info.content }}</h2>
<div class="status-name" :class="'status-'+ info.eventStatus">{{ $dict.getLabel('clapEventStatus',info.eventStatus) }}</div>
<div class="status-name" :class="'status-'+ info.eventStatus">
{{ $dict.getLabel('clapEventStatus', info.eventStatus) }}
</div>
</AiGroup>
<AiGroup description noBorder labelColor="#999">
<AiItem label="姓名" :value="info.name"/>
@@ -11,9 +13,10 @@
<AiItem label="事件类型" :value="info.groupName"/>
<AiItem label="上报位置" :value="info.address"/>
<AiItem label="所属地区" :value="info.areaName"/>
<!-- <AiItem label="所属地区" :value="info.areaName"/>-->
<AiItem label="现场照片" top-label>
<image v-for="(item, index) in info.files" @click="previewImg(item.url,info.files)" :key="index" :src="item.url"/>
<image v-for="(item, index) in info.files" @click="previewImg(item.url,info.files)" :key="index"
:src="item.url"/>
<span v-if="!info.files.length">暂无照片</span>
</AiItem>
</AiGroup>
@@ -27,17 +30,20 @@
<div class="color-999 mar-r32 stepTime" v-text="item.doTime"/>
</div>
<div v-if="item.doExplain" class="stepContent mar-t8" v-text="item.doExplain"/>
<image class="content_img" :src="e.accessUrl" v-for="(e, indexs) in item.files" :key="indexs" @click="previewImg(e.accessUrl,item.files)"/>
<image class="content_img" :src="e.accessUrl" v-for="(e, indexs) in item.files" :key="indexs"
@click="previewImg(e.accessUrl,item.files)"/>
<u-gap height="48"/>
</AiStep>
<div class="bottomBtn" v-show="info.eventStatus > 1 && !info.evaluation" @click="$linkTo(`./evaluate?id=${info.id}`)">去评价</div>
<div class="bottomBtn" v-show="info.eventStatus > 1 && !info.evaluation"
@click="$linkTo(`./evaluate?id=${info.id}`)">去评价
</div>
</AiGroup>
<div v-if="currentTab=='1'">
<div v-if="info.evaluation" class="evaluation">
<div class="rate">
<span class="title">心愿评价：</span>
<span><u-rate active-color="#F8B425" v-model="info.evaluation.evaluationScore"
inactive-color="#b2b2b2" gutter="20" disabled></u-rate></span>
inactive-color="#b2b2b2" gutter="20" disabled></u-rate></span>
</div>
<div class="detail">
<div class="titles">评价详情：</div>
@@ -46,7 +52,8 @@
<div class="photo" v-if="info.evaluation.files.length">
<div class="titles">照片</div>
<div>
<image class="content_img" :src="v.accessUrl" v-for="(v, ind) in info.evaluation.files" :key="ind" @click="previewImg(v.accessUrl,info.evaluation.files)"/>
<image class="content_img" :src="v.accessUrl" v-for="(v, ind) in info.evaluation.files" :key="ind"
@click="previewImg(v.accessUrl,info.evaluation.files)"/>
</div>
</div>
</div>
@@ -100,7 +107,7 @@ export default {
}
}).finally(() => this.$hideLoading())
},
previewImg(url,imgList) {
previewImg(url, imgList) {
let imgs = imgList.map(v => v.url)
uni.previewImage({
urls: imgs,
@@ -117,6 +124,7 @@ export default {
height: 220px;
margin-right: 8px;
}
.photo-detail {
padding: 32px 0 130px;
margin-bottom: 60px;
@@ -175,7 +183,7 @@ export default {
.evaluation {
padding: 0 32px;
box-sizing: border-box;
.rate {
display: flex;
padding-bottom: 24px;
@@ -183,10 +191,12 @@ export default {
justify-content: space-between;
border-bottom: 1px solid #DDDDDD;
}
.detail,
.photo {
padding: 24px 0;
}
.detail {
border-bottom: 1px solid #DDDDDD;
}
@@ -220,6 +230,7 @@ export default {
padding: 16px 32px;
box-sizing: border-box;
background: #F3F6F9;
.subBtn {
height: 88px;
width: 100%;

40
src/project/pingchang/AppPhotoReport/PhotoForm.vue
View File

@@ -38,23 +38,23 @@
</div>
</div>
</div>
<div class="form-item">
<div class="form-item__wrapper">
<div class="form-item__title">
<i>*</i>
<h2>所属地区</h2>
</div>
<div class="form-item__right">
<AiAreaPicker class="ai-area" v-model="form.areaId" :fullName.sync="form.areaName" @input="areaSelect">
<div class="ai-area__wrapper">
<span class="label" v-if="form.areaName">{{ form.areaName }}</span>
<span v-else style="color: #999999;">请选择</span>
<u-icon name="arrow-right" style="display: inline-block;" color="#ddd"/>
</div>
</AiAreaPicker>
</div>
</div>
</div>
<!-- <div class="form-item">-->
<!-- <div class="form-item__wrapper">-->
<!-- <div class="form-item__title">-->
<!-- <i>*</i>-->
<!-- <h2>所属地区</h2>-->
<!-- </div>-->
<!-- <div class="form-item__right">-->
<!-- <AiAreaPicker class="ai-area" v-model="form.areaId" :fullName.sync="form.areaName" @input="areaSelect">-->
<!-- <div class="ai-area__wrapper">-->
<!-- <span class="label" v-if="form.areaName">{{ form.areaName }}</span>-->
<!-- <span v-else style="color: #999999;">请选择</span>-->
<!-- <u-icon name="arrow-right" style="display: inline-block;" color="#ddd"/>-->
<!-- </div>-->
<!-- </AiAreaPicker>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="form-item__group">
<div class="form-item form-item__imgs">
@@ -217,9 +217,9 @@ export default {
return this.$toast('请输入上报人联系方式')
}
if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
return this.$toast('所属地区必须选到村或社区')
}
// if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
// return this.$toast('所属地区必须选到村或社区')
// }
if (this.flag) return
this.flag = true