approval

src/components/notificationMsg.vue

@@ -10,8 +10,8 @@
                 <el-tabs v-model="activeName" v-if="visible" @tab-click="getMsgList">
                     <!-- 研报审批 -->
                     <el-tab-pane v-if="tabsShow.first" :label="`${$t('AprrovalPage.research_approval_btn')}${activeName==='first'?'('+UnreadTotal+')':''}`" name="first"></el-tab-pane>
-                    <!-- 看板审批 -->
-                    <el-tab-pane v-if="tabsShow.second" :label="`${$t('SystemManage.BaseConfig.board_approval')}${activeName==='second'?'('+UnreadTotal+')':''}`" name="second"></el-tab-pane>
+                    <!-- bi看板审批 -->
+                    <el-tab-pane v-if="tabsShow.second" :label="`${$t('SystemManage.BaseConfig.bIDashboard_approval')}${activeName==='second'?'('+UnreadTotal+')':''}`" name="second"></el-tab-pane>
                     <!-- 资产数据 -->
                     <el-tab-pane v-if="tabsShow.third" :label="`${$t('SystemManage.OperateAuth.label_notice_title')}${activeName==='third'?'('+UnreadTotal+')':''}`" name="third"></el-tab-pane>
                 </el-tabs>

src/lang/modules/Aprroval/En.js

@@ -34,12 +34,12 @@ export default {
     research_approval_btn: "Research report approval",
     close_btn: "close",
     no_news_yet: "No news yet",
-    kanban_name:'Kanban name',
+    kanban_name:'BI Kanban name',
     associative_classification:'Associative classification',
     association_kanban:'Association kanban',
     processing_state:'Processing state',
     select_associated_Kanban_tip:'Please select associated Kanban',
-    enter_Kanban_name_tip:'Please enter a Kanban name',
+    enter_Kanban_name_tip:'Please enter a BI Kanban name',
   },
   AprrovalDetailPage: {
     report_name_info: "Research Report name",

src/lang/modules/Aprroval/Zh.js

@@ -34,12 +34,12 @@ export default {
     research_approval_btn: "研报审批",
     close_btn: "关闭",
     no_news_yet: "暂无消息",
-    kanban_name:'看板名称',
+    kanban_name:'BI看板名称',
     associative_classification:'关联分类',
     association_kanban:'关联看板',
     processing_state:'处理状态',
     select_associated_Kanban_tip:'请选择关联看板',
-    enter_Kanban_name_tip:'请输入看板名称',
+    enter_Kanban_name_tip:'请输入BI看板名称',
   },
   AprrovalDetailPage: {
     report_name_info: "研报名称",

src/views/approve_manage/approveList.vue

@@ -268,6 +268,7 @@ export default {
           this.classify = '';
           this.keyword = '';
           this.activeTab = 'pending';
+          tabName == 'report' ? this.getClassifyTree() : this.getBIClassifyTree();
           this.handleClick()
         },
         handleClick() {
@@ -313,7 +314,7 @@ export default {
             if(e==='处理时间') return this.$t('AprrovalPage.processing_time_lable') 
             if(e==='处理结果') return this.$t('AprrovalPage.processing_result_lable') 
             if(e==='审批时间') return this.$t('AprrovalPage.approval_time') 
-            if(e==='看板名称') return this.$t('AprrovalPage.kanban_name') 
+            if(e==='BI看板名称') return this.$t('AprrovalPage.kanban_name') 
             if(e==='关联分类') return this.$t('AprrovalPage.associative_classification') 
             if(e==='关联看板') return this.$t('AprrovalPage.association_kanban') 
             if(e==='处理状态') return this.$t('AprrovalPage.processing_state') 
@@ -339,7 +340,7 @@ export default {
             });
            if(this.IsBIApprove)
            this.mainTabs.push({
-                label:this.$t('SystemManage.BaseConfig.board_approval'),
+                label:this.$t('SystemManage.BaseConfig.bIDashboard_approval'),
                 name:'bi'  
             });
            this.activeMainTab = this.mainTabs.length > 0 ? this.mainTabs[0].name : '';

src/views/approve_manage/approveSetting.vue

@@ -121,6 +121,7 @@ export default {
           this.ClassifySecondId = 0;
           this.ClassifyId = 0;
           this.$refs.reftable&&this.$refs.reftable.clearSort();
+          tabName == 'report' ? this.getClassifyTree() : this.getBIClassifyTree();
           this.getTableData();
         },
         handleCurrentChange(page){
@@ -219,7 +220,7 @@ export default {
                 });
            if(this.IsBIApprove)
                 this.mainTabs.push({
-                    label:this.$t('SystemManage.BaseConfig.board_approval'),
+                    label:this.$t('SystemManage.BaseConfig.bIDashboard_approval'),
                     name:'bi'  
                 });
            this.activeMainTab = this.mainTabs.length > 0 ? this.mainTabs[0].name : '';

src/views/approve_manage/config/tableConfig.js

@@ -22,10 +22,10 @@ export const approve_pending_columns = [
 export const biapprove_pending_columns = [
     {
         key:'BiTitle',
-        label:'看板名称'
+        label:'BI看板名称'
     },{
         key:'ClassifyName',
-        label:'关联分类'
+        label:'关联看板'
     },{
         key:'ApplyUserName',
         label:'提交人'
@@ -72,7 +72,7 @@ export const approve_processed_columns=[
 export const biapprove_processed_columns=[
     {
         key:'BiTitle',
-        label:'看板名称'
+        label:'BI看板名称'
     },{
         key:'ClassifyName',
         label:'关联看板'
@@ -126,7 +126,7 @@ export const approve_originate_columns=[
 export const biapprove_originate_columns=[
     {
         key:'BiTitle',
-        label:'看板名称'
+        label:'BI看板名称'
     },{
         key:'ClassifyName',
         label:'关联看板'