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
2022-02-10 16:24:45 +08:00
parent af184d3f98 3ce8b96d00
commit cf6a5dfea0
7 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/AiTMap.vue
View File

@@ -54,7 +54,7 @@ export default {
this.mapLib = TMap
this.tmap = new TMap.Map(this.$refs.tmap, {
zoom: 11,
center: new TMap.LatLng(this.config.lat, this.config.lng),
// center: new TMap.LatLng(this.config.lat, this.config.lng),
...this.ops
})
this.$emit('loaded')

8
src/saas/AppAskForm/Statistical.vue
View File

@@ -44,8 +44,8 @@
<image src="./components/img/user-icon.png" />
<div class="right">
<div class="right-top">
<h2><AiOpenData v-if="item.id" type="userName" :openid="item.id"/></h2>
<span>{{ $dict.getLabel('wxUserType', item.userType) }}</span>
<h2>{{ item.nickName }}</h2>
<!-- <span>{{ $dict.getLabel('wxUserType', item.userType) }}</span> -->
</div>
<p>{{ item.commitTime }}</p>
</div>
@@ -265,6 +265,10 @@
line-height: 40px;
h2 {
max-width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-right: 20px;
font-size: 30px;
color: #333;

17
src/saas/AppAskForm/components/List.vue
View File

@@ -130,13 +130,8 @@ export default {
},
showPopup(item) {
if (item.status === '2') {
this.$confirm('该调查已结束，谢谢您的参与！', '', {
showCancel: false
})
return false
}
this.info = item
this.id = item.id
this.info = item
this.id = item.id
@@ -216,6 +211,14 @@ export default {
},
toResult () {
if (this.info.dataCount < 1) {
this.$confirm('暂无调查结果信息', '', {
showCancel: false
})
return false
}
this.linkTo(`./Statistical?id=${this.info.id}`)
},

2
src/saas/AppBackUserList/AppBackUserList.vue
View File

@@ -47,7 +47,7 @@
<p>没有网格员权限<br />无法查看返乡登记哦~</p>
</div>
<div class="pad-b120"></div>
<div class="footer">
<div class="footer" v-if="isAdmin">
<div class="bg-fff" @click="linkTo(`./Add?arriveGirdId=${girdId}&arriveGirdName=${girdName}`)">登记</div>
<div class="bg-blue" @click="show=true">邀请居民填写</div>
</div>

4
src/saas/AppGridManagement/Organization.vue
View File

@@ -5,7 +5,9 @@
<image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" />
<img src="./components/img/big-user.png" alt="" v-else>
<div class="right">
<div class="name">{{item.name}}</div>
<div class="name">
<AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" />
</div>
<div class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</div>
<p>{{item.girdName}}</p>
</div>

4
src/saas/AppGridManagement/SetGird.vue
View File

@@ -49,7 +49,7 @@
<div class="info-flex" v-for="(item, index) in form.girdMemberManageList" :key="index">
<span class="label">网格长</span>
<span class="value">
<AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" />
<AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" style="display:inline-block;" />
<!-- &nbsp;&nbsp;{{ item.phone }}
<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
v-if="item.phone"> -->
@@ -60,7 +60,7 @@
<div class="info-flex" v-for="(item, index) in form.girdMemberList" :key="index">
<span class="label">网格员</span>
<span class="value">
<AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" />
<AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" style="display:inline-block;" />
<!-- &nbsp;&nbsp;{{ item.phone }}
<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
v-if="item.phone"> -->

15
src/saas/AppSpecialPeople/add.vue
View File

@@ -5,7 +5,7 @@
<span class="label"><span class="tips">*</span>类型</span>
<div class="value" @click="selectClick('appSpecialTypeFive', 'userType')">
<span
:class="form.userType === '' ? 'color-999' : ''" style="padding-left: 85px">{{
:class="form.userType === '' ? 'color-999' : ''" >{{
$dict.getLabel('appSpecialTypeFive', form.userType) || '请选择'
}}</span>
<u-icon name="arrow-right" color="#cccccc" size="14"/>
@@ -53,9 +53,9 @@
<div class="item">
<span class="label"><span class="tips">*</span>所属区域</span>
<div class="value">
<AiAreaPicker v-model="form.areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="form.areaName">
<span class="label" v-if="form.areaName" style="padding-left: 80px">{{ form.areaName }}</span>
<span v-else :class="form.areaName === '' ? 'color-999' : ''" style="padding-left: 85px">请选择</span>
<AiAreaPicker v-model="form.areaId" @select="areaSelect" :fullName.sync="form.areaName" mode="custom" all>
<span class="label" v-if="form.areaName" >{{ form.areaName }}</span>
<span v-else :class="form.areaName === '' ? 'color-999' : ''" >请选择</span>
<u-icon name="arrow-right" color="#cccccc" size="24" style="margin-left:4px;"/>
</AiAreaPicker>
</div>
@@ -71,7 +71,7 @@
<span class="label"><span class="tips"></span>所属网格</span>
<div class="value" @click="showGird=true">
<span
:class="form.girdName === '' ? 'color-999' : ''" style="padding-left: 85px">{{
:class="form.girdName === '' ? 'color-999' : ''">{{
$dict.getLabel('appSpecialTypeFive', form.girdName) || '请选择'
}}</span>
<u-icon name="arrow-right" color="#cccccc" size="24"/>
@@ -92,7 +92,7 @@
<span class="label"><span class="tips"></span>{{ item.label }}</span>
<div class="value" @click="selectClick(item.dict, item.formDbName)">
<span
:class="form[item.formDbName] === '' ? 'color-999' : ''" style="padding-left: 85px">{{
:class="form[item.formDbName] === '' ? 'color-999' : ''" >{{
$dict.getLabel(item.dict, form[item.formDbName]) || '请选择'
}}</span>
<u-icon name="arrow-right" color="#cccccc" size="24"/>
@@ -102,7 +102,7 @@
<div class="item" v-if="item.type == 'time'">
<span class="label"><span class="tips"></span>{{ item.label }}</span>
<div class="value" @click="selectTime(item.formDbName)">
<span :class="form[item.formDbName] === '' ? 'color-999' : ''" style="padding-left: 85px">{{
<span :class="form[item.formDbName] === '' ? 'color-999' : ''" >{{
$dateFormat(form[item.formDbName], 'YYYY-MM-DD') || '请选择'
}}</span>
<u-icon name="arrow-right" color="#cccccc" size="24"/>
@@ -550,7 +550,6 @@ export default {
.u-icon {
margin-left: 16px;
margin-bottom: 4px;
vertical-align: center;
}
}