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-09 16:24:28 +08:00
parent 201d83a89c b5981a375d
commit 49ff28870c
10 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/saas/AppConflictMediation/AppConflictMediation.vue
View File

@@ -35,14 +35,7 @@ export default {
this.params = e.params
this.component = e.type
},
// tabClick(index, component) {
// this.tabIndex = index
// this.component = component
// this.refresh = false
// this.$nextTick(() => {
// this.refresh = true
// })
// },
isGirdUser() {
this.isAdmin = false
this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {

4
src/saas/AppConflictMediation/Content.vue
View File

@@ -29,9 +29,9 @@
<span>转交事件</span>
</div>
<!-- <div class="btn" v-if="this.status == 2" @click="confirm">
<div class="btn" v-if="this.status == 2" @click="confirm">
<span>拒绝受理</span>
</div> -->
</div>
<div class="btn" v-if="this.status == 3" @click="confirm">
<span>我已办结</span>

7
src/saas/AppConflictMediation/List.vue
View File

@@ -142,10 +142,9 @@ export default {
})
},
getStaticList() {
this.$http.post('/app/appclapeventgroup/list').then((res) => {
console.log(111);
console.log(res);
})
// this.$http.post('/app/appclapeventgroup/list').then((res) => {
// console.log(res);
// })
},
// 切换类型
changeType(e) {

12
src/saas/AppConflictMediation/add.vue
View File

@@ -137,8 +137,6 @@
girdName: '',
flow: '',
girdId: '',
lat: '114.138292',
lng: '30.623843',
flag: false,
result: '',
resultFiles: [],
@@ -165,7 +163,15 @@
methods: {
chooseAddress () {
uni.navigateTo({ url: './map' })
uni.chooseLocation({
success: function (res) {
this.form.address = res.address
// console.log('位置名称：' + res.name);
// console.log('详细地址：' + res.address);
// console.log('纬度：' + res.latitude);
// console.log('经度：' + res.longitude);
}
});
},
confirmSelect(e) {

8
src/saas/AppConflictMediation/detail.vue
View File

@@ -106,10 +106,10 @@
<span class="hint">转交事件</span>
</div>
<div class="columns" @click="toContent(2)">
<!-- <div class="columns" @click="toContent(2)">
<img src="./components/img/jujue.png" alt="" />
<span class="hint">拒绝受理</span>
</div>
</div> -->
<div class="doIt" @click="doItShow = true">我来受理</div>
</div>
@@ -410,7 +410,7 @@ uni-page-body {
display: flex;
flex-direction: column;
align-items: center;
width: 22%;
width: 40%;
padding: 16px 0;
border-top: 1px solid #ddd;
img {
@@ -427,7 +427,7 @@ uni-page-body {
border-right: 1px solid #ddd;
}
.doIt {
width: 56%;
width: 60%;
background: #3975c6;
text-align: center;
line-height: 112px;

3
src/saas/AppHealthUp/AppHealthUp.vue
View File

@@ -124,7 +124,7 @@
</div>
<div class="form-item__right">
<span>
<span v-for="(item, index) in healthInfo.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
<span v-for="(item, index) in healthInfo.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0" :style="item != 0 ? 'color:#FF4466;' : ''">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
</span>
</div>
</div>
@@ -172,6 +172,7 @@ export default {
this.month = date.getMonth() + 1
this.getStatis()
this.getCheckTodayReport()
this.isGirdUser()
},
onShow() {
document.title = '健康上报'

2
src/saas/AppHealthUp/OtherStatistics.vue
View File

@@ -52,7 +52,7 @@
</div>
<div class="form-item__right">
<span>
<span v-for="(item, index) in healthInfo.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
<span v-for="(item, index) in healthInfo.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0" :style="item != 0 ? 'color:#FF4466;' : ''">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
</span>
</div>
</div>

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

@@ -27,16 +27,6 @@
<u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
</div>
</div>
<div class="item">
<span class="label"><span class="tips">*</span>地区</span>
<div class="value">
<AiAreaPicker :areaId="user.areaId" v-model="userInfo.areaId" :name.sync="userInfo.areaName" @select="areaSelect">
<span class="label" v-if="userInfo.areaName">{{ userInfo.areaName }}</span>
<span v-else class="color-999">请选择</span>
<u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
</AiAreaPicker>
</div>
</div>
</div>
@@ -60,7 +50,7 @@ export default {
name: '',
phone: '',
type: '',
isPublic: '',
isPublic: '1',
areaId: '',
areaName: ''
},
@@ -110,9 +100,6 @@ export default {
if(this.userInfo.isPublic === '') {
return this.$u.toast('请选择是否公开')
}
if(!this.userInfo.areaId) {
return this.$u.toast('请选择地区')
}
if(!this.flag) return
this.$http.post(`/app/appconvenientaddressbook/addOrUpdate`, this.userInfo).then(res => {
if (res.code == 0) {

2
src/saas/AppMailList/myAddList.vue
View File

@@ -39,7 +39,7 @@ export default {
})
},
onShow() {
document.title = "便民通讯录"
document.title = "通讯录"
},
methods: {

5
src/saas/AppWalkask/add.vue
View File

@@ -3,12 +3,7 @@
<div v-if="addList">
<div class="header-description">
<u-form :model="forms" ref="uForm" label-width="auto">
<u-form-item label="区域选择" prop="areaId" class="areaIds" style="position: relative">
<AiAreaPicker :value="forms.areaId" :areaId="areaIdProps" @select="areaSelect" style="color: #333"></AiAreaPicker>
<u-icon name="arrow-right" color="rgb(192, 196, 204)" size="30" style="margin-left: 4px" />
</u-form-item>
<div class="line"></div>
<u-form-item label="走访对象" prop="name" required :right-icon="id ? '' : 'arrow-right'" class="create_user_names">
<u-input v-model="forms.name" disabled placeholder="请选择走访对象" @click="toWalkObject" />