研报，分类部分改动

src/components/notificationMsg.vue

@@ -9,7 +9,7 @@
                 <!-- 防止tabs在popover前渲染,会导致tab选中状态不正确 -->
                 <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.first" :label="`报告通知${activeName==='first'?'('+UnreadTotal+')':''}`" name="first"></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>
                     <!-- 资产数据 -->

src/views/classify_manage/classifylistV2.vue

@@ -67,6 +67,8 @@
                             v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_chapterSetting">
                             {{ $t('ReportManage.CategoryList.section_settings') }}
                         </span>
+
+                        <el-button type="text" style="color:#f00" @click.stop="handleDel(data)">删除</el-button>
                         <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
                         <img class="icon-set" src="~@/assets/img/icons/variety_set.png" alt="" @click.stop="handleEdit(data)" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyEdit">
                     </div>
@@ -118,6 +120,44 @@
                         >
                         </el-cascader>
                     </el-form-item>
+
+                    <!-- 报告类型 -->
+                    <el-form-item prop="reportType" label="报告类型">
+                        <template slot="label">
+                            <span>报告类型</span>
+                            <el-tooltip content="研报对应研报中心可选分类，PPT对应PPT中心可选分类">
+                                <i class="el-icon-warning"/>
+                            </el-tooltip>
+                        </template>
+
+                        <el-select v-model="classifyForm.reportType" style="width:400px">
+                            <el-option label="研报" :value="1"/>
+                            <el-option label="PPT" :value="2"/>
+                        </el-select>
+                        
+                    </el-form-item>
+
+                    <!-- 报告提醒 -->
+                    <el-form-item prop="warnTime" label="报告提醒">
+                        <template slot="label">
+                            <span>报告提醒</span>
+                            <el-tooltip content="开启后，指定的报告编辑人将在课题结束前定时收到写报告提醒">
+                                <i class="el-icon-warning"/>
+                            </el-tooltip>
+                        </template>
+                        <el-switch
+                            v-model="classifyForm.isReportWarn"
+                            :active-value="1"
+                            :inactive-value="0"
+                        />
+                        <el-time-picker
+                            v-if="classifyForm.isReportWarn"
+                            v-model="classifyForm.warnTime"
+                            value-format="HH:mm:ss"
+                            style="width:120px;margin-left:20px"
+                        >
+                        </el-time-picker>
+                    </el-form-item>
                    
                 </el-form>
                 <div v-html="tips" style="color:#999;"></div>
@@ -222,6 +262,9 @@ export default {
                 classify_name:"",
                 parent_id: 0,
                 variety:'',//关联的品种
+                reportType: 1,
+                isReportWarn: 0,
+                warnTime:'09:00:00'
             },
             formRules: {
                 classify_name: [{ required:true,message:this.$t('ReportManage.CategoryList.category_name_hint'),trigger:'blur'}]
@@ -234,7 +277,7 @@ export default {
             isTransferReport: false,
             transferForm: {},
 
-            tips: `注：若上级分类已关联报告，则新建的第一个子分类默认继承上级分类（父分类）关联的品种、报告、审批流。`
+            tips: `注：若上级分类已关联报告，则新建的第一个子分类默认继承上级分类（父分类）关联的报告。`
         }
     },
     mounted(){
@@ -297,6 +340,9 @@ export default {
                 classify_name:"",
                 parent_id: 0,
                 variety:'',//关联的品种
+                reportType: 1,
+                isReportWarn: 0,
+                warnTime:'09:00:00'
             }
         },
         async handleEdit(item){
@@ -306,7 +352,10 @@ export default {
                 classify_id:item.Id,
                 classify_name:item.ClassifyName,
                 parent_id: item.ParentId,
-                isLastLevel: !item.Child
+                isLastLevel: !item.Child,
+                reportType: 1,
+                isReportWarn: 0,
+                warnTime:'09:00:00'
             }
         },
         async setClassifyHandle(){
@@ -337,6 +386,15 @@ export default {
             this.classifyForm.show = false;
         },
 
+        /* 删除分类 */
+        async handleDel(item) {
+            await this.$confirm('分类删除后不可恢复，是否确认删除？', '提示', {
+                type: 'warning'
+            })
+
+            
+        },
+
         //启用\禁用设置
         handleEnableSet(item){
             // 判断权限
@@ -477,6 +535,9 @@ export default {
             }
         }
         .opt-box{
+            display: flex;
+            align-items: center;
+            gap: 10px;
             .icon-drag,.icon-set{
                 width: 16px;
                 height: 16px;

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

@@ -34,20 +34,6 @@
         </li>
         
         <template v-if="!isApprove||!hasApproveFlow">
-            <!-- <li 
-                class="action-item" 
-                :class="{'disabled':puiblishLoading}"
-                @click="handlePublishReport('dsfb')"
-                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
-                >
-                  <el-tooltip
-                    effect="dark" 
-                    :content="$t('ReportManage.ReportList.scheduled_publish_btn')" 
-                    placement="top"
-                  >
-                    <img src="~@/assets/img/icons/timing_ico.svg" class="handle-icon" alt="">
-                  </el-tooltip>
-            </li> -->
             <li 
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
@@ -123,21 +109,6 @@
                 v-if="item.CanEdit"
               >
                 {{item.PublishState===2 ? $t('ReportManage.ReportList.chapter_has_submit') : $t('ReportManage.ReportList.chapter_no_submit') }}
-                <el-popover
-                    placement="top"
-                    trigger="click"
-                >   
-                    <img style="width:150px" :src="item.QRCodeImg" alt="">
-
-                    <img 
-                      src="~@/assets/img/icons/wx_round.svg" 
-                      class="handle-icon"
-                      slot="reference"
-                      v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportMange_chapter_share)&&item.PublishState===2"
-                      style="font-size:18px;color:#0052D9;cursor:pointer;"
-                      @click.stop="handleGetWechatImg(item)"
-                    />
-                </el-popover>
               </span>
               <span v-else style="color:#E37318">{{item.Editor}}<!-- 编辑中... -->{{$t('ReportManage.smart_btn.editing')}}</span>
               <div>

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

@@ -90,7 +90,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="time" :label="$t('ReportManage.ReportList.label_createtime')">
+        <!-- <el-form-item prop="time" :label="$t('ReportManage.ReportList.label_createtime')">
           <el-date-picker
             v-model="formData.time"
             type="date"
@@ -100,7 +100,7 @@
             :clearable="false"
             style="width: 400px"
           ></el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item prop="cooperationType" :label="$t('ReportManage.ReportList.label_coop')">
           <el-radio-group
@@ -141,9 +141,9 @@
             <el-radio :label="2"><!-- 智能布局 -->{{$t('ReportManage.ReportList.layout_smart')}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="isPublcPublish">
+        <!-- <el-form-item prop="isPublcPublish">
           <template slot="label">
-            <span><!-- 公开发布 -->{{$t('ReportManage.ReportList.label_public')}}</span>
+            <span>{{$t('ReportManage.ReportList.label_public')}}</span>
             <el-tooltip class="item" effect="dark" placement="top">
               <div slot="content" v-html="publishTip"></div>
               <i class="el-icon-info"/>
@@ -156,7 +156,7 @@
             <el-radio :label="1">{{$t('Common.yes_text')}}</el-radio>
             <el-radio :label="2">{{$t('Common.no_text')}}</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
 
       </el-form>
       <div style="text-align: center; margin-top: 60px; margin-bottom: 40px">
@@ -235,7 +235,7 @@ export default {
             abstract: this.reportInfo.Abstract,
             author: this.reportInfo.Author?this.reportInfo.Author.split(","):[],
             frequency: this.reportInfo.Frequency,
-            time: this.reportInfo.CreateTime,
+            // time: this.reportInfo.CreateTime,
             cooperationType: this.reportInfo.CollaborateType,//协作方式
             cooperationUsers: this.reportInfo.GrandAdminList
               ? this.reportInfo.GrandAdminList.map(_ => ({
@@ -247,7 +247,6 @@ export default {
             isPublcPublish: this.reportInfo.IsPublicPublish
           }
 
-          // this.getRelationPermission()
       }
     },
   },
@@ -352,7 +351,7 @@ export default {
           this.formData.author.length > 0
             ? this.formData.author.join(",")
             : "",
-        CreateTime: this.formData.time,
+        // CreateTime: this.formData.time,
         ReportLayout: this.formData.reportLayout,
         CollaborateType: this.formData.cooperationType,
         IsPublicPublish: this.formData.isPublcPublish,

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

@@ -1,25 +1,22 @@
 <template>
   <div class="top-action-wrap">
-    <template>
-      <el-input 
+      <!-- <el-input 
         v-if="reportInfo&&reportInfo.ReportChapterId" 
         v-model="reportInfo.Title"
         style="width:240px;"
         :placeholder="$t('ReportManage.ReportList.label_chap_name')"
         @change="handleUpdateTitle"
-      ></el-input>
+      ></el-input> -->
       
-      <div v-else class="title text_oneLine">{{reportInfo&&reportInfo.Title}}</div>
-    </template>
+      <div class="title text_oneLine">{{reportInfo&&reportInfo.Title}}</div>
+
     
       <ul class="action-list">
           <li 
-            class="action-item" 
-            @click="$emit('handleClearContent')"
-            v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_clearCont)"
+            class="action-item"
             >
-              <img src="~@/assets/img/smartReport/icon01.png" alt="">
-              <span><!-- 一键清空内容 -->{{$t('ReportManage.ReportList.click_clear_btn')}}</span>
+              <img src="" alt="">
+              <span>返回列表</span>
           </li>
           <li v-if="!reportInfo.ReportChapterId" class="action-item" @click="$emit('openBaseInfo')">
               <img src="~@/assets/img/smartReport/icon01.png" alt="">
@@ -53,15 +50,6 @@
         <!-- 单人报告 -->
         <template v-else>
             <template v-if="!isApprove||!hasApproveFlow">
-                <!-- <li 
-                    class="action-item editsty" 
-                    :class="{'disabled':checkLoading}"
-                    @click="$emit('handlePublishOpt','dsfb')"
-                    v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
-                    >
-                    <img src="~@/assets/img/icons/timing_ico.svg" alt="">
-                    <span>{{$t('ReportManage.ReportList.scheduled_publish_btn')}}</span>
-                </li> -->
                 <li 
                     class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
@@ -106,14 +94,6 @@ export default {
     }
   },
   methods:{
-    async handleUpdateTitle() {
-      let res = await reportV2Interface.saveChapterTitle({
-        ReportChapterId: this.reportInfo.ReportChapterId,
-        Title: this.reportInfo.Title
-      })
-      if(res.Ret !== 200) return
-      this.$emit('update')
-    }
   },
   mounted() {
   }

src/views/report_manage/reportV2/list.vue

@@ -139,27 +139,7 @@
               <div @click="lookreportdtl(scope.row)">
                 <span
                   style="cursor: pointer; color: #4099ef"
-                >{{ scope.row.Title }}</span
-                >
-                <span
-                  style="cursor: pointer; color: #4099ef"
-                  v-if="scope.row.MsgSendTime"
-                  >({{ scope.row.MsgSendTime.substring(5, 7)
-                  }}{{ scope.row.MsgSendTime.substring(8, 10) }})</span
-                >
-                <span
-                  style="cursor: pointer; color: #4099ef"
-                  v-else-if="scope.row.PublishTime"
-                  >({{ scope.row.PublishTime.substring(5, 7)
-                  }}{{ scope.row.PublishTime.substring(8, 10) }})</span
-                >
-                <span
-                  style="cursor: pointer; color: #4099ef"
-                  v-else-if="scope.row.CreateTime"
-                  >({{ scope.row.CreateTime.substring(5, 7)
-                  }}{{ scope.row.CreateTime.substring(8, 10) }})</span
-                >
-
+                >{{ scope.row.Title }}</span>
               </div>
             </template>
           </el-table-column>
@@ -232,19 +212,7 @@
             align="center"
             :formatter="formatterColumn"
           ></el-table-column>
-          <el-table-column :label="$t('ReportManage.smart_issue_number_btn')" align="center">
-            <template slot-scope="scope">第{{ scope.row.Stage }}期</template>
-          </el-table-column>
-          <el-table-column
-            :label="hasUV?'PV / UV':'PV'"
-            align="center"
-            :render-header="renderHeader"
-            width="140"
-          >
-            <template slot-scope="scope"
-              >{{ hasUV? scope.row.Pv+'/'+scope.row.Uv:scope.row.Pv }}</template
-            >
-          </el-table-column>
+         
           <el-table-column :label="$t('Table.column_operations')" align="center" min-width="130" fixed="right">
             <!-- 操作 -->
             <template slot-scope="scope">

src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -9,7 +9,6 @@
 				:isApprove="isApprove"
 				:hasApproveFlow="hasApproveFlow"
 				@change="handleChapterInfo"
-				@checkClassifyNameArr="handleCheckClassifyNameArr"
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
 				@handlePublish="handlePublishReport"
@@ -322,8 +321,8 @@ export default {
 				
 				console.log(params);
 				//检查classifynameArr是否有审批流
-				let classify = [e.ClassifyIdFirst,e.ClassifyIdSecond,e.ClassifyIdThird]
-				this.handleCheckClassifyNameArr(classify)
+				// let classify = [e.ClassifyIdFirst,e.ClassifyIdSecond,e.ClassifyIdThird]
+				// this.handleCheckClassifyNameArr(classify)
 
 				reportedit(params).then(res=>{
 						if(res.Ret===200){
@@ -402,8 +401,8 @@ export default {
 			if(data.PrePublishTime){
 				this.taskTime=data.PrePublishTime
 			}
-			let classify = [data.ClassifyIdFirst,data.ClassifyIdSecond,data.ClassifyIdThird]
-			this.handleCheckClassifyNameArr(classify)
+			// let classify = [data.ClassifyIdFirst,data.ClassifyIdSecond,data.ClassifyIdThird]
+			// this.handleCheckClassifyNameArr(classify)
 		},
 		
 		/* 发布报告 */

src/views/report_manage/reportV2/normalReport/reportdtl.vue

@@ -16,10 +16,10 @@
 			<!-- 章节报告 -->
 			<block v-if="reportInfo.CollaborateType===2">
 				<div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
-					<div style="margin-bottom:10px">
+					<!-- <div style="margin-bottom:10px">
 						<span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
 						<span class="title">{{item.Title}}</span>
-					</div>
+					</div> -->
 					<div id="resetcss" style="overflow:hidden;" v-html="item.Content"></div>
 				</div>
 			</block>

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -8,7 +8,6 @@
                 :isApprove="isApprove"
 				:hasApproveFlow="hasApproveFlow"
 				@change="handleChapterInfo"
-				@checkClassifyNameArr="handleCheckClassifyNameArr"
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
                 @handlePublish="handlePublishOpt"
@@ -971,8 +970,8 @@ export default {
             }
             console.log(params);
             //检查classifynameArr是否有审批流
-            let classify = [e.ClassifyIdFirst,e.ClassifyIdSecond,e.ClassifyIdThird]
-            this.handleCheckClassifyNameArr(classify)
+            // let classify = [e.ClassifyIdFirst,e.ClassifyIdSecond,e.ClassifyIdThird]
+            // this.handleCheckClassifyNameArr(classify)
 
             reportedit({...params}).then(res=>{
                 if(res.Ret===200){
@@ -1046,8 +1045,8 @@ export default {
                     this.$nextTick(()=>{
                         this.contentChange=false
                     })
-                    let classify = [res.Data.ClassifyIdFirst,res.Data.ClassifyIdSecond]
-                    this.handleCheckClassifyNameArr(classify)
+                    // let classify = [res.Data.ClassifyIdFirst,res.Data.ClassifyIdSecond]
+                    // this.handleCheckClassifyNameArr(classify)
                 }
             })
         },

src/views/report_manage/reportV2/smartReport/reportDetail.vue

@@ -35,10 +35,10 @@
                 <!-- 章节报告 -->
                 <template v-if="reportInfo&&reportInfo.CollaborateType===2&&!$route.query.chapterId">
                     <div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
-                        <div style="margin-bottom:10px">
+                        <!-- <div style="margin-bottom:10px">
                             <span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
                             <span class="title">{{item.Title}}</span>
-                        </div>
+                        </div> -->
                         <div class="html-wrap" v-html="item.Content"></div>
                     </div>
                 </template>