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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-03-09 15:19:33 +08:00
parent ecc1500d50 22fe4f6373
commit f1d34435e5
2 changed files with 202 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/3.0.0/AppConvenienceAddressBook/components/List.vue vendored
View File

@@ -37,11 +37,14 @@
<template slot="content">
<ai-search-bar class="search-bar">
<template #left>
<el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
<ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="便民通讯录" @success="getList()">
<el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加
</el-button>
<ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="便民通讯录"
@success="getList()">
<el-button icon="iconfont iconImport">导入</el-button>
</ai-import>
<ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="便民通讯录" :disabled="tableData.length == 0">
<ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="便民通讯录"
:disabled="tableData.length == 0">
<el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
</ai-download>
</template>
@@ -92,6 +95,7 @@
<script>
import {mapState} from 'vuex'
export default {
name: 'List',
@@ -135,8 +139,6 @@
...mapState(['user']),
isShowAdd() {
const str = this.search.areaId.substr(this.search.areaId.length - 3)
return false
}
},
@@ -147,7 +149,7 @@
}
},
mounted() {
created() {
this.search.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
@@ -315,6 +317,7 @@
.addressBook-left__list--search {
flex: 1;
::v-deep input {
width: 100%;
}

13
packages/wechat/AppConference/detail.vue
View File

@@ -4,9 +4,6 @@
<template #title>
<ai-title title="会议详情" isShowBottomBorder isShowBack @onBackClick="$parent.goBack">
<template #rightBtn>
<p class="conference_top_area" v-if="detail.joinStatus==3">
<el-button type="primary" @click="toDo">待定</el-button>
</p>
<p class="conference_top_area" v-if="listType==0">
<!-- <el-button type="primary" v-if="detail.status==0" @click="changeMeeting('是否立即发布会议？')">立即发布</el-button> -->
<el-button type="primary" v-if="detail.status==1" @click="noticeMetting()">参会提醒</el-button>
@@ -18,6 +15,7 @@
</p>
<!-- v-if="detail.status==0||detail.status==3" -->
<p class="conference_top_area" v-if="listType==1&&info.status==1">
<el-button @click="toDo" style="width:80px;" class="del-btn-list">待定</el-button>
<el-button @click="innerVisible=true" v-if="info.joinStatus!=2" style="width:80px;" class="del-btn-list">
请假
</el-button>
@@ -225,13 +223,13 @@ export default {
methods: {
toDo() {
this.$confirm("是否确认待定会议？").then(_ => {
this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
this.instance.post("/app/appmeetinginfo/tobeConfirm", null, {
params: {
meetingId: this.detail.id,
}
}).then(res => {
if (res.code == 0) {
this.$u.toast("会议待定");
this.$message.success("会议待定");
setTimeout(_ => {
this.$parent.goBack();
}, 800)
@@ -412,6 +410,11 @@ export default {
height: 100%;
background: rgba(255, 255, 255, 1);
.conference_top_area {
display: flex;
align-items: center;
}
.user-search {
width: 100%;
height: 48px;