gn_approval

config/index.js

@@ -37,8 +37,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable:{
 		'/adminapi': {
-      target: "http://192.168.77.27:8601", //本地
-      // target: "http://gneta.hzinsights.com",
+      target: "http://gneta.hzinsights.com",
       // target: "http://192.168.77.27:8606",
 			// secure:false,  // 如果是https接口，需要配置这个参数
 			changeOrigin:true, // 如果接口跨域，需要进行这个参数配置

src/components/notificationMsg.vue

@@ -126,12 +126,13 @@ import {approveInterence} from '@/api/modules/approve.js';
 import { operateAuthInterface } from '@/api/modules/setApi';
 import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
 import mDialog from './mDialog.vue';
+const tabNames = ['first','second','third'];
 export default {
     components: { mDialog },
     data() {
         this.approveState=['','process','passed','reject','return',]
         return {
-            activeName:'first',
+            activeName:'',
             visible:false,
             msgList:[],
             UnreadTotal:0,
@@ -225,14 +226,16 @@ export default {
                 
                 if(isETAApprove) this.tabsShow.first = true;
                 if(IsBIApprove_v) this.tabsShow.second = true;
-                this.activeName = Object.entries(this.tabsShow).filter(_=>_[1])[0][0] || 'third'; //默认选中第一个显示的tab
+                if(!tabNames.includes(this.activeName)){//默认选中第一个显示的tab   
+                    this.activeName = Object.entries(this.tabsShow).filter(_=>_[1])[0][0] || 'third'; 
+                }
                 resolve()
             })
         },
         async readMsg(msg){
             const res = this.activeName === 'first'    
                 ? await approveInterence.readApproveMsg({MessageId:msg.Id})
-                : this.activeName === 'second' ? approveInterence.readBiApproveMsg({MessageId:msg.Id})
+                : this.activeName === 'second' ? await approveInterence.readBiApproveMsg({MessageId:msg.Id})
                   : await operateAuthInterface.redMessage({ MessageId: msg.DataPermissionMessageId })
 
             if(res.Ret!==200) return 

src/views/approve_manage/approveDetail.vue

@@ -24,7 +24,7 @@
             <div v-else class="approve-content" 
                 v-loading="isLoading"
                 element-loading-text="看板加载中...">
-                看板内容
+                <BIBoardContent :value="boardDataList" renderHeight="calc(100vh - 250px)" />
             </div>
         </div>
         <div class="approve-tool">
@@ -70,12 +70,13 @@ import RejectDialog from './components/rejectDialog.vue';
 import {approveInterence} from '@/api/modules/approve.js';
 import {departInterence} from '@/api/api.js'
 import reportApproveConfig from "@/mixins/reportApproveConfig.js"
+import apiBiBoard from '@/api/modules/BIBoard.js'
+import BIBoardContent from '@/views/BI_manage/components/BoardContent.vue';
 
 const ApproveType = ['','依次审批','会签','或签']
 const ApproveState = ['','待审批','已同意','已驳回']
 export default {
     mixins:[reportApproveConfig],
-    components: { RejectDialog },
     data() {
         return {
             isError:false,
@@ -98,6 +99,7 @@ export default {
                 isCurrentApprover:false,//审批进行中的节点审批人是否是当前用户，控制通过&驳回按钮显示
             },
             waterMarkStr:'',//水印
+            boardDataList:[],
         };
     },
     computed:{
@@ -149,8 +151,17 @@ export default {
                 this.formType = type||'detail'
                 this.approveInfo.state=Approve.State
                 this.approveInfo.stateText=['','pending','passed','reject','return'][Approve.State]
+                this.getBoardDetail();
             })
         },
+        async getBoardDetail() {
+            this.isLoading = true;
+            const res = await apiBiBoard.boardDetail({ DashboardId: +this.reportInfo.BiId })
+            this.isLoading = false;
+            if (res.Ret === 200) {
+                this.boardDataList = res.Data.List || []
+            }
+        },
         //转换接口数据
         formatTimeLineData({Approve={},ApproveFlowNodes=[]}){
             //发起人节点
@@ -362,7 +373,7 @@ export default {
         }
         if(this.mainType == 'bi') this.getBiApproveDetail();
     },
-    components: { TimeLine, ReportDetail, Reportdtl, RejectDialog }
+    components: { TimeLine, ReportDetail, Reportdtl, RejectDialog, BIBoardContent }
 };
 </script>