Browse Source

补充注释

cxmo 1 year ago
parent
commit
70a8efd595

+ 5 - 8
src/components/notificationMsg.vue

@@ -5,9 +5,9 @@
         width="443"
         trigger="click">
         <div class="notifation-wrap">
-            <el-tabs v-model="activeName">
+            <!-- 防止tabs在popover前渲染,会导致tab选中状态不正确 -->
+            <el-tabs v-model="activeName" v-if="visible">
                 <el-tab-pane label="研报审批" name="first"></el-tab-pane>
-                <el-tab-pane label="hidden" name="hidden"></el-tab-pane>
             </el-tabs>
             <div class="massage-list">
                 <div class="message-item">
@@ -22,7 +22,7 @@
                 </div>
             </div>
         </div>
-        <span slot="reference">消息</span>
+        <span slot="reference" @click="visible = true">消息</span>
     </el-popover>
 </template>
 
@@ -30,7 +30,8 @@
 export default {
     data() {
         return {
-            activeName:'first'
+            activeName:'first',
+            visible:false
         };
     },
     methods: {
@@ -41,10 +42,6 @@ export default {
 
 <style lang="scss">
 .notifation-wrap{
-    #tab-hidden{
-        color:#fff;
-        pointer-events: none;
-    }
     .massage-list{
         padding: 10px;
         .message-item{

+ 8 - 6
src/views/approve_manage/approveDetail.vue

@@ -33,6 +33,7 @@
         </div>
         <div class="approve-tool">
             <div class="tool-btn">
+                <!-- 根据审批的状态决定显示 -->
                 <el-button>驳回</el-button>
                 <el-button>通过</el-button>
                 <el-button>撤销</el-button>
@@ -63,12 +64,13 @@ export default {
             isLoading:false,
         };
     },
-    /* watch:{
-        isLoading(val){
-
-        },
-    }, */
-    methods: {},
+    methods: {
+        getApproveDetail(){
+        }
+    },
+    mounted(){
+        this.getApproveDetail()
+    },
     components: { TimeLine, ReportDetail ,Reportdtl }
 };
 </script>

+ 1 - 1
src/views/approve_manage/components/timeLine.vue

@@ -61,7 +61,7 @@ export default {
                 {
                     nodeType:2,
                     nodeText:'审批人:', //需要拼接
-                    nodeStatus:'return',//节点未进行到
+                    nodeStatus:'return',//节点驳回
                     approveType:'依次审批',
                     approveList:[
                         {