Explorar el Código

修改药师审核,处方审核查询问题

wjj hace 5 días
padre
commit
43c2fc213f

+ 6 - 2
src/layout/components/Navbar.vue

@@ -49,9 +49,8 @@
     </div>
     <el-drawer :append-to-body="true" size="35%" title="消息中心" :with-header="false" :title="msg.title"
       :visible.sync="msg.open">
-      <msg ref="msg" @update-count="getMsgCount" />
+      <msg ref="msg" @update-count="getMsgCount" @close="closeMsg" />
     </el-drawer>
-
   </div>
 </template>
 
@@ -90,6 +89,7 @@ export default {
       msgPollingTimer: null, // 轮询定时器
     };
   },
+
   created() {
     this.getDoctor();
     this.getMsgCount();
@@ -156,6 +156,7 @@ export default {
 
         // 如果消息计数增加了,显示通知弹框
         if (this.msgCount > this.previousMsgCount && this.msgCount > 0) {
+
           this.$notify({
             title: '提示',
             message: '您有' + this.msgCount + "条消息通知",
@@ -178,6 +179,9 @@ export default {
       // 打开消息后重新获取消息计数来更新角标
       this.getMsgCount();
     },
+    closeMsg(){
+      this.msg.open = false;
+    },
     getDoctor() {
       getDoctorDetails().then(response => {
         this.doctor = response.data;

+ 9 - 0
src/views/components/doctorMsg/msg.vue

@@ -18,6 +18,10 @@
             <el-card>
               <h4>{{item.title}}</h4>
               <p>{{item.content}}</p>
+              <div><el-button type="text" v-if="item.isRead==0 && item.type==2" @click="toUrl('/prescribeAudit/Index',item)">前往处方审核</el-button></div>
+              <div><el-button type="text" v-if="item.isRead==0 && item.type==1 && item.title.includes('药师拒方')" @click="toUrl('/order/refuse',item)">前往拒方开方</el-button></div>
+              <div><el-button type="text" v-if="item.isRead==0 && item.type==1 && item.title.includes('用户信息采集开方')" @click="setRead(item)">前往用户处方开方</el-button></div>
+              <div><el-button type="text" v-if="item.isRead==0 && item.type==3" @click="setRead(item)">前往信息采集建议</el-button></div>
               <div><el-button type="text" v-if="item.isRead==0" @click="setRead(item)">标记为已读</el-button></div>
             </el-card>
           </el-timeline-item>
@@ -69,6 +73,11 @@ export default {
    
   },
   methods: {
+    toUrl(url,item){
+      this.setRead(item)
+      this.$router.push(url)
+      this.$emit("close")
+    },
     loadMore () {
         this.queryParams.pageNum += 1;
         this.getList();

+ 2 - 1
src/views/doctor/prescribeAudit/index.vue

@@ -192,6 +192,7 @@ export default {
     },
     handleQuery() {
       this.queryParams.pageNum = 1
+      this.queryParams.type = 2
       if (this.dateRange && this.dateRange.length === 2) {
         this.queryParams.beginCreateTime = this.dateRange[0]
         this.queryParams.endCreateTime = this.dateRange[1]
@@ -233,7 +234,7 @@ export default {
     },
     isPending(row) {
       const current = (row.auditStatus != null ? row.auditStatus : row.status)
-      return current === 0 || current === '0'
+      return (current === 0 || current === '0') && row.prescribeImgUrl
     },
     handleAudit(row) {
       const current = (row.auditStatus != null ? row.auditStatus : row.status)