Răsfoiți Sursa

公告消息总数,不根据条件查询变动;调整公告明细作者展示方式;临床医护非超级管理员发公告权限取消

cyy 1 an în urmă
părinte
comite
d3477b0b3a

+ 9 - 7
src/views/platform/message/inner/receive.vue

@@ -141,6 +141,9 @@ export default {
       formVisible: false
     }
   },
+  created(){
+    this.totalCount()
+  },
   methods: {
     generateTitle(name, title) { // generateTitle by vue-i18n
       return i18n.generateTitle(name, title)
@@ -153,21 +156,20 @@ export default {
       getMyMsgListAll(this.getSearcFormData()).then(response => {
         // 处理数据
         ActionUtils.handleListData(this, response.data)
-        const index = this.tabDatas.findIndex(i=>i.name==this.tabActive)
-        let a = this.tabDatas[index]
-        a['val'] = response.data.pageResult.totalCount
-        this.$set(this.tabDatas,index,a)
+        // const index = this.tabDatas.findIndex(i=>i.name==this.tabActive)
+        // let a = this.tabDatas[index]
+        // a['val'] = response.data.pageResult.totalCount
+        // this.$set(this.tabDatas,index,a)
       }).catch((e) => {
         ActionUtils.handleErrorData(this, e)
       })
-      this.totalCount()
     },
     totalCount(){
         let mid = []
         this.tabDatas.forEach((e,i)=>{
-          if(e.name!=this.tabActive){
+          // if(e.name!=this.tabActive){
             mid.push({name:e.name,index:i})
-          }
+          // }
         })
         mid.forEach((e,i)=>{
           getMyMsgListAll(this.getSearcFormData(e.name))

+ 4 - 4
src/views/platform/notice/edit.vue

@@ -116,18 +116,18 @@
             form.title
           }}</van-col>
           <van-col span="24" class="notice-detailed">
-            <van-row gutter="5" type="flex" align="center">
+            <van-row gutter="5" type="flex" align="center" style="align-items: baseline;">
               <!-- <van-col class="notice-time-horizon">{{ form.publicDate|dateFormat('yyyy-MM-dd') }} <span v-if="$utils.isNotEmpty(form.loseDate)"> ~ </span>{{ form.loseDate|dateFormat('yyyy-MM-dd') }}</van-col>
               <van-col class="notice-userName ibps-is-link">{{ form.userName }}</van-col> -->
               <van-col span="15">
+                <div class="notice-userName ibps-is-link ibps-wingblank" style="margin-left: 0;line-height: 21px;">
+                  {{ form.userName }}
+                </div>
                 <span class="notice-time-horizon">
                   {{ form.publicDate | dateFormat('yyyy-MM-dd') }}
                   <span v-if="$utils.isNotEmpty(form.loseDate)"> ~ </span
                   >{{ form.loseDate | dateFormat('yyyy-MM-dd') }}
                 </span>
-                <span class="notice-userName ibps-is-link ibps-wingblank">{{
-                  form.userName
-                }}</span>
               </van-col>
 
               <!-- <van-col

+ 20 - 18
src/views/platform/notice/index.vue

@@ -3,7 +3,7 @@
     <van-sticky>
       <van-nav-bar :title="generateTitle()">
         <div slot="right" @click="onClickRight">
-          <span class="van-nav-bar__text">{{
+          <span v-if="userInfo.employee.jiNengZhiCheng === 'inside' || userInfo.employee.isSuper !== 'N'" class="van-nav-bar__text">{{
             $t('platform.notice.create')
           }}</span>
         </div>
@@ -67,14 +67,17 @@
             <van-cell :key="item.id + index" @click="onClick(item)">
               <template #title>
                 <div style="display:flex;align-items:flex-start;">
-                  <span class="ibps-size-l">{{ item.title }}</span>
-                  <img
-                    v-if="showNewIcon(item.publicDate, 3)"
-                    :src="newPng"
-                    alt=""
-                    srcset=""
-                    style="width:2em;margin-left: 3px;"
-                  />
+                  <span class="ibps-size-l" style="width:80%;">
+                    <span style="vertical-align: super;">{{ item.title }}</span>
+                    <img
+                      v-if="showNewIcon(item.publicDate, 3)"
+                      :src="newPng"
+                      alt=""
+                      srcset=""
+                      style="width:2em;margin-left: 3px;"
+                    />
+                  </span>
+                  
                 </div>
 
                 <van-tag
@@ -152,7 +155,9 @@ export default {
   },
   mixins: [navbar],
   data() {
+    const { userInfo } = this.$store.getters
     return {
+      userInfo,
       tabActive: 'publish',
       tabDatas: [
         {
@@ -189,6 +194,10 @@ export default {
       noticeReadonly: false
     }
   },
+  created(){
+    // console.log(this.userInfo)
+    this.totalCount()
+  },
   methods: {
     onClickTab(name) {
       this.title = ''
@@ -201,27 +210,20 @@ export default {
         .then(response => {
           // 处理数据
           ActionUtils.handleListData(this, response.data)
-          const index = this.tabDatas.findIndex(i=>i.name==this.tabActive)
-          let a = this.tabDatas[index]
-          a['val'] = response.data.pageResult.totalCount
-          this.$set(this.tabDatas,index,a)
         })
         .catch(e => {
           ActionUtils.handleErrorData(this, e)
         })
-        this.totalCount()
+        // this.totalCount()
     },
     totalCount(){
         let mid = []
         this.tabDatas.forEach((e,i)=>{
-          if(e.name!=this.tabActive){
-            mid.push({name:e.name,index:i})
-          }
+          mid.push({name:e.name,index:i})
         })
         mid.forEach((e,i)=>{
           queryPageList(this.getSearcFormData(e.name))
             .then(response => {
-              // this.tabDatas[e.index]['val']=response.data.pageResult.totalCount
               let a = this.tabDatas[e.index]
               a['val'] = response.data.pageResult.totalCount
               this.$set(this.tabDatas,e.index,a)