bug-fix

src/views/Home.vue

@@ -249,7 +249,7 @@
                 </div>
               </div>
                <!-- 消息通知 -->
-              <notification-msg />
+              <notification-msg ref="notification"/>
               <el-dropdown trigger="click" style="width:130px;">
                 <span class="el-dropdown-link userinfo-inner">
                   <img src="~@/assets/img/home/avatar.png"/>
@@ -492,6 +492,7 @@ export default {
       this.getMenuList();
     }
     this.getPublicSettings();
+    this.$refs.notification&&this.$refs.notification.getMsgList()
   },
   methods: {
     // 获取商家Code

src/views/approve_manage/approveDetail.vue

@@ -238,6 +238,17 @@ export default {
                 Nodes[currentIndex].nodeStatus = 'passed'
             }
 
+            //再次遍历Nodes,去除已通过的或签节点，没有审批的审批人状态
+            Nodes.forEach(n=>{
+                if(n.nodeStatus==='passed'&&n.approveType==='或签'){
+                    n.approveList.forEach(a=>{
+                        if(a.approveStatus==='待审批'){
+                            a.approveStatus = ''
+                        }
+                    })
+                }
+            })
+
             this.TimeLineData = [startNode,...Nodes]
         },
         async changeApprove(type){

src/views/smartReport/reportList.vue

@@ -271,7 +271,7 @@
                             未发布——发布、编辑、删除
                             待提交——提交、编辑、删除
                             待审批——撤销
-                            已通过——撤销、下载图片
+                            已通过——撤销、下载图片、
                             已驳回——撤销 -->
                         <!-- 未发布,待提交 -->
                         <template v-if="[1,3].includes(scope.row.State)">
@@ -310,6 +310,15 @@
                                 @click="cancelReport(scope.row)"
                                 style="color: red; cursor: pointer">撤销</span>
                         </template>
+                        <!-- 音频上传、下载，与状态无关 -->
+                        <span style="color: #46c371; cursor: pointer;display:inline-block"
+                            v-if="permissionBtn.checkPermissionBtn(permissionBtn.smartReportManageBtn.reportManage_audioUpload)"
+                            @click="openupload(scope.row.SmartReportId)">音频上传</span>
+                        <span style="cursor: pointer; color: #4099ef;display:inline-block"
+                            v-permission="permissionBtn.smartReportManageBtn.reportManage_audioDownload"
+                            v-if="scope.row.VideoUrl" @click="handleDownloadVoice(scope.row)">
+                            音频下载
+                        </span>
                     </div>
                     </template>
                 </el-table-column>