Merge branch 'fix2.1'

src/components/notificationMsg.vue

@@ -22,11 +22,11 @@
                         </span>
                         <div class="info">
                             <div class="head">
-                                <span class="title">{{item.Content}}</span>
+                                <span class="title" v-if="activeName!=='first'">{{item.Content}}</span>
                                 <span class="time">{{item.CreateTime}}</span>
                             </div>
                             <!-- 审批内容 -->
-                            <div class="content" v-if="activeName==='first'">{{item.Remark||''}}&nbsp;</div>
+                            <div class="content" v-if="activeName==='first'">{{item.Content||''}}&nbsp;</div>
                             <!-- 看板审批 内容部分-->
                             <div class="content" v-else-if="activeName==='second'">{{item.Remark||''}}&nbsp;</div>
                             <!-- 权限内容 -->
@@ -254,6 +254,25 @@ export default {
         handleReportNotice(item) {
             if(item.ReportState===4) {
                 return this.$message.warning('报告已提交，无需编辑!')
+            }else if(item.ReportState === 3) {
+                let pathInfo = item.ReportType===1 
+                    ? {
+                        path: '/smpartReportEditV2',
+                        query: {
+                            id: item.ReportId,
+                            coopType: 2
+                        }
+                    } 
+                    : {
+                        path: '/ppteditor',
+                        query: { 
+                            id: item.ReportId
+                        },
+                    }
+
+                this.$router.push(pathInfo);
+            }else if(item.ReportState === 0) {
+                return this.$message.warning('报告不存在')
             }else if(item.ReportState===5) {
                 this.isOpenRejectDia = true;
                 this.rejectInfo = item
@@ -411,6 +430,9 @@ export default {
                 .head{
                     display: flex;
                     justify-content: space-between;
+                    .time {
+                        flex-shrink: 0;
+                    }
                 }
 
             }

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -78,7 +78,7 @@
             @start="dragStartHandler"
             @update="dragenter"
             @end="moveListPPT"
-            :disabled="treeName!=='private'"
+            :disabled="true"
             >
             <div class="list-item" 
                 v-for="item in catalogPPTList" :key="item.PptId"
@@ -389,7 +389,7 @@ export default {
           'publish':checkPermissionBtn(pptPermission.ppt_publish)&&item.HasAuth&&item.ReportSource===1,
           'present':checkPermissionBtn(pptPermission.ppt_show),
           'download':checkPermissionBtn(pptPermission.ppt_download)&&((item.State===6&&item.ReportSource===2) || item.ReportSource===1),
-          'edit':checkPermissionBtn(pptPermission.ppt_save)&&item.HasAuth&&((item.State===3&&item.ReportSource===2) || item.ReportSource===1),
+          'edit':checkPermissionBtn(pptPermission.ppt_save)&&item.HasAuth&&(([3,5].includes(item.State)&&item.ReportSource===2) || item.ReportSource===1),
           'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.HasAuth&&item.ReportSource===1,
       }
 

src/views/report_manage/reportV2/components/chooseInherReportDia.vue

@@ -43,21 +43,6 @@
                 <span
                 >{{ row.Title }}</span
                 >
-                <span
-                  v-if="row.MsgSendTime"
-                  >({{ row.MsgSendTime.substring(5, 7)
-                  }}{{ row.MsgSendTime.substring(8, 10) }})</span
-                >
-                <span
-                  v-else-if="row.PublishTime"
-                  >({{ row.PublishTime.substring(5, 7)
-                  }}{{ row.PublishTime.substring(8, 10) }})</span
-                >
-                <span
-                  v-else-if="row.CreateTime"
-                  >({{ row.CreateTime.substring(5, 7)
-                  }}{{ row.CreateTime.substring(8, 10) }})</span
-                >
               </span>
 
               <span v-else-if="item.key==='Classify'">