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

packages/3.0.0/AppConvenienceAddressBook/components/List.vue

@@ -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>
+          <el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加
-          <ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="便民通讯录" @success="getList()">
+          </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>
@@ -91,8 +94,9 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+import {mapState} from 'vuex'
-  export default {
+
+export default {
   name: 'List',
 
   props: {
@@ -134,20 +138,18 @@
   computed: {
     ...mapState(['user']),
 
-      isShowAdd () {
+    isShowAdd() {
-        const str = this.search.areaId.substr(this.search.areaId.length - 3)
-
       return false
     }
   },
 
   watch: {
-      unitName (val) {
+    unitName(val) {
       this.$refs.tree.filter(val)
     }
   },
 
-    mounted() {
+  created() {
     this.search.areaId = this.user.info.areaId
     this.areaName = this.user.info.areaName
     this.getTree()
@@ -172,7 +174,7 @@
       })
     },
 
-      onChange (id) {
+    onChange(id) {
       this.instance.post(`/app/appconvenientaddressbook/enable?id=${id}`).then(res => {
         if (res.code == 0) {
           this.$message.success('修改成功')
@@ -186,7 +188,7 @@
       return data.name.indexOf(value) !== -1
     },
 
-      onTreeChange (e) {
+    onTreeChange(e) {
       this.search.areaId = e.id
       this.areaName = e.name
       this.search.current = 1
@@ -196,7 +198,7 @@
       })
     },
 
-      getTree () {
+    getTree() {
       this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
         if (res.code === 0) {
           let parent = res.data.map(v => {
@@ -218,7 +220,7 @@
       })
     },
 
-      addChild (parent, list) {
+    addChild(parent, list) {
       for (let i = 0; i < list.length; i++) {
         if (list[i].parentId === parent.id) {
           parent.children.push(list[i])
@@ -260,7 +262,7 @@
       })
     }
   }
-  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -315,6 +317,7 @@
 
       .addressBook-left__list--search {
         flex: 1;
+
         ::v-deep input {
           width: 100%;
         }
@@ -336,7 +339,7 @@
       background: transparent;
 
       .el-tree-node__expand-icon.is-leaf {
-        color: transparent!important;
+        color: transparent !important;
       }
 
       .el-tree-node__content > .el-tree-node__expand-icon {

packages/wechat/AppConference/detail.vue

@@ -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;