Merge branch 'master' of http://8.136.199.33:3000/eta_gn_front/eta_front

config/index.js

@@ -37,7 +37,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable:{
 		'/adminapi': {
-      target: "http://gneta.hzinsights.com",
+      target: "http://gneta.hzinsights.com/ybeta",
       // target: "http://192.168.77.27:8606",
 			// secure:false,  // 如果是https接口，需要配置这个参数
 			changeOrigin:true, // 如果接口跨域，需要进行这个参数配置
@@ -59,7 +59,7 @@ module.exports = {
     assetsRoot: !isPreProduction ? path.resolve(__dirname, '../eta_front') : path.resolve(__dirname, '../eta_front'),
     assetsSubDirectory: 'static',
 //  assetsPublicPath: '/vue-admin/',
-		assetsPublicPath: './',
+    assetsPublicPath: process.env.VUE_APP_BASE_URL,
     productionSourceMap: false,
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.

config/prod.test.env.js

@@ -1,7 +1,7 @@
 module.exports = {
 	NODE_ENV:'"test"',
-	VUE_APP_API_ROOT:'"/adminapi"',  //测试环境
-	VUE_APP_BASE_URL:'"/"',
+	VUE_APP_API_ROOT:'"/ybeta/adminapi"',  //测试环境
+	VUE_APP_BASE_URL:'"/ybeta/"',
 	Domain:'"brilliantstart.cn"',
 	// Login:'"http://8.136.199.33:7778/login"',
 	// CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',

index.html

@@ -9,7 +9,7 @@
 	<title>智能研报</title>
 
 	<link rel="stylesheet" href="./static/css/iconfont.css"/>
-	<link rel="icon" type="image/x-icon" href="./static/fa.ico" id="icon"/>
+	<link rel="icon" type="image/png" href="./static/fa.png" id="icon"/>
 	<script src="./static/js/vue.js"></script>  <!-- 开发版，开发过程中使用此方案-->
 	<script src="./static/js/main.js"></script>  <!-- 生产版，打包的时候使用此方案 -->
 	<!-- 引入组件库 -->

src/api/modules/pptApi.js

@@ -269,6 +269,55 @@ export default{
      */
     pptEditLock:params=>{
         return http.post('pptv2/editing',params)
+    },
+
+    /**
+     * 获取ppt分类
+     * @param {*} params  Source 1-我的；2-协作；3-公共
+     * @returns 
+     */
+    getCatalogsListV2: params => {
+        return http.get('pptv2/report/classify',params)
+    },
+
+    /**
+     * ppt列表
+     * @param {
+     *  PageSize CurrentIndex Source ClassifyId Keyword
+     * } params 
+     * 
+     * @returns 
+     */
+    getPptListV2: params => {
+        return http.get('pptv2/report/list',params)
+    },
+    
+    /**
+     * 新增ppt
+     * @param {*
+     *  "Title",
+     *  "ClassifyId",
+     *  "AddType",
+     *  "InheritPptId",
+     *  "CollaborateType",
+     *  "CollaborateUserIds"
+     * } params 
+     * @returns 
+     */
+    addpptV2: params => {
+        return http.post('pptv2/report/add',params)
+    },
+
+    /**
+     * 获取有权限的ppt
+     * @param {*} params 
+     * ClassifyId Keyword CurrentIndex PageSize
+     * @returns 
+     */
+    getAuthPPtList: params => {
+        return http.get('pptv2/report/auth_list',params)
     }
 
+
+
 }

src/api/modules/reportV2.js

@@ -105,8 +105,29 @@ export const reportV2Interface = {
 	 */
 	saveChapterTitle: params => {
 		return http.post('/report/chapter/title/edit',params)
+	},
+
+	/**
+	 * 研报通知
+	 * @param {*} params 
+	 * @returns 
+	 */
+	getReportNotice: params => {
+		return http.get('/report/message/list',params)
+	},
+	
+
+	/**
+	 * 通知已读
+	 * @param {*} params 
+	 * @returns 
+	 */
+	readReportNotice: params => {
+		return http.post('/report/message/read',params)
 	}
 
+
+
 }
 
 

src/components/notificationMsg.vue

@@ -8,8 +8,8 @@
             <div class="notifation-wrap">
                 <!-- 防止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>
                     <!-- 资产数据 -->
@@ -118,10 +118,41 @@
                 </div>
             </div>
         </m-dialog>
+
+
+        <!-- 驳回弹窗 -->
+        <m-dialog
+            :show.sync="isOpenRejectDia"
+            width="40%"
+            title="驳回意见"
+            @close="isOpenRejectDia = false"
+            center
+        >
+
+            <ul class="notice-reject-container" v-if="rejectInfo">
+                <li>
+                    <label>报告标题:</label>
+                    <div>{{rejectInfo.ApproveMsg.Title}}</div>
+                </li>
+                <li>
+                    <label>驳回人: </label>
+                    <div>{{rejectInfo.ApproveMsg.ApproveUserName}}</div>
+                </li>
+                <li>
+                    <label>被驳回意见:</label>
+                    <div>{{rejectInfo.ApproveMsg.ApproveRemark}}</div>
+                </li>
+            </ul>
+
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="isOpenRejectDia = false">知道了</el-button>
+            </span>
+        </m-dialog>
     </div>
 </template>
 
 <script>
+import { reportV2Interface } from '@/api/modules/reportV2';
 import {approveInterence} from '@/api/modules/approve.js';
 import { operateAuthInterface } from '@/api/modules/setApi';
 import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
@@ -151,10 +182,14 @@ export default {
                 SubSource: 0,
             },
             tabsShow:{
-              first:false, //研报
+              first:true, //研报
               second:false, //BI
               third:true, //资产
             },
+
+            //驳回弹窗
+            isOpenRejectDia:false,
+            rejectInfo: null
         };
     },
     computed: {
@@ -216,6 +251,15 @@ export default {
         }
     },
     methods:{
+        handleReportNotice(item) {
+            if(item.ReportState===4) {
+                return this.$message.warning('报告已提交，无需编辑!')
+            }else if(item.ReportState===5) {
+                this.isOpenRejectDia = true;
+                this.rejectInfo = item
+            }
+        },
+
         async handleTabs(){
             return new Promise(async resolve=>{
                 const res = await etaBaseConfigInterence.getBaseConfig()
@@ -224,7 +268,7 @@ export default {
                 let isETAApprove = (IsReportApprove==='true'?true:false) && ReportApproveType==='eta'
                 let IsBIApprove_v = IsBIApprove==='true'?true:false
                 
-                if(isETAApprove) this.tabsShow.first = true;
+                // if(isETAApprove) this.tabsShow.first = true;
                 if(IsBIApprove_v) this.tabsShow.second = true;
                 if(!tabNames.includes(this.activeName)){//默认选中第一个显示的tab   
                     this.activeName = Object.entries(this.tabsShow).filter(_=>_[1])[0][0] || 'third'; 
@@ -234,7 +278,7 @@ export default {
         },
         async readMsg(msg){
             const res = this.activeName === 'first'    
-                ? await approveInterence.readApproveMsg({MessageId:msg.Id})
+                ? await reportV2Interface.readReportNotice({MessageId:msg.Id})
                 : this.activeName === 'second' ? await approveInterence.readBiApproveMsg({MessageId:msg.Id})
                   : await operateAuthInterface.redMessage({ MessageId: msg.DataPermissionMessageId })
 
@@ -242,7 +286,8 @@ export default {
             this.getMsgList()
             this.getUnreadNum()
 
-            if(this.activeName === 'first' || this.activeName === 'second'){
+            this.activeName === 'first' && this.handleReportNotice(msg)
+            if(this.activeName === 'second'){
                 const type = msg.ApproveState===1?'approve':msg.ApproveState===4?'detail':'myself' 
                 this.$router.push({
                     path:'/approveDetail',
@@ -257,7 +302,7 @@ export default {
         },
         async getMsgList(){
             const res = this.activeName === 'first' 
-                ? await approveInterence.getApproveMsgList({
+                ? await reportV2Interface.getReportNotice({
                     CurrentIndex:1,
                     PageSize:1000
                 })
@@ -424,4 +469,12 @@ export default {
         margin-top: 30px;
     }
 }
+
+.notice-reject-container {
+    padding:  0 30px;
+    li {
+        margin: 20px 0;
+        font-size: 15px;
+    }
+}
 </style>

src/lang/modules/Slides/commonLang.js

@@ -46,7 +46,7 @@ export const operationsZh = {
   operations_share: "设置共享",
   operations_unshare: "取消共享",
   operations_english: "转英文PPT",
-  operations_preview: "预览发布",
+  operations_preview: "去发布",
   operations_presentation: "演示",
   go_to_publish: "去发布",
   operations_save: "保存",

src/lang/modules/Slides/pptList.js

@@ -245,7 +245,7 @@ export const listZh = {
   last_save_time: "最近保存时间",
 
   //列表页操作栏
-  list_ppt_item_publish:'预览发布',
+  list_ppt_item_publish:'去发布',
   list_ppt_item_preview:'演示',
   list_ppt_item_download:'下载',
   list_ppt_item_edit:'编辑'

src/main.js

@@ -204,7 +204,14 @@ router.beforeEach(async(to, from, next) => {
 
   let auth = localStorage.getItem("auth") || false;
   if(!auth && (storage.getCookie('ai_user')||storage.getCookie('ai_token'))) {
-    transferLoginByCookie();
+
+    let timeNow = new Date().getTime();
+    if(storage.getCookie('expire') && Number(storage.getCookie('expire')) > timeNow) {
+      transferLoginByCookie();
+    }else {
+      window.location.href = location.origin+'/home/'
+    }
+
     return
   }
 

src/routes/modules/knowledgeRoutes.js

@@ -26,7 +26,7 @@ export default [{
     },
     {
       path: "/knowledge_viewpoint",
-      name: "观点库",
+      name: "报告库",
       component: () => import('@/views/knowledge_manage/list.vue'),
       meta:{
         name_en:""

src/routes/modules/oldRoutes.js

@@ -53,11 +53,11 @@ export default [
   //   component: () => import("@/views/smartReport/editReport.vue"),
   // },
   // // 智能研报详情页
-  // {
-  //   path: "/smartReportDetail",
-  //   name: "智能报告",
-  //   component: () => import("@/views/report_manage/reportV2/smartReport/reportDetail.vue"),
-  // },
+  {
+    path: "/smartReportDetail",
+    name: "智能报告",
+    component: () => import("@/views/report_manage/reportV2/smartReport/reportDetail.vue"),
+  },
 
 
   {

src/utils/buttonConfig.js

@@ -96,6 +96,7 @@ export const classifyBtn={
     classifyList_cnClassify_connect_variety:'classifyList:cnClassify:variety',//关联品种
     classifyList_cnClassify_chapterSetting:'classifyList:cnClassify:chapterSetting',//晨周报章节设置
     classifyList_cnClassify_enable:'classifyList:cnClassify:enable',//启用\禁用
+    classifyList_cnClassify_delete:'classifyList:cnClassify:delete',//分类删除
 
 
     // classifyList_cnClassify_relateSetting:'classifyList:cnClassify:relateSetting',//表单项：关联设置

src/utils/loginTransfer.js

@@ -22,7 +22,6 @@ export function setLoginCookieInfo(data) {
   localStorage.setItem("AdminId", AdminId);
   localStorage.setItem("AdminName", AdminName);
   localStorage.setItem("loginTime",new Date())
-  // storage.setCookie('ai_user',AdminName)
 
   if(['/login','/fogetpassword'].includes(location.pathname)) {
     router.replace({path:'/home'})

src/utils/parseData.js

@@ -1,12 +1,11 @@
 import ParserData from '@/api/crypto.js';
 /* 解密数据处理 */
 export function parseData(response) {
-  // const headKeyStr=response.headers.dk
-  // sessionStorage.setItem('dk',headKeyStr);
-  // const desKey=ParserData.Des3Decrypt(headKeyStr,'JMCqSoUrTAmyNNIRb0TtlrPk')
-  // let result = process.env.NODE_ENV == "production"
-  // ? JSON.parse(ParserData.Des3Decrypt(response.data,desKey))
-  // : response.data;
-  let result=response.data
+  const headKeyStr=response.headers.dk
+  sessionStorage.setItem('dk',headKeyStr);
+  const desKey=ParserData.Des3Decrypt(headKeyStr,'JMCqSoUrTAmyNNIRb0TtlrPk')
+  let result = process.env.NODE_ENV == "production"
+  ? JSON.parse(ParserData.Des3Decrypt(response.data,desKey))
+  : response.data;
   return result
 }

src/views/Home.vue

@@ -501,7 +501,7 @@ export default {
     },
 
     logoLarge() {
-      return this.$store.state.baseInfo.logoCh || this.$setting.g_logo
+      return this.$store.state.baseInfo.logoCh
     },
 
     prefixPath() {
@@ -958,7 +958,6 @@ export default {
           localStorage.setItem("ManageType", "");
           localStorage.setItem("RoleIdentity", "");
           localStorage.setItem("loginTime", "");
-          // storage.setCookie('ai_user','',-1)
         }, 10);
 
       }).catch(() => { });

src/views/Login.vue

@@ -83,18 +83,11 @@ import OrdinaryModel from "./login_manage/OrdinaryModel.vue";
 export default {
     components: { OrdinaryModel, ForgetPassModel },
     beforeRouteEnter(to, from, next){
-        // console.log(to, from);
         if(to.query.HZ == 1){
             next();
         }else{
-            let publicConfigs = JSON.parse(localStorage.getItem('publicConfigs')) || {}
-            // 有的话需要跳转至客户的页面
-            let loginUrl=publicConfigs.LoginUrl
-            if(loginUrl){
-                window.location.replace(loginUrl)
-            }else{
-                next();
-            }
+            window.location.href = location.origin+'/home/'
+            return
         }
     },
     computed: {
@@ -508,6 +501,7 @@ export default {
             localStorage.setItem("AdminName", res.Data.AdminName);
             localStorage.setItem("loginTime",new Date())
             storage.setCookie('ai_user',res.Data.AdminName)
+            storage.setCookie('expire',new Date().getTime()+(8 * 60 * 60 * 1000))
 
         },
         //根据角色判断应该进入系统的哪个页面，进入系统

src/views/approve_manage/approveList.vue

@@ -1,11 +1,11 @@
 <template>
     <!-- 审批管理列表页 -->
     <div class="approve-list-wrap approve-page-wrap" v-if="isETAApprove || IsBIApprove">
-        <div class="head-tab">
+        <!-- <div class="head-tab">
             <el-radio-group v-model="activeMainTab" style="margin-bottom: 10px;" @input="handleMainClick">
                 <el-radio-button v-for="item in mainTabs" :key="item.name" :label="item.name">{{ item.label }}</el-radio-button>
             </el-radio-group>
-        </div>
+        </div> -->
         <div class="head-tab">
             <el-tabs v-model="activeTab" @tab-click="handleClick">
                 <el-tab-pane :label="$t('AprrovalPage.be_processed_tab')" name="pending"></el-tab-pane>
@@ -356,11 +356,11 @@ export default {
             }
         },
         afterGetBaseConfig(){  //执行完reportApproveConfig中getBaseConfig之后执行  mounted之后执行
-           if(this.isETAApprove) 
-            this.mainTabs.push({
-                    label:this.$t('AprrovalPage.research_approval_btn'),
-                    name:'report' 
-            });
+        //    if(this.isETAApprove) 
+        //     this.mainTabs.push({
+        //             label:this.$t('AprrovalPage.research_approval_btn'),
+        //             name:'report' 
+        //     });
            if(this.IsBIApprove)
            this.mainTabs.push({
                 label:this.$t('SystemManage.BaseConfig.bIDashboard_approval'),
@@ -387,7 +387,7 @@ export default {
         },
     },
     mounted(){
-        this.getClassifyTree();
+        // this.getClassifyTree();
         this.getBIClassifyTree();
     },
     components: { RejectDialog }

src/views/approve_manage/approveSetting.vue

@@ -1,11 +1,11 @@
 <template>
     <!-- 审批流配置列表 -->
     <div class="approve-setting-wrap approve-page-wrap" v-if="isETAApprove || IsBIApprove">
-        <div style="margin-bottom: 10px;">
+        <!-- <div style="margin-bottom: 10px;">
             <el-radio-group v-model="activeMainTab" style="margin-bottom: 10px;" @input="handleTabClick">
                     <el-radio-button v-for="item in mainTabs" :key="item.name" :label="item.name">{{ item.label }}</el-radio-button>
             </el-radio-group>
-        </div>
+        </div> -->
         <div class="head-box">
             <el-input v-model="Keyword" @input="handleCurrentChange(1)"
                 :placeholder="$t('SystemManage.ReportApprove.placeholder02')" prefix-icon="el-icon-search" clearable style="width:360px;"></el-input>
@@ -226,11 +226,11 @@ export default {
             }).catch(()=>{})
         },
         afterGetBaseConfig(){ //执行完reportApproveConfig中getBaseConfig之后执行  mounted之后执行
-            if(this.isETAApprove) 
-                this.mainTabs.push({
-                        label:this.$t('AprrovalPage.research_approval_btn'),
-                        name:'report' 
-                });
+            // if(this.isETAApprove) 
+            //     this.mainTabs.push({
+            //             label:this.$t('AprrovalPage.research_approval_btn'),
+            //             name:'report' 
+            //     });
            if(this.IsBIApprove)
                 this.mainTabs.push({
                     label:this.$t('SystemManage.BaseConfig.bIDashboard_approval'),
@@ -248,7 +248,7 @@ export default {
         },
     },
     mounted(){
-        this.getClassifyTree();
+        // this.getClassifyTree();
         this.getBIClassifyTree();
     },
 };

src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue

@@ -169,7 +169,7 @@
           />
 
           <!-- 指标列表 -->
-          <edbTableSection :tableData="tableData"/>
+          <edbTableSection :tableData="tableData" :showCopyDataBtn="false"/>
         </div>
 
       </div> 

src/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue

@@ -30,9 +30,9 @@
       </el-table-column>
       <el-table-column :label="$t('Table.column_operations')" key="Copy" align="center" width="140">
         <template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-          <span class="editsty" @click="copyCode(scope.row)">
+          <span class="editsty" @click="copyCode(scope.row)" v-if="showCopyDataBtn">
           <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
-        ><br />
+        ><br v-if="showCopyDataBtn"/>
         <span class="editsty" @click="viewTarget(scope.row)">{{$t('Edb.detail_lookdata_btn')/* 查看数据 */}}</span>
       </template>
     </el-table-column>
@@ -49,6 +49,10 @@ export default {
     tableData: {
       type: Array,
       default: () => []
+    },
+    showCopyDataBtn:{
+      type:Boolean,
+      default:true
     }
   },
   computed:{

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -208,7 +208,7 @@
           </el-row>
 
 					<!-- 指标列表 -->
-					<edbTableSection :tableData="tableData"/>
+					<edbTableSection :tableData="tableData" :showCopyDataBtn="false"/>
 
 				</div>
 				<!-- 列表 -->

src/views/classify_manage/classifylistV2.vue

@@ -62,11 +62,18 @@
                     <div class="opt-box">
                         <!-- 章节设置 -->
                         <span class="editsty" 
-                            v-if="!data.Child || (data.Child&&!data.Child.length)" 
+                            v-if="(!data.Child||(data.Child&&!data.Child.length)) && data.ClassifyType===1" 
                             @click="chapterSetting(data)" 
                             v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_chapterSetting">
                             {{ $t('ReportManage.CategoryList.section_settings') }}
                         </span>
+
+                        <el-button
+                            v-if="data.ReportNum===0&&permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_delete)"
+                            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 +125,45 @@
                         >
                         </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" :disabled="classifyForm.classify_id||(classifyForm.parent_id&&!classifyForm.hasClassifyChild)">
+                            <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"
+                            format="HH:mm"
+                            value-format="HH:mm"
+                            style="width:120px;margin-left:20px"
+                        >
+                        </el-time-picker> 
+                    </el-form-item>
                    
                 </el-form>
                 <div v-html="tips" style="color:#999;"></div>
@@ -192,10 +238,8 @@
 
 <script>
 import mDialog from '@/components/mDialog.vue';
-import { classifylist,classifyparent,classifyadd,classifyedit } from 'api/api.js';
-import {reportVarietyInterence} from '@/api/modules/reportVariety'
+import { classifylist,classifyparent,classifyadd,classifyedit,classifydelete } from 'api/api.js';
 import {classifyPermissionInterface} from '@/api/modules/classifyApi.js'
-import { reportV2Interface } from '@/api/modules/reportV2.js'
 export default {
     components:{mDialog},
     computed: {
@@ -222,6 +266,10 @@ export default {
                 classify_name:"",
                 parent_id: 0,
                 variety:'',//关联的品种
+                reportType: 1,
+                isReportWarn: 0,
+                warnTime:'09:00',
+                hasClassifyChild:false
             },
             formRules: {
                 classify_name: [{ required:true,message:this.$t('ReportManage.CategoryList.category_name_hint'),trigger:'blur'}]
@@ -234,7 +282,7 @@ export default {
             isTransferReport: false,
             transferForm: {},
 
-            tips: `注：若上级分类已关联报告，则新建的第一个子分类默认继承上级分类（父分类）关联的品种、报告、审批流。`
+            tips: `注：若上级分类已关联报告，则新建的第一个子分类默认继承上级分类（父分类）关联的报告。`
         }
     },
     mounted(){
@@ -267,12 +315,16 @@ export default {
             }
         },
 
-        /* 添加分类默认关联父级品种 */
+        /* 添加分类默认关联父级报告类型 */
         async changeClassify(id) {
-            if(!this.classifyForm.classify_id) {
                 let item = this.$refs.classifyRef.getCheckedNodes(true)
                 console.log(item)
-            }
+                if(item&&item[0]) {
+                    this.classifyForm.reportType = item[0].data.ClassifyType;
+                    this.classifyForm.hasClassifyChild = item[0].data.HasChild ? true : false;
+                }else {
+                    this.classifyForm.hasClassifyChild = false
+                }
         },
 
         // 去设置章节
@@ -297,24 +349,34 @@ export default {
                 classify_name:"",
                 parent_id: 0,
                 variety:'',//关联的品种
+                reportType: 1,
+                isReportWarn: 0,
+                warnTime:'09:00',
+                hasClassifyChild:false
             }
         },
         async handleEdit(item){
-            
             this.classifyForm={
                 show:true,
                 classify_id:item.Id,
                 classify_name:item.ClassifyName,
                 parent_id: item.ParentId,
-                isLastLevel: !item.Child
+                isLastLevel: !item.Child,
+                reportType: item.ClassifyType,
+                isReportWarn: item.IsRemind,
+                warnTime: item.RemindTime,
+                hasClassifyChild:false
             }
         },
         async setClassifyHandle(){
             await this.$refs.formRef.validate();
-            const { classify_name,parent_id,classify_id } = this.classifyForm;
+            const { classify_name,parent_id,classify_id,reportType,isReportWarn,warnTime } = this.classifyForm;
             let params = {
                 ClassifyName: classify_name,
                 ParentId: parent_id,
+                ClassifyType: reportType,
+                IsRemind: isReportWarn,
+                RemindTime: warnTime
             }
 
             const { Ret,Msg } = classify_id 
@@ -337,6 +399,20 @@ export default {
             this.classifyForm.show = false;
         },
 
+        /* 删除分类 */
+        async handleDel(item) {
+            console.log(item)
+            await this.$confirm('分类删除后不可恢复，是否确认删除？', '提示', {
+                type: 'warning'
+            })
+            const res = await classifydelete({ClassifyId:item.Id})
+            
+            if(res.Ret!==200) return
+            this.$message.success('删除成功')
+            this.getList()
+            
+        },
+
         //启用\禁用设置
         handleEnableSet(item){
             // 判断权限
@@ -477,6 +553,9 @@ export default {
             }
         }
         .opt-box{
+            display: flex;
+            align-items: center;
+            gap: 10px;
             .icon-drag,.icon-set{
                 width: 16px;
                 height: 16px;

src/views/dataEntry_manage/chartSetting.vue

@@ -1128,17 +1128,12 @@ export default {
       sessionStorage.removeItem('beforeOptions');
       //详情时判断是否是本人添加图表 若不是不用做保存校验 新增时要进入保存校验逻辑
       if (
-        (this.selected_chartid &&
-          (this.role === 'admin' ||
-            this.chartInfo.SysUserId === this.roleId)) ||
-        !this.chartInfo.SysUserId
+        this.selected_chartid &&
+        this.chartInfo.HaveOperaAuth &&
+        (this.role==='admin' || this.chartInfo.SysUserId===this.roleId || !this.chartInfo.SysUserId)
       ) {
         let arr = sessionStorage.getItem('defaultArr');
-        if (
-          arr &&
-          this.selected_chartid &&
-          arr !== JSON.stringify(this.tableData)
-        ) {
+        if (arr && arr !== JSON.stringify(this.tableData)) {
           this.$confirm('您还未保存此图表，是否确认保存？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -576,6 +576,9 @@ export default {
                     this.initData()
                 }
                 this.handleFilter()
+
+                this.getClassifyOpt()
+                this.getSysUserList()
             }
         }
     },
@@ -659,11 +662,6 @@ export default {
 
         }
     },
-    mounted() {
-        this.getClassifyOpt()
-        this.getEDBList()
-        this.getSysUserList()
-    },
     
     methods: {
         // 编辑时初始化数据

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -46,6 +46,7 @@
 					<tableNoData :text="defaultWarn"/>
 			</div>
 		</el-table>
+		<template v-if="showDataList">
 		<ul 
 			class="value-ul" 
 			ref="valueUl" 
@@ -68,6 +69,7 @@
 			</li>
 			<li class="nodata value-item" v-if="!dataList.length">{{$t('Table.prompt_slogan')}}</li>
 		</ul>
+		</template>
 	</div>
 </template>
 
@@ -98,6 +100,10 @@ export default {
 			type:Array,
 			default:()=>{return []}
 		},
+		showDataList:{
+			type:Boolean,
+			default:true
+		},
 		haveMore:{
 			type:Boolean,
 			default:false

src/views/dataEntry_manage/databaseList.vue

@@ -451,6 +451,7 @@
 								:table-colums-two="tableColumsTwo"
 								:data-list="dataList"
 								:haveMore="haveMore"
+								:showDataList="false"
 								@getNextData="()=>{page_no++;getDataList();}"
 							/>
 						</div>
@@ -892,7 +893,7 @@ export default {
 				);
 				this.page_no = 1;
 				if(this.$refs.edb_detail_data){
-					this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+					//this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 				}
 				this.select_node = search_obj.UniqueCode;
 				this.selected_edbid = newval;
@@ -1157,7 +1158,7 @@ export default {
 					}
 					if(type==='refresh') {
 						if(this.$refs.edb_detail_data){
-							this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+							//this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 						}
 					}
 					this.$refs.menuTree&&this.$nextTick(()=>{
@@ -1862,7 +1863,7 @@ export default {
 		initGetData() {
 			this.page_no = 1;
 			if(this.$refs.edb_detail_data){
-				this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+				//this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 			}
 			this.getDataList();
 		},
@@ -2059,7 +2060,7 @@ export default {
 		initDataStatus() {
 			this.page_no = 1;
 			if(this.$refs.edb_detail_data){
-				this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
+				//this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 			}
 			this.getDataList();
 		},

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -473,7 +473,7 @@ export default {
 
       if(res.Ret !== 200) return
       
-      const { EdbInfoId,EdbCode,EdbName,Frequency,Unit,StartDate,ModifyTime,PredictDataList,DataList,HaveOperaAuth } = res.Data.Item;
+      const { EdbInfoId,EdbCode,EdbName,Frequency,Unit,StartDate,ModifyTime,PredictDataList,DataList,HaveOperaAuth,SourceName } = res.Data.Item;
 
       this.selectEdbInfo = {
         EdbCode,
@@ -484,6 +484,7 @@ export default {
         ModifyTime,
         EdbInfoId,
         HaveOperaAuth,
+        SourceName,
         DataList: PredictDataList ? [...PredictDataList,...DataList].slice(0,5) : DataList.slice(0,5)
       };
     },

src/views/intervalAnalysis/addChart.vue

@@ -248,7 +248,7 @@
           </div>
 
           <!-- 关联指标 -->
-          <edbTableSection :tableData="tableData" />
+          <edbTableSection :tableData="tableData" :showCopyDataBtn="false"/>
         </div>
       </div>
       <div class="nodata" v-else>

src/views/intervalAnalysis/list.vue

@@ -348,7 +348,7 @@
             </el-col>
           </el-row>
           <!-- 指标列表 -->
-          <edbTableSection :tableData="tableData" />
+          <edbTableSection :tableData="tableData" :showCopyDataBtn="false"/>
         </div>
         <!-- 列表 -->
         <chartListTableWrap

src/views/knowledge_manage/edit.vue

@@ -77,7 +77,7 @@
 
       </el-form>
 
-      <el-button type="primary" @click="handleEdit" v-if="!isEdit">编辑</el-button>
+      <el-button type="primary" @click="handleEdit" v-if="!isEdit&&permissionBtn.isShowBtn('knowledgePermission','know_edit')">编辑</el-button>
     </header>
     <div class="main">
       <!-- 编辑 -->
@@ -169,7 +169,7 @@ export default {
       let pathMap = {
         0: { name: '事件库',path:'knowledge_event' },
         1: { name: '政策库',path:'knowledge_policy' },
-        2: { name: '观点库',path:'knowledge_viewpoint' },
+        2: { name: '报告库',path:'knowledge_viewpoint' },
         3: { name: '知识库',path:'knowledge_know' },
       }
       to.meta.pathFrom=pathMap[to.query.source].path;

src/views/knowledge_manage/tagSetting.vue

@@ -98,7 +98,7 @@ export default {
             let pathMap = {
                 0: { name: '事件库',path:'knowledge_event' },
                 1: { name: '政策库',path:'knowledge_policy' },
-                2: { name: '观点库',path:'knowledge_viewpoint' },
+                2: { name: '报告库',path:'knowledge_viewpoint' },
                 3: { name: '知识库',path:'knowledge_know' },
             }
             to.meta.pathFrom=pathMap[to.query.source].path;

src/views/ppt_manage/mixins/pptEditorMixins.js

@@ -93,11 +93,18 @@ export default{
         e.preventDefault()
         //只获取文字
         const text = e.clipboardData.getData('text/plain')
+        
         if(!text.trim().length){
             this.$message.warning(this.$t('Slides.title_paste_hint'))
         }
-        e.target.innerHTML += text.trim()
-        item.title += text.trim()
+        if(e.target.nodeName==='BR'&&e.target.parentNode.className.includes('title-editor')) { //不知道怎么冒出个br这玩意，处理下
+          e.target.parentNode.innerHTML = text.trim()
+          item.title = text.trim()
+        }else {
+          e.target.innerHTML += text.trim()
+          item.title += text.trim()
+          
+        }
     },
     handleInput(e,item){
         const text = e.target.innerHTML

src/views/ppt_manage/mixins/pptMixins.js

@@ -217,17 +217,18 @@ export default {
             Editor,
             CoverContent,
             TitleSetting,
-            AdminId
+            AdminId,
+            ReportSource
         } = res.Data
         const pptDate = formatPPTDate(this.currentLang, PptDate)
-        let legalContent = JSON.parse(Content)
+        let legalContent = Content ? JSON.parse(Content) : []
         legalContent = legalContent.map(page => {
             page.elements = checkPPTpageElemant(page)
             return page
         })
         let legalTitleSetting = null
         try{
-            legalTitleSetting = JSON.parse(TitleSetting)
+            legalTitleSetting = TitleSetting ? JSON.parse(TitleSetting) : null
         }catch(e){
             console.log(e)
             legalTitleSetting = null
@@ -250,7 +251,8 @@ export default {
             Editor,
             CoverContent,
             TitleSetting:legalTitleSetting,
-            AdminId
+            AdminId,
+            ReportSource
         }
       }else{
         this.result = {status:'',content:'获取ppt数据失败!'}

src/views/ppt_manage/newVersion/components/catalog/addPptBaseDia.vue

@@ -0,0 +1,417 @@
+<template>
+  <div>
+    <el-dialog
+      title="添加ppt"
+      :visible.sync="show"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      :center="true"
+      v-dialogDrag
+      width="800px"
+      top="5vh"
+      @close="handleClose"
+    >
+      <el-form
+        :model="formData"
+        :rules="rules"
+        ref="baseinfoForm"
+        class="ppt-baseInfo-wrap"
+        label-width="125px"
+      >
+        <el-form-item prop="type" :label="$t('ReportManage.ReportList.label_add_way')">
+          <el-radio-group
+            v-model="formData.type"
+            :disabled="id"
+            @change="handleUpdateBaseInfo"
+          >
+            <el-radio :label="1">{{
+              $t("ReportManage.ReportList.new_report_radio")
+            }}</el-radio>
+            <el-radio :label="2">{{
+              $t("ReportManage.ReportList.inherit_report_radio")
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item prop="classify" :label="$t('ReportManage.ReportList.label_report_classify')">
+          <el-cascader
+            ref="cascader"
+            :options="classifyArr"
+            :disabled="id"
+            v-model="formData.classify"
+            :props="{
+              value: 'Id',
+              label: 'ClassifyName',
+              children: 'Child',
+              emitPath: false
+            }"
+            :placeholder="$t('ReportManage.ReportList.please_select_category')"
+            size="medium"
+            style="width: 400px"
+            @change="handleChangeClassify"
+          />
+        </el-form-item>
+
+
+        <el-form-item prop="title" :label="$t('ReportManage.ReportList.label_report_tit')">
+          <el-input
+            :placeholder="$t('ReportManage.ReportList.input_title_please')"
+            v-model="formData.title"
+            style="width:400px"
+          >
+            <el-button slot="append" type="primary" v-if="formData.type===2&&!id" @click="isChooseInherReport=true"><!-- 选择继承报告 -->{{$t('ReportManage.ReportList.choose_inherit_report')}}</el-button>
+          </el-input>
+
+        </el-form-item>
+        
+       
+        <el-form-item prop="cooperationType" :label="$t('ReportManage.ReportList.label_coop')">
+          <el-radio-group
+            v-model="formData.cooperationType"
+            :disabled="id||formData.type===2"
+            @change="formData.cooperationUsers=[]"
+          >
+            <el-radio :label="1"><!-- 个人 -->{{$t('ReportManage.ReportList.coop_own')}}</el-radio>
+            <el-radio :label="2"><!-- 多人协作 -->{{$t('ReportManage.ReportList.coop_more')}}</el-radio>
+          </el-radio-group>
+
+          <el-button 
+            type="text" 
+            v-if="formData.cooperationType===2"
+            style="margin-left: 20px"
+            @click="handleChooseCooper"
+          ><!-- 选择协作人 -->{{$t('ReportManage.ReportList.choose_cooper')}}</el-button>
+          
+          <div class="choosed-cooper" v-if="formData.cooperationUsers.length">
+            <el-tag
+              v-for="(item,index) in formData.cooperationUsers"
+              :key="item.NodeId"
+              size="mini"
+              effect="dark"
+              closable
+              @close="removeCooper(index)"
+            >
+              {{ item.NodeName }}
+            </el-tag>
+          </div>
+        </el-form-item>
+
+      </el-form>
+      <div style="text-align: center; margin-top: 60px; margin-bottom: 40px">
+        <el-button
+          type="primary"
+          plain
+          style="width: 120px"
+          @click="handleClose"
+          >{{ $t("Dialog.cancel_btn") }}</el-button
+        >
+        <el-button type="primary" style="width: 120px" @click="handleConfirm">{{
+          $t("Dialog.confirm_btn")
+        }}</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 选择协作人弹窗 -->
+    <chooseCooperaUserDia
+      :isShow.sync="isChooseCooperaUser"
+      :users="formData.cooperationUsers"
+      @save="getChooseCooperaUser"
+    />
+
+    <!-- 选择继承报告弹窗 -->
+    <chooseInherReportDia
+      :isShow.sync="isChooseInherReport"
+      source="ppt"
+      @success="chooseInheritReport"
+    />
+  </div>
+</template>
+
+<script>
+import { pptInterface } from '@/api/api.js';
+import chooseCooperaUserDia from '@/views/report_manage/reportV2/components/chooseCooperaUserDia.vue';
+import chooseInherReportDia from '@/views/report_manage/reportV2/components/chooseInherReportDia.vue';
+export default {
+  name: "BaseInfo",
+  components: { chooseCooperaUserDia,chooseInherReportDia },
+  model: {
+    prop: "show",
+    event: "showChange",
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    id: {
+      type: Number,
+      default: 0,
+    },
+    reportInfo: {
+      type: Object
+    }
+  },
+  watch: {
+    show(n) {
+      if (!n) return
+      
+      this.getclassifylist();
+      
+      if (this.reportInfo) {
+          this.formData = {
+            type: this.reportInfo.AddType,
+            inheritId: 0,
+            classify: this.reportInfo.ClassifyId,
+            title: this.reportInfo.Title,
+            cooperationType: this.reportInfo.CollaborateType,//协作方式
+            cooperationUsers: this.reportInfo.GrandAdminList
+              ? this.reportInfo.GrandAdminList.map(_ => ({
+                  NodeId: _.AdminId,
+                  NodeName: _.AdminName
+                }))
+              : []
+          }
+
+      }
+    },
+  },
+  data() {
+    return {
+      formData: {
+        type: 1,
+        inheritId: 0,//继承report id
+        classify: 0,
+        title: "",
+        cooperationType: 1,//协作方式
+        cooperationUsers: []
+      },
+
+      classifyArr: [],
+      authorlist: [],
+
+      //协作人弹窗
+      isChooseCooperaUser: false,
+
+      //继承报告弹窗
+      isChooseInherReport:false,
+    };
+  },
+  computed: {
+    rules() {
+      return {
+        type: [
+          {
+            required: true,
+            message: this.$t("ReportManage.ReportList.please_report_type_select"),
+            trigger: "change",
+          },
+        ],
+        classify: [
+          {
+            required: true,
+            message: this.$t("ReportManage.ReportList.please_report_type_select"),
+            trigger: "change",
+          },
+        ],
+        title: [
+          {
+            required: true,
+            message: this.$t("ReportManage.ReportList.please_report_title_input"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  methods: {
+    handleClose() {
+      this.$refs.baseinfoForm.resetFields()
+      this.formData = {
+        type: 1,
+        inheritId: 0,
+        classify: 0,
+        title: "",
+        cooperationType: 1,//协作方式
+        cooperationUsers: []
+      }
+
+      this.$emit("update:show", false);
+    },
+
+    async handleConfirm() {
+      await this.$refs.baseinfoForm.validate()
+
+      const params = {
+        AddType: this.formData.type,
+        ClassifyId: this.formData.classify,
+        Title: this.formData.title,
+        CollaborateType: this.formData.cooperationType,
+        InheritPptId: this.formData.inheritId,
+        CollaborateUserIds: this.formData.cooperationUsers.map(_ => _.NodeId)
+      };
+
+      // 编辑
+      if (this.id) {
+        this.$emit("save", params);
+        return;
+      }
+      pptInterface.addpptV2(params).then((res) => {
+        if (res.Ret === 200) {
+
+          let { href } = this.$router.resolve({
+            path: '/ppteditor',
+            query: { 
+              id: res.Data.PptId
+            },
+          });
+          window.open(href, "_blank");
+
+          this.handleClose();
+        }
+      });
+    },
+
+
+    //分类变化 
+    handleChangeClassify(val) {
+      this.formData.type===2&&this.handleUpdateBaseInfo()
+    },
+
+    handleUpdateBaseInfo() {
+      this.formData.inheritId = 0;
+
+      if(!this.formData.classify) return
+
+      
+      //获取上次报告
+      pptInterface.getAuthPPtList({
+        ClassifyId: this.formData.classify,
+        CurrentIndex: 1,
+        PageSize:1,
+        Keyword:''
+      }).then((res) => {
+        if (res.Ret !== 200) return;
+        if (!res.Data.List&&this.formData.type===2) {
+          this.$message.warning(
+            this.$t("ReportManage.ReportList.no_reports_msg")
+          );
+          return false;
+        }
+
+        this.chooseInheritReport(res.Data.List[0])
+      });
+    },
+
+    /* 选择继承报告 */
+    async chooseInheritReport(item) {
+      const { PptId,Title,CollaborateType,CollaborateUsers,ClassifyId } = item;
+
+      this.formData.title = Title;
+      this.formData.cooperationType = CollaborateType;
+      this.formData.inheritId = PptId;
+      this.formData.classify = ClassifyId
+      
+      //继承的章节报告默认带出协作人
+      if(CollaborateType===1) {
+        this.formData.cooperationUsers = [];
+      }else {
+       
+        this.formData.cooperationUsers = CollaborateUsers
+          ? CollaborateUsers.map(_ => ({
+              NodeId: _.AdminId,
+              NodeName: _.RealName
+            }))
+          : [];
+      }
+    },
+
+    //选择协作人
+    handleChooseCooper() {
+      this.isChooseCooperaUser = true
+    },
+
+    getChooseCooperaUser(val) {
+      this.formData.cooperationUsers = val;
+    },
+
+    removeCooper(index) {
+      this.formData.cooperationUsers.splice(index,1)
+    },
+
+
+    // 获取选择的分类名称
+    getSelectClassifyName() {
+      let arr = [];
+      this.classifyArr.forEach((item) => {
+        if (
+          this.formData.classify[0] &&
+          item.value === this.formData.classify[0]
+        ) {
+          arr.push(item.label);
+          if (item.children && item.children.length > 0) {
+            item.children.forEach((_item) => {
+              if (
+                this.formData.classify[1] &&
+                _item.value === this.formData.classify[1]
+              ) {
+                arr.push(_item.label);
+              }
+            });
+          }
+        }
+      });
+      return arr;
+    },
+
+    // 获取分类
+    getclassifylist() {
+      //获取分类列表
+      pptInterface.getCatalogsListV2({Source: 1}).then((res) => {
+        if (res.Ret == 200 && Array.isArray(res.Data)) {
+          this.classifyArr = res.Data||[];
+          this.filterNodes(this.classifyArr)
+        }
+      });
+    },
+
+    filterNodes(arr) {
+			arr.length && arr.forEach(item => {
+				if(item.Child && item.Child.length) {
+          this.filterNodes(item.Child)
+        }else {
+          delete item.Child
+        }
+			})
+		}
+  },
+};
+</script>
+
+<style lang="scss">
+.ppt-baseInfo-wrap {
+  width: 85%;
+  margin: 0 auto;
+  .el-input {
+    width: 100%;
+  }
+  .el-input-group__append {
+    background-color: #0052D9;
+    color: #fff;
+  }
+  .el-form-item {
+    margin-left: auto;
+    margin-right: auto;
+  }
+  .choosed-cooper {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+  }
+  .permission-wrap {
+    width: 80%;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+  }
+}
+</style>

src/views/ppt_manage/newVersion/components/catalog/mergePPTDialog.vue

@@ -1,82 +1,129 @@
 <template>
-  <!-- ↓ @click="handleMouseDown" -->
   <div class="merge-ppt-dialog-wrap">
      <el-dialog
       v-if="mergePptShow"  
       :visible.sync="mergePptShow" 
       :close-on-click-modal="false" 
       :modal-append-to-body="false"
-      @close="cancelHandle" v-dialogDrag center width="40%" top="8vh">
+      @close="cancelHandle" v-dialogDrag center width="650px" top="8vh">
       <div slot="title" style="display: flex; alignitems: center">
         <span style="fontsize: 16px">{{$t('Slides.ppt_merge_btn')}}</span>
       </div>
       <div class="dialog-container">
         <div class="ppt-form">
           <div class="input-item" style="position:relative;">
-            <h3>{{$t('Slides.please_select_ppt_title')}}</h3>
+            <h3>
+              <span>{{$t('Slides.please_select_ppt_title')}}</span>
+              <el-cascader
+                  @change="getPPtList"
+                  :options="classifyOptions"
+                  v-model="searchClassifyId"
+                  :props="{
+                    value: 'Id',
+                    label: 'ClassifyName',
+                    children: 'Child',
+                    emitPath:false
+                  }"
+                  clearable
+                  :placeholder="$t('ReportManage.smart_type_filtering')"
+                  style="width:200px;"
+              ></el-cascader>
+            </h3>
             <div class="select-ppt-wrap select-wrap">
-              <el-tabs value="public">
-                <el-tab-pane :label="$t('Slides.public_ppt_tabs')" name="public">
-                  <div class="tree-container">
-                    <div class="tree-list" :key="treeKey">
-                      <div class="list-item" v-for="(item,index) in publicList" :key="item.nodeKeyId" @click.stop="expandList(index,'public')">
-                        <p class="item-label"><span @click.stop="expandList(index,'public')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                        <template v-if="item.expand">
-                          <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                            <el-checkbox
-                              :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                              v-model="i.checked"
-                              @change="(checked)=>{changeCheck(checked,i,'public')}"
-                            >{{i.label}}</el-checkbox>
-                          </div>
-                        </template>
-                      </div>
-                    </div>
-                  </div>
+              <el-tabs value="public" v-model="panelSource" @tab-click="()=>{getCatalogsList();getPPtList()}">
+                <el-tab-pane :label="$t('Slides.public_ppt_tabs')" :name="3">
                 </el-tab-pane>
-                <el-tab-pane :label="$t('Slides.my_ppt_tabs')" name="private">
-                  <div class="tree-container">
-                    <div class="tree-list" :key="treeKey">
-                      <div class="list-item" v-for="(item,index) in privateList" :key="item.nodeKeyId" @click.stop="expandList(index,'private')">
-                        <p class="item-label"><span @click.stop="expandList(index,'private')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                        <template v-if="item.expand">
-                          <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                            <el-checkbox
-                              :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                              v-model="i.checked"
-                              @change="(checked)=>{changeCheck(checked,i,'private')}"
-                            >{{i.label}}</el-checkbox>
-                          </div>
-                        </template>
-                      </div>
-                    </div>
-                  </div>
+                <el-tab-pane :label="$t('Slides.my_ppt_tabs')" :name="1">
                 </el-tab-pane>
               </el-tabs>
+              
+              <ul class="tree-container" v-if="catalogPPTList.length">
+                <li v-for="item in catalogPPTList" :key="item.PptId" class="list-item">
+                  <el-checkbox
+                    v-model="item.checked"
+                    @change="(checked)=>{changeCheck(checked,item)}" 
+                  >{{item.Title}}</el-checkbox>
+                </li>
+              </ul>
+
+              <tableNoData text="暂无ppt" size="mini" v-else/>
             </div>
             <div class="selected-ppt-wrap ">
               <span>{{$t('Slides.selected_pages')}}：</span>
               <div class="selected-ppt">
                 <div class="select-node" v-for="item in choosedItemArr" :key="item.PptId">
-                  <span>{{ item.Title }}  {{translatePageNumber(item.PptPage)}}</span>
-                  <i class="el-icon-error" @click.stop="changeCheck(false,item,'unknow')"></i>
+                  <span>{{ item.Title }}  （{{item.PptPage}}页）</span>
+                  <i class="el-icon-error" @click.stop="changeCheck(false,item,'list')"></i>
                 </div>
               </div>  
             </div>
           </div>
-          <div class="input-item">
-            <h3>{{$t('Slides.please_selecdirectory_into')}}</h3>
-            <div class="select-catalog-wrap select-wrap">
-              <el-radio-group v-model="selectedCatalogId">
-                <el-radio v-for="item in MyPrivateList" :key="item.GroupId" 
-                :label="item.GroupId">{{item.GroupName}}</el-radio>
+          
+          <el-form
+            :model="pptInfo"
+            :rules="rules"
+            ref="baseinfoForm"
+            class="ppt-baseInfo"
+            label-width="100px"
+          >
+            <el-form-item prop="classify" :label="$t('ReportManage.ReportList.label_report_classify')">
+              <el-cascader
+                ref="cascader"
+                :options="privateClassifyList"
+                v-model="pptInfo.classify"
+                :props="{
+                  value: 'Id',
+                  label: 'ClassifyName',
+                  children: 'Child',
+                  emitPath:false
+                }"
+                :placeholder="$t('ReportManage.ReportList.please_select_category')"
+                size="medium"
+                style="width: 400px"
+              />
+            </el-form-item>
+
+            <el-form-item prop="Title" :label="$t('ReportManage.ReportList.label_report_tit')">
+              <el-input
+                :placeholder="$t('ReportManage.ReportList.input_title_please')"
+                v-model="pptInfo.Title"
+                style="width:400px"
+              >
+              </el-input>
+
+            </el-form-item>
+            
+            <el-form-item prop="cooperationType" :label="$t('ReportManage.ReportList.label_coop')">
+              <el-radio-group
+                v-model="pptInfo.cooperationType"
+                :disabled="pptInfo.type===2"
+                @change="pptInfo.cooperationUsers=[]"
+              >
+                <el-radio :label="1"><!-- 个人 -->{{$t('ReportManage.ReportList.coop_own')}}</el-radio>
+                <el-radio :label="2"><!-- 多人协作 -->{{$t('ReportManage.ReportList.coop_more')}}</el-radio>
               </el-radio-group>
-            </div>
-          </div>
-          <div class="input-item">
-            <h3>{{$t('Slides.ppt_title_input')}}</h3>
-            <el-input  :placeholder="$t('Slides.input_ppt_title')" v-model="pptInfo.Title" required ></el-input>
-          </div>
+
+              <el-button 
+                type="text" 
+                v-if="pptInfo.cooperationType===2"
+                style="margin-left: 20px"
+                @click="isChooseCooperaUser = true"
+              ><!-- 选择协作人 -->{{$t('ReportManage.ReportList.choose_cooper')}}</el-button>
+              
+              <div class="choosed-cooper" v-if="pptInfo.cooperationUsers.length">
+                <el-tag
+                  v-for="(item,index) in pptInfo.cooperationUsers"
+                  :key="item.NodeId"
+                  size="mini"
+                  effect="dark"
+                  closable
+                  @close="removeCooper(index)"
+                >
+                  {{ item.NodeName }}
+                </el-tag>
+              </div>
+            </el-form-item>
+          </el-form>  
         </div>
       </div>
       <div slot="footer" class="foot-container">
@@ -84,16 +131,25 @@
         <el-button @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 选择协作人弹窗 -->
+    <chooseCooperaUserDia
+      :isShow.sync="isChooseCooperaUser"
+      :users="pptInfo.cooperationUsers"
+      @save="getChooseCooperaUser"
+    />
   </div>
    
 </template>
 
 <script>
 import {pptInterface} from '@/api/api.js';
-import {pptEnInterface} from '@/api/modules/pptEnApi.js';
 import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
 import {changeCatalogArr,createRandomCode} from '../../utils/untils';
+import chooseCooperaUserDia from '@/views/report_manage/reportV2/components/chooseCooperaUserDia.vue';
 export default {
+  components: { chooseCooperaUserDia },
   props:{
     mergePptShow:{
       type:Boolean,
@@ -106,28 +162,53 @@ export default {
         Title:'',
         ImgUrl:'',//读取etaBaseConfig中封面页的第一个
         BackIndex:0,
-        TemplateType:1
+        TemplateType:1,
+        classify: 0,
+        cooperationType: 1,//协作方式
+        cooperationUsers:[],
+
       },//PPT的标题信息
       publicList:[],
-      privateList:[],
-      treeKey:0,
+      catalogPPTList:[],
+
       disabled:false,//判断所有的checkbox是否应该是启用/禁用状态
       choosedIdArr:[],//选中的PPTIds
       choosedItemArr:[],//选中的PPT item
-      choosedTreesName:{},//选中的ppt分别来自哪个目录
+
       PptId:0,//合并后的pptId
-      showCatalog:false,
-      selectedCatalogId:0,//选择的目录Id
       saveLoading:null,//加载loading
-      MyPrivateList:[]
+
+      classifyOptions: [],
+      privateClassifyList: [],
+      rules: {
+        classify: [
+          {
+            required: true,
+            message: '报告分类不能为空',
+            trigger: "change",
+          },
+        ],
+        Title: [
+          {
+            required: true,
+            message: '报告标题不能为空',
+            trigger: "blur",
+          },
+        ],
+      },
+
+      panelSource: 1,
+      searchClassifyId:0,
+      //协作人弹窗
+      isChooseCooperaUser: false,
     };
   },
   watch:{
     mergePptShow(newValue){
       if(newValue){
         this.init()
-        this.getCatalogsList()
-        this.getPrivateList()
+        this.getCatalogsList('init')
+        this.getPPtList()
         this.getBaseConfig()
       }
       if(!newValue){
@@ -138,19 +219,44 @@ export default {
     }
   },
   methods: {
+
+    //ppt列表
+    async getPPtList() {
+      const res = await pptInterface.getPptListV2({
+        PageSize: 1000,
+        CurrentIndex: 1,
+        Source: this.panelSource,
+        ClassifyId: this.searchClassifyId,
+        Keyword: ''
+      })
+        
+      if(res.Ret!==200) return
+      let data = res.Data.List||[];
+      this.catalogPPTList = data.map(_ => ({
+        ..._,
+        checked: this.choosedIdArr.includes(_.PptId)?true:false
+      }))
+    },
+
+    getChooseCooperaUser(val) {
+      this.pptInfo.cooperationUsers = val;
+    },
+    
+    removeCooper(index) {
+      this.pptInfo.cooperationUsers.splice(index,1)
+    },
+
     cancelHandle(){
       this.$emit('cancel')
     },
-    translatePageNumber(num){
-      let str = this.$i18n.locale == 'zh' ?`（{${num}}页）`:`（Slide{${num}}）`
-      return str
-    },
+
     async saveChange(){
       const {result,msg} = this.checkForm()
       if(!result){
         this.$message.warning(msg)
         return
       }
+      await this.$refs.baseinfoForm.validate()
       this.saveLoading = this.$loading({
         fullscreen:true,
         lock: true,
@@ -160,14 +266,12 @@ export default {
         background: 'rgba(255, 255, 255, 0.8)'
       })
       await this.getPptsDetail()
-      if(this.$parent.currentLang==='en'){
-        this.pptInfo.PptDate = (new Date().getFullYear())+'.'+(new Date().getMonth()+1)
-      }
+      
       await this.addNewPpt()
       if(this.PptId!==0){
         this.saveLoading.close()
         //跳转至ppt编辑页
-        const path = this.$parent.currentLang!=='en'?'/ppteditor':'/ppteneditor'
+        const path = '/ppteditor'
         this.$router.push({
             path,
             query:{
@@ -182,10 +286,7 @@ export default {
       if(this.choosedIdArr.length!==2){
         return {result:false,msg: this.$t('Slides.please_select_two_msg')}
       }
-      if(!this.pptInfo.Title.length){
-        return {result:false,msg:this.$t('Slides.please_fill_title_msg')}
-      }
-      if(this.selectedCatalogId===0){
+      if(this.pptInfo.classify===0){
         return {result:false,msg:this.$t('Slides.please_select_directory_msg') }
       }
       return {result:true,msg:''}
@@ -194,26 +295,21 @@ export default {
     async getPptsDetail(){
       //只需要content
       let content_font = [],content_back=[]
-      const res_font = this.$parent.currentLang!=='en'
-      ? await pptInterface.getpptDetail({
-          PptId:this.choosedIdArr[0]
-        })
-      : await pptEnInterface.getpptDetail({
-          PptId:this.choosedIdArr[0]
-        })
+      const res_font = await pptInterface.getpptDetail({
+        PptId:this.choosedIdArr[0]
+      })
+
       if(res_font.Ret===200){
         content_font = JSON.parse(res_font.Data.Content)
       } 
-      const res_back = this.$parent.currentLang!=='en'
-      ? await pptInterface.getpptDetail({
-          PptId:this.choosedIdArr[1]
-        })
-      : await pptEnInterface.getpptDetail({
-          PptId:this.choosedIdArr[1]
-        })
+      const res_back = await pptInterface.getpptDetail({
+        PptId:this.choosedIdArr[1]
+      })
+
       if(res_back.Ret===200){
         content_back = JSON.parse(res_back.Data.Content)
       }
+
       //合并两个content,并给每个重新赋id,保证id唯一
       let content = content_font.concat(content_back)
       this.content = content.map(item=>{
@@ -223,17 +319,29 @@ export default {
     },
     //添加PPT
     async addNewPpt(){
-      const res = this.$parent.currentLang!=='en'
-      ? await pptInterface.addppt({
-          FirstPage:this.pptInfo,
-          Content:JSON.stringify(this.content),
-          GroupId:this.selectedCatalogId
-        })
-      : await pptEnInterface.addppt({
-          FirstPage:this.pptInfo,
+      const { 
+        Title,
+        ImgUrl,
+        BackIndex,
+        TemplateType, 
+      } = this.pptInfo
+
+      const res = await pptInterface.addpptV2({
+          FirstPage:{
+            Title,
+            ImgUrl,
+            BackIndex,
+            TemplateType 
+          },
           Content:JSON.stringify(this.content),
-          GroupId:this.selectedCatalogId
+          AddType: 1,
+          ClassifyId: this.pptInfo.classify,
+          Title: Title,
+          CollaborateType: this.pptInfo.cooperationType,
+          InheritPptId: 0,
+          CollaborateUserIds: this.pptInfo.cooperationUsers.map(_ => _.NodeId)
         })
+      
       if(res.Ret===200){
         this.$message.success(this.$t('Slides.merging_successful_msg'))
         this.PptId = res.Data.PptId
@@ -245,96 +353,47 @@ export default {
       }  
     },
     //PPT的选中和取消选中处理
-    changeCheck(type,i,treeName){
-      let ListName = treeName==='public'?'privateList':'publicList'
-      //从已选择的PPT内点击,只能是取消选中
-      if(treeName==='unknow'){
-        ListName = this.choosedTreesName[i.PptId]+'List'
-      }
-      if(type){
+    changeCheck(type,i,treeName=''){
+      if(type) {
+        if(this.choosedIdArr.length===2){
+          i.checked=false;
+          return this.$message.warning('最多只能选择两个ppt')
+        }
         this.choosedIdArr.push(i.PptId)
         this.choosedItemArr.push(i)
-        this.choosedTreesName[i.PptId] = treeName
-        //选中时,同时要将另一个List的对应i也勾选,如果有
-        this.setNodeChecked(ListName,i.PptId,true)  
-      }else{
+      }else {
         const index = this.choosedIdArr.findIndex(item=>item===i.PptId)
         index!==-1&&this.choosedIdArr.splice(index,1)
         index!==-1&&this.choosedItemArr.splice(index,1)
-        //取消选中时,同时要将另一个List的对应i也取消勾选,如果有
-        this.setNodeChecked(ListName,i.PptId,false)
-        if(treeName==='unknow'){
-          ListName = this.choosedTreesName[i.PptId]==='public'?'privateList':'publicList'
-          this.setNodeChecked(ListName,i.PptId,false)
-        }
-        delete this.choosedTreesName[i.PptId]
-      }
-      if(this.choosedIdArr.length===2){
-        this.disabled = true
-      }else if(this.choosedIdArr.length<2){
-        if(this.disabled){
-          this.disabled=false
-        }
-      }
-    },
-    //设置ppt的选中取消和禁用启用属性
-    setNodeChecked(listName,PptId,checked){
-      this[listName].forEach(item=>{
-        if(item.children.length>0){
-          item.children.forEach(i=>{
-            if(i.PptId===PptId){
-              i.checked = checked
-              //顺便禁用下,不然看起来就像选了四个
-              i.disabled = checked
-            }
-          })
-        }
-      })
-    },
-    //展开收起列表
-    expandList(index,treeName){
-      const {expand} = this[`${treeName}List`][index]
-      this.$set(this[`${treeName}List`][index],'expand',!expand)
-      this.treeKey++
-    },
-    //获取PPT目录
-    async getCatalogsList(){
-      const res = this.$parent.currentLang!=='en'
-        ? await pptInterface.getCatalogsList({IsNewPpt:1})
-        : await pptEnInterface.getCatalogsList({IsNewPpt:1})
-      if(res.Ret===200){
-        const {PublicList,PrivateList} = res.Data
-        this.publicList = changeCatalogArr(PublicList)
-        this.privateList = changeCatalogArr(PrivateList)
-        this.publicList.forEach(item=>{
-          item.expand = false
-        })
-        this.privateList.forEach(item=>{
-          item.expand = false
+        
+        treeName==='list' && this.catalogPPTList.forEach(_ => {
+          if(_.PptId===i.PptId) {
+            _.checked = false
+          }
         })
       }
     },
-    //获取私有PPT目录
-    async getPrivateList(){
-      const res = this.$parent.currentLang!=='en'
-        ? await pptInterface.getPrivateCatalogList()
-        : await pptEnInterface.getPrivateCatalogList()
+
+    //获取PPT目录
+    async getCatalogsList(type=''){
+      const res = await pptInterface.getCatalogsListV2({Source: 3})
       if(res.Ret===200){
-        this.MyPrivateList = res.Data.List||[]
-        this.selectedCatalogId = this.MyPrivateList[0].GroupId
+        this.classifyOptions = res.Data||[]
+        this.filterNode(this.classifyOptions)
+
+        type==='init' && (this.privateClassifyList = this.classifyOptions)
       }
     },
-    //模拟blur事件,隐藏展开的目录框
-    handleMouseDown(target){
-      //console.log(target)
-      const {path} = target
-      for(let i=0;i<path.length;i++){
-        if(path[i].className==="catalog-wrap")return
-      }
-      if(this.showCatalog){
-        this.showCatalog = false
-      }
+    filterNode(arr) {
+      arr.forEach(item => {
+        if(item.Child&&item.Child.length) {
+          this.filterNode(item.Child)
+        }else {
+          delete item.Child
+        }
+      })
     },
+
     //重置data的值
     init(){
       Object.assign(this.$data,this.$options.data())
@@ -343,7 +402,7 @@ export default {
         etaBaseConfigInterence.getBaseConfig().then(res=>{
                 if(res.Ret!==200) return
                 const {CnPptCoverImgs='',EnPptCoverImgs=''} = res.Data||{}
-                this.pptInfo.ImgUrl = this.$parent.currentLang!=='en'?CnPptCoverImgs.split(',')[0]:EnPptCoverImgs.split(',')[0]
+                this.pptInfo.ImgUrl = CnPptCoverImgs.split(',')[0]
         })
     }
   },
@@ -382,7 +441,7 @@ export default {
           font-size: 14px;
           color:#999999FF;
           &.is-active{
-            color: #409EFF
+            color: #0052D9;
           }
         }
         .el-tabs__nav-wrap.is-top{
@@ -417,33 +476,6 @@ export default {
     width: 100%;
     display: flex;
     justify-content: space-between;
-    .public-tree,.private-tree{
-     /*  flex: 1; */
-      width:47.5%;
-      .tree-container{
-        margin-top: 10px;
-        width:100%;
-        height:300px;
-        overflow-y: scroll;
-        border: 1px dashed #999;
-        .tree-list{
-          .list-item{
-            cursor: pointer;
-            .item-label{
-              &:hover{
-                background-color: #f0f4ff;
-              }
-            }
-            .list-child{
-              margin-left: 10px;
-              &:hover{
-                background-color: #f0f4ff;
-              }
-            }
-          }
-        }
-      }
-    }
     
   }
   .ppt-form{
@@ -456,6 +488,11 @@ export default {
     .input-item{
       width: 90%;
       margin-top:20px;
+      h3 {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
       &:first-child{
         margin-top: 0;
       }
@@ -522,25 +559,23 @@ export default {
         .tree-container{
           height:200px;
           overflow-y: scroll;
-          .tree-list{
-            .list-item{
-              margin-left: 20px;
-              margin-top: 6px;
-              cursor: pointer;
-              &:first-child{
-                margin-top:0;
-              }
-              .item-label{
-                &:hover{
-                  background-color: #f0f4ff;
-                }
+          .list-item{
+            margin-left: 20px;
+            margin-top: 6px;
+            cursor: pointer;
+            &:first-child{
+              margin-top:0;
+            }
+            .item-label{
+              &:hover{
+                background-color: #f0f4ff;
               }
-              .list-child{
-                margin-left: 10px;
-                margin-top: 6px;
-                &:hover{
-                  background-color: #f0f4ff;
-                }
+            }
+            .list-child{
+              margin-left: 10px;
+              margin-top: 6px;
+              &:hover{
+                background-color: #f0f4ff;
               }
             }
           }
@@ -598,6 +633,16 @@ export default {
         border: 1px solid #DCDFE6;
       }
     }
+
+    .ppt-baseInfo {
+      width: 100%;
+      margin-top: 30px;
+      .choosed-cooper {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
+      }
+    }
   }
 }
 </style>

src/views/ppt_manage/newVersion/components/formatEl/ChartEl.vue

@@ -16,13 +16,13 @@
           v-if="isBtnShow&&![1,6].includes($parent.modelId)"
       ></div>
     </el-tooltip>
-    <el-tooltip :content="$t('Slides.add_to_my_gallery_tooltip')" placement="bottom"  v-if="$parent.isAdd&&chartTitle.length&&item">
+    <!-- <el-tooltip :content="$t('Slides.add_to_my_gallery_tooltip')" placement="bottom"  v-if="$parent.isAdd&&chartTitle.length&&item">
       <div class="addBtn"
         style="margin-right:2%;"
         @click.stop="addChart(position)"
       >
       </div>
-    </el-tooltip>
+    </el-tooltip> -->
     <el-tooltip :content="$t('Slides.copy_name_tooltip')" placement="bottom"  v-if="$parent.isCopy&&chartTitle.length&&item">
       <div class="copyBtn"
         style="margin-right:2%;"
@@ -126,7 +126,7 @@ export default {
   .dragBtn,.copyBtn,.addBtn,.closeBtn{
     position: static;
   }
-  .addBtn{
+  .copyBtn{
     margin-left: auto;
   }
 }

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -157,7 +157,7 @@
             <div class="tool-btn">
                 <el-button type="primary" :loading="refreshBtnLoading" @click="refleshFormatEl">{{$t('Slides.operations_refresh')}}</el-button>
                 <el-button v-permission="permissionBtn.pptPermission.ppt_publish"
-                 type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>
+                 type="primary" @click="handlePublish">{{ result.ReportSource===1?'去发布':'去提交' }}</el-button>
                 <el-button @click="handleSave('save')">{{$t('Slides.operations_save')}}</el-button>
                 <el-button type="text" @click="handleChangeEditModal"><i class="el-icon-sort" style="transform: rotate(90deg);margin-right:5px;"></i>{{isEditLayer? $t('Slides.ppt_edit_btn'):$t('Slides.layer_editing')}}</el-button>
             </div>
@@ -1062,7 +1062,7 @@ export default {
       if(this.$route.query.id||this.pptId){
         await this.editPPT(FirstPage,Content,type)
       }else{
-        await this.addPPT(FirstPage,Content)
+        // await this.addPPT(FirstPage,Content)
       }
     },
     async addPPT(FirstPage,Content){
@@ -1141,6 +1141,9 @@ export default {
     },
     //保存时的校验规则:封面信息,至少一页
     save_checkPPT(){
+      if(!this.firstPage.BackgroundImg){
+        return {result:false,hintText:'请选择封面页！'}
+      }
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
       }
@@ -1151,6 +1154,9 @@ export default {
     },
     //发布时的校验规则:封面信息,每一页标题及内容
     checkPPT(){
+      if(!this.firstPage.BackgroundImg){
+        return {result:false,hintText:'请选择封面页！'}
+      }
       //检验首页
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
@@ -1160,7 +1166,7 @@ export default {
       }
       //检验每一页
       for(let i=0;i<this.pageList.length;i++){
-        if(!this.pageList[i].title){
+        if(!this.pageList[i].title||this.pageList[i].title==='<br>'){
           return {result:false,hintText:this.$t('Slides.please_ppt_title_msg',{count:i+1}) }
         }
         //无内容

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -5,7 +5,8 @@
 
         <!-- 下载配置 -->
         <el-button  type="primary" style="width:182px;height:40px;margin-left: 0;" @click="downloadPPT" :disabled="isPublish">{{$t('Slides.operations_download')}}</el-button>
-        <el-dropdown split-button style="width:182px;height:40px;" type="primary" @click="transHandle" @command="handleCommand" :disabled="isPublish">
+        <!-- 发布 -->
+        <el-dropdown split-button style="width:182px;height:40px;" type="primary" @click="transHandle" @command="handleCommand" :disabled="isPublish" v-if="result.ReportSource===1">
           {{layoutStr}}
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :command="1">10:7</el-dropdown-item>
@@ -13,6 +14,13 @@
             <el-dropdown-item :command="3">4:3</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
+        <!-- 提交 -->
+        <el-button 
+          v-else-if="result.ReportSource===2"
+          type="primary" 
+          :disabled="isPublish" 
+          @click="handleSubmitPPt" 
+        >提交</el-button>
       </div>
       <!--全加载-->
       <template v-if="loadingAll">
@@ -82,7 +90,7 @@ export default {
   mixins:[pptmixin,mixins],
   data() {
     return {
-        coverInfo:{
+      coverInfo:{
         id:0,
         title:'封面',
         index:{
@@ -126,6 +134,17 @@ export default {
 
   },
   methods: {
+    /* 提交 */
+    async handleSubmitPPt() {
+      await this.$confirm('是否确认提交报告进入审批流程？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+
+      this.transHandle()
+    },
+
     //计算title的字节数
     getStrCount(title){
         return countStrSize(title)
@@ -367,7 +386,7 @@ export default {
               h:offsetY===0?height:(realSize.height/imgData2Obj.imgHeight*percentHeight)+'%',
               size:{type:"contain"}
             })
-          }else if(sheetData){
+          }else if(sheetData.list){
             slide.addTable(sheetData.list,{
               x:x,y:y,w:width,h:height,border:{type:'solid',pt:1}
             })
@@ -494,7 +513,6 @@ export default {
 
         
         // 上传到阿里云oss
-        // this.handleUploadToOSS(data)
         let clientType = this.$setting.dynamicOutLinks.ObjectStorageClient ||
                         this.$store.state.dynamicOutLinks.ObjectStorageClient ||
                         JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient
@@ -524,7 +542,7 @@ export default {
           PptxUrl:url
         })
       if(res.Ret===200){
-        this.$message.success(this.$t('MsgPrompt.publish_msg'))
+        this.$message.success(this.$t(this.result.ReportSource===1?'MsgPrompt.publish_msg':'MsgPrompt.submit_msg'))
         this.publishLoading.close()
       }
     },

src/views/ppt_manage/newVersion/utils/config.js

@@ -609,6 +609,14 @@ export const pptCoverEn = [
 export const pptBaseSize = {width:906,height:906*0.7}
 //ppt列表操作项
 export const toolList = [
+    // {
+    //     label:'撤销',
+    //     key:'cancel'
+    // },
+    {
+        label:'提交',
+        key:'submit'
+    },
     {
         label:'预览发布',
         key:'publish'
@@ -621,22 +629,22 @@ export const toolList = [
         label:'下载',
         key:'download'
     },
-    {
-        label:'',
-        key:'transform'
-    },
-    {
-      label:'转英文PPT',
-      key:'transEn'
-    },
+    // {
+    //     label:'',
+    //     key:'transform'
+    // },
+    // {
+    //   label:'转英文PPT',
+    //   key:'transEn'
+    // },
     {
         label:'编辑',
         key:'edit'
     },
-    {
-        label:'复制',
-        key:'copy'
-    },
+    // {
+    //     label:'复制',
+    //     key:'copy'
+    // },
     {
         label:'删除',
         key:'delete'

src/views/ppt_manage/newVersion/utils/untils.js

@@ -1,5 +1,6 @@
 import { modelMap,pptLayout,pptSlideMaster,pptSlideMasterEn } from "./config";
 import { parse } from "himalaya";
+import md5 from "@/utils/md5.js";
 //根据modelId返回组件名,用于component:is
 export const countComponentName = (modelId,type)=>{
     let componentName = type==='pre'?'formatPre':'format'
@@ -265,19 +266,19 @@ export const getImgRealSize = ({imgWidth,imgHeight,naturalWidth,naturalHeight})=
 //格式化目录数组数据,返回树形数据结构格式
 export const changeCatalogArr = (arr)=>{
     let tempArr = arr.map((item)=>{
-        item.label = item.GroupName
-        item.copyIconShow = false
-        item.isShare = item.IsShare
-        item.nodeKeyId = item.GroupId
-        item.children = item.PptList?item.PptList.map((i)=>{
-          i.nodeKeyId = 'ppt'+i.PptId //避免和目录id重复的情况
-          i.label = i.Title
-          i.catalogId = item.GroupId
-          i.isShare = i.IsSingleShare
-          i.copyIconShow = false
-          i.isTrans = i.ReportId===0?false:true
-          return i
-        }):[]
+        item.label = item.ClassifyName
+        item.nodeKeyId = item.Id
+        
+        if(item.Child&&item.Child.length){
+          item.children = item.Child
+          changeCatalogArr(item.children)
+        }else {
+          item.children = item.PptList?item.PptList.map((i)=>{
+            i.nodeKeyId = 'ppt'+i.PptId //避免和目录id重复的情况
+            i.label = i.Title
+            return i
+          }):[]
+        }
         return item
       })
     return tempArr
@@ -291,7 +292,8 @@ export const changeCatalogArr = (arr)=>{
     const randomIndex = Math.floor(Math.random() * maxLen)
     ret += charset[randomIndex]
   }
-  return ret
+  let timp = new Date().getTime()
+  return md5.hex_md5(`${ret}${timp}`)
 }
 //计算各个版式下,文本框占据的真实宽度
 //基准:编辑页ppt-item的最大宽高:w:900px;h:630

src/views/predictEdb_manage/components/childData.vue

@@ -51,6 +51,7 @@
 					<tableNoData :text="defaultWarn"/>
 			</div>
 		</el-table>
+    <template v-if="showDataList">
     <ul
       class="value-ul"
       ref="valueUl"
@@ -76,6 +77,7 @@
       </li>
       <li class="nodata value-item" v-if="!dataList.length"><!-- 暂无数据 -->{{$t('Table.prompt_slogan')}}</li>
     </ul>
+    </template>
   </div>
 </template>
 
@@ -84,7 +86,11 @@ import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
 export default {
   props: {
     id: Number,
-    lang: String
+    lang: String,
+    showDataList:{
+      type:Boolean,
+      default:true
+    }
   },
   watch: {
     id(newval) {

src/views/predictEdb_manage/predictEdb.vue

@@ -263,7 +263,7 @@
 							:lang="currentLang" 
 							:isAllowEditLimit="isEdbBtnShow('edbPreData_editLimit')"
 							ref="detailComponentRef"
-							
+							:showDataList="false"
 							@updateTit="setNameBack"
 							@setCurrentClassify="setCurrentClassify"
 							@setOpera="({button,detail}) => { edbButton = button;predictEdbInfo=detail }"

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

@@ -33,21 +33,8 @@
           </el-tooltip>
         </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>
+        <!-- 系统内报告 -->
+        <template v-if="reportBase.ReportSource===1">
             <li 
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
@@ -63,7 +50,8 @@
                 </el-tooltip>
             </li>
         </template>
-        <template v-if="isApprove&&hasApproveFlow">
+        <!-- 来源智力共享报告 -->
+        <template v-else-if="reportBase.ReportSource===2">
             <li 
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
@@ -123,25 +111,11 @@
                 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>
                 <img
+                  v-if="isCreator"
                   src="~@/assets/img/data_m/move_ico.png"
                   alt=""
                   style="width: 16px; height: 16px;margin-right:5px;"
@@ -166,9 +140,9 @@
                       :command="{type:'del',item}"
                       v-if="isCreator"
                     ><!-- 删除 -->{{$t('Table.delete_btn')}}</el-dropdown-item>
-                    <el-dropdown-item 
+                    <!-- <el-dropdown-item 
                       :command="{type:'adTag',item}" 
-                      v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportMange_chapter_editTag)"><!-- 添加标签 -->{{$t('ReportManage.ReportList.add_labels_section')}}</el-dropdown-item>
+                      v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportMange_chapter_editTag)">{{$t('ReportManage.ReportList.add_labels_section')}}</el-dropdown-item> -->
                     
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -669,12 +643,6 @@ export default {
 
       if(res.Data.PrePublishTime) this.$parent.taskTime = res.Data.PrePublishTime;
 
-      if(type!=='notCheck') {
-        let classify = [res.Data.ClassifyIdFirst,res.Data.ClassifyIdSecond,res.Data.ClassifyIdThird]
-        this.$emit('checkClassifyNameArr',classify)
-      }
-
-      // this.reportVarietyOpts = res.Data.PermissionList||[];
       this.userOpts = res.Data.GrandAdminList||[];
 
     },

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

@@ -61,9 +61,14 @@
               </span>
 
               <span v-else-if="item.key==='Classify'">
-                {{ row.ClassifyNameFirst }}
-                <span v-if="row.ClassifyNameSecond">/ {{ row.ClassifyNameSecond }}</span>
-                <span v-if="row.ClassifyNameThird">/ {{ row.ClassifyNameThird }}</span>
+                <template v-if="source==='ppt'">
+                  {{ row.FullClassify }}
+                </template>
+                <template v-else>
+                  {{ row.ClassifyNameFirst }}
+                  <span v-if="row.ClassifyNameSecond">/ {{ row.ClassifyNameSecond }}</span>
+                  <span v-if="row.ClassifyNameThird">/ {{ row.ClassifyNameThird }}</span>
+                </template>
               </span>
 
               <span v-else-if="item.key==='CreateTime'">
@@ -98,6 +103,7 @@
 </template>
 <script>
 import { reportV2Interface } from '@/api/modules/reportV2.js';
+import { pptInterface } from '@/api/api.js';
 import mPage from '@/components/mPage.vue'
 export default {
   components: { mPage },
@@ -108,6 +114,10 @@ export default {
     id: {
       type: Number,
       default: 0
+    },
+    source: {
+      type: String,
+      default:'report'
     }
   },
   computed: {
@@ -166,18 +176,19 @@ export default {
       this.getReportList()
     },
 
-    getReportList() {
-      reportV2Interface.getAuthReportList({
-          CurrentIndex: this.pageNo,
-          PageSize:this.pageSize,
-          Keyword:this.searchTxt
-        })
-        .then((res) => {
+    async getReportList() {
+      let params = {
+        CurrentIndex: this.pageNo,
+        PageSize:this.pageSize,
+        Keyword:this.searchTxt
+      }
+      const res =  this.source === 'ppt'
+        ? await pptInterface.getAuthPPtList(params)
+        : await reportV2Interface.getAuthReportList(params)
           if (res.Ret !== 200) return;
           
           this.reportList = res.Data.List || [];
           this.total = res.Data.Paging.Totals;
-        })
     }
   },
 }

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

@@ -58,6 +58,7 @@
             :placeholder="$t('ReportManage.ReportList.input_title_please')"
             v-model="formData.title"
             style="width:400px"
+            :disabled="reportInfo&&reportInfo.ReportSource===2"
           >
             <el-button slot="append" type="primary" v-if="formData.type===2&&!id" @click="isChooseInherReport=true"><!-- 选择继承报告 -->{{$t('ReportManage.ReportList.choose_inherit_report')}}</el-button>
           </el-input>
@@ -90,18 +91,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="time" :label="$t('ReportManage.ReportList.label_createtime')">
-          <el-date-picker
-            v-model="formData.time"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('ReportManage.ReportList.please_select_date')"
-            size="medium"
-            :clearable="false"
-            style="width: 400px"
-          ></el-date-picker>
-        </el-form-item>
-
         <el-form-item prop="cooperationType" :label="$t('ReportManage.ReportList.label_coop')">
           <el-radio-group
             v-model="formData.cooperationType"
@@ -114,7 +103,7 @@
 
           <el-button 
             type="text" 
-            v-if="formData.cooperationType===2"
+            v-if="formData.cooperationType===2&&(!id||(id&&reportInfo.ReportSource!==2))"
             style="margin-left: 20px"
             @click="handleChooseCooper"
           ><!-- 选择协作人 -->{{$t('ReportManage.ReportList.choose_cooper')}}</el-button>
@@ -125,7 +114,7 @@
               :key="item.NodeId"
               size="mini"
               effect="dark"
-              closable
+              :closable="(reportInfo&&reportInfo.ReportSource===2)?false:true"
               @close="removeCooper(index)"
             >
               {{ item.NodeName }}
@@ -141,9 +130,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 +145,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 +224,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 +236,6 @@ export default {
             isPublcPublish: this.reportInfo.IsPublicPublish
           }
 
-          // this.getRelationPermission()
       }
     },
   },
@@ -266,7 +254,7 @@ export default {
         cooperationType: 1,//协作方式
         cooperationUsers: [],
         reportLayout: 1,//报告布局
-        isPublcPublish: 1
+        isPublcPublish: 2
       },
       publishTip: `若选择是，则发布后所有人可见；<br>
         若选择否，则发布后，仅创建人和审批人可见；`,
@@ -323,7 +311,7 @@ export default {
         cooperationType: 1,//协作方式
         cooperationUsers: [],
         reportLayout: 1,//报告布局
-        isPublcPublish: 1
+        isPublcPublish: 2
       }
 
       this.$emit("showChange", false);
@@ -352,7 +340,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,
@@ -524,7 +512,7 @@ export default {
     // 获取分类
     getclassifylist() {
       //获取分类列表
-      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",Enabled:1 };
+      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",Enabled:1,ClassifyType:1 };
 
       classifylist(params).then((res) => {
         if (res.Ret == 200 && Array.isArray(res.Data.List)) {

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

@@ -1,25 +1,16 @@
 <template>
   <div class="top-action-wrap">
-    <template>
-      <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>
       
-      <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)"
-            >
-              <img src="~@/assets/img/smartReport/icon01.png" alt="">
-              <span><!-- 一键清空内容 -->{{$t('ReportManage.ReportList.click_clear_btn')}}</span>
+            class="action-item"
+            @click="goBackList"
+          >
+              <img src="~@/assets/img/smartReport/back.png" alt="">
+              <span>返回列表</span>
           </li>
           <li v-if="!reportInfo.ReportChapterId" class="action-item" @click="$emit('openBaseInfo')">
               <img src="~@/assets/img/smartReport/icon01.png" alt="">
@@ -52,16 +43,8 @@
 
         <!-- 单人报告 -->
         <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>
+            <!-- 系统内报告 -->
+            <template v-if="reportInfo&&reportInfo.ReportSource===1">
                 <li 
                     class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
@@ -72,7 +55,8 @@
                     <span>{{$t('ReportManage.ReportList.publish_btn')}}</span>
                 </li>
             </template>
-            <template v-if="isApprove&&hasApproveFlow">
+            <!-- 来源智力共享报告 -->
+            <template v-else-if="reportInfo&&reportInfo.ReportSource===2">
                 <li 
                     class="action-item editsty" 
                     :class="{'disabled':checkLoading}"
@@ -90,9 +74,6 @@
   </div>
 </template>
 <script>
-import {
-	reportV2Interface
-} from '@/api/modules/reportV2';
 export default {
   props: {
     reportInfo: {
@@ -106,14 +87,9 @@ 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')
-    }
+			goBackList() {
+				this.$router.replace({ path: '/reportNew' });
+			}
   },
   mounted() {
   }

src/views/report_manage/reportV2/list.vue

@@ -53,10 +53,10 @@
                           style="width:100%;"
                           @change="filterChange"
                       >
-                        <el-option :label="$t('ReportManage.smart_unpublished')" :value="1" v-if="!isOtherApprove"></el-option>
+                          <el-option :label="$t('ReportManage.smart_unpublished')" :value="1"></el-option>
                           <el-option :label="$t('ReportManage.smart_published')" :value="2"></el-option>
-                          <el-option :label="$t('ReportManage.smart_pending')" :value="3" v-if="isApprove"></el-option>
-                          <el-option :label="$t('ReportManage.smart_awaiting_approval')" :value="4" v-if="isApprove"></el-option>
+                          <el-option :label="$t('ReportManage.smart_pending')" :value="3" ></el-option>
+                          <el-option :label="$t('ReportManage.smart_awaiting_approval')" :value="4"></el-option>
                           <el-option :label="$t('ReportManage.smart_rejected')" :value="5"></el-option>
                           <el-option :label="$t('ReportManage.smart_approved')" :value="6"></el-option>
                         </el-select>
@@ -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>
@@ -190,7 +170,7 @@
             align="center"
             min-width="100"
           ></el-table-column>
-          <el-table-column :label="$t('ReportManage.smart_status_table')" align="center" v-if="isApprove">
+          <el-table-column :label="$t('ReportManage.smart_status_table')" align="center">
             <template slot-scope="scope">
                 <span v-if="scope.row.State == '1'">{{$t('ReportManage.smart_unpublished')}}</span>
                 <span v-if="scope.row.State == '2'">{{$t('ReportManage.smart_published')}}</span>
@@ -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">
@@ -507,13 +475,12 @@ import {
 } from '@/api/modules/reportV2.js';
 import { departInterence } from "api/api.js";
 import {approveInterence} from '@/api/modules/approve.js';
-import reportApproveConfig from "@/mixins/reportApproveConfig.js";
+// import reportApproveConfig from "@/mixins/reportApproveConfig.js";
 import reportBaseInfo from './components/reportBaseInfoDia.vue';
 import reportPreview from './components/reportPreview.vue';
 export default {
   name:'reportV2',
   components: { reportBaseInfo,reportPreview },
-  mixins:[reportApproveConfig],
   computed: {
     exportUrlDl() {
       let url = process.env.VUE_APP_API_ROOT + "/report/report_view_record/export";
@@ -624,8 +591,8 @@ export default {
         {label:"撤销",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[4,5,6],text:'ReportManage.smart_btn.withdraw'},
         {label:"下载Pdf",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportPdf'),States:[2,6],text:'ReportManage.smart_btn.download_pdf'},
         {label:"下载长图",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportImg'),States:[2,6],text:'ReportManage.smart_btn.download_long_image'},
-        {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
-        {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
+        // {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
+        // {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
       ],
 
       waterMarkStr:"",
@@ -654,7 +621,7 @@ export default {
   methods:{
     getclassifylist() {
       //获取分类列表
-      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "" };
+      let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",ClassifyType:1 };
 
       classifylist(params).then((res) => {
         if (res.Ret == 200 && Array.isArray(res.Data.List)) {
@@ -929,16 +896,8 @@ export default {
       let baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 			this.linkPdfUrl = item.ReportLayout===1 ? `${baseUrl}/reportshare_pdf` : `${baseUrl}/reportshare_smart_pdf`;
 
-      if(this.isApprove){
-        this.handlePublic(1)
-        return
-      }
-      const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
-      if(isPost){
-          this.showPublish = true;
-      }else{
-        this.handlePublic(1)
-      }
+      
+      this.handlePublic(1)
       
     },
 
@@ -947,18 +906,7 @@ export default {
     handlePublic(type) {
       reportpublish({ ReportIds: this.batches.join(","),ReportUrl:this.generatePdfLinks(this.publishReportCode)}).then((res) => {
         if (res.Ret == 200) {
-          if (type == 2) {
-            reportMessageSend({
-              ReportId: this.batches[0],
-            }).then((resMsg) => {
-              if (resMsg.Ret == 200) {
-                this.$message.success(this.$t('ReportManage.smart_msg.published_success'));
-                this.batches = [];
-                this.getReportList();
-                this.showPublish = false;
-              }
-            });
-          } else {
+         
             if (res.Data) {
               this.$alert(res.Data, this.$t('ReportManage.smart_msg.release_prompt'), {
                confirmButtonText: this.$t('Dialog.confirm_btn'),
@@ -971,7 +919,6 @@ export default {
             this.getReportList();
             this.showPublish = false;
           }
-        }
       });
     },
     generatePdfLinks(Code){
@@ -1052,11 +999,12 @@ export default {
     itemclickHandle({type,data}){
       switch (type) {
         case '发布':
-          this.publishreport(data)
-          break;
         case '提交':
-          this.handleSubmitReport(data)
+          this.publishreport(data)
           break;
+        // case '提交':
+        //   this.handleSubmitReport(data)
+        //   break;
         case '编辑':
           this.editreport(data, 'edit')
           break;
@@ -1069,9 +1017,9 @@ export default {
         case '取消发布':
           this.canclepublish(data)
           break;
-        case '撤销':
-          this.cancelReport(data)
-          break;
+        // case '撤销':
+        //   this.cancelReport(data)
+        //   break;
         case '推送消息':
           this.messageSend(data)
           break;
@@ -1144,6 +1092,8 @@ export default {
           return commonFilterPass && row.DetailPdfUrl    
         }else if(but.label==='下载长图'){
           return commonFilterPass && row.DetailImgUrl           
+        }else if(['删除','撤销'].includes(but.label)){
+          return commonFilterPass && row.ReportSource===1           
         }
 
         return commonFilterPass

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

@@ -6,10 +6,7 @@
 			<chapterWrapper
 				v-show="isLeftWrapShow"
 				ref="chapterContRef"
-				:isApprove="isApprove"
-				:hasApproveFlow="hasApproveFlow"
 				@change="handleChapterInfo"
-				@checkClassifyNameArr="handleCheckClassifyNameArr"
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
 				@handlePublish="handlePublishReport"
@@ -48,8 +45,6 @@
 			<template v-else>
 					<!-- 顶部操作栏 -->
 					<editHeader
-						:isApprove="isApprove"
-						:hasApproveFlow="hasApproveFlow"
 						:reportInfo="reportInfo"
 						@handleClearContent="handleClearContent"
 						@openBaseInfo="showReportBaseInfo=true"
@@ -185,6 +180,7 @@ export default {
 			showReportBaseInfo: false,
 
 			isLeftWrapShow: true,//展开章节区
+			timer:null
 		};
 	},
 	created() {
@@ -289,6 +285,10 @@ export default {
 			//如果富文本中有未上传完成的图片,去除这个dom
 			$('.fr-element').find('img.fr-uploading').length&&$('.fr-element').find('img.fr-uploading').remove()
 
+			await this.$confirm('是否确认提交章节?',this.$t('Confirm.prompt'),{
+					type:"warning"
+			})
+
 			const saveRes = await this.handleAutoSaveChapter('auto');
 			if(!saveRes) return
 
@@ -322,8 +322,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 +402,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)
 		},
 		
 		/* 发布报告 */
@@ -415,49 +415,15 @@ export default {
 			if(tp==='dsfb'){
         this.showDSFB=true
 				return
-			}else if(tp==='submit'){
-				this.handleSubmitReport(Number(this.$route.query.id))
-				return
+			}else{
+				this.isPublishloading = true;
+				this.publishreport()
 			}
 
-			this.isPublishloading = true;
-
-			let sendMsg = this.reportCoopType===2 ? this.$refs.chapterContRef.reportBase.MsgIsSend : this.ThsMsgIsSend;
-			if(sendMsg===1){
-				this.publishreport({sendMsg: false})
-			}else {
-				const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
-
-				this.$confirm(
-						isPost?this.$t('ReportManage.smart_msg.publishing_messages'):this.$t('ReportManage.smart_msg.should_published_immediately'), 
-						this.$t('ReportManage.smart_release_prompt_btn'), 
-						{
-								confirmButtonText: isPost?this.$t('ReportManage.smart_btn.push'):this.$t('ReportManage.smart_btn.publish'),
-								cancelButtonText: isPost?this.$t('ReportManage.smart_btn.not_push'):this.$t('Dialog.cancel_btn'),
-								type: 'warning',
-								distinguishCancelAndClose:true,
-						
-								beforeClose:(action, instance,done)=>{
-										if(action==='close') {
-												//右上角
-												this.isPublishloading = false;
-										} else if(action==='cancel') {
-												//cancelButton
-												if(isPost) this.publishreport({sendMsg: false});
-										}else {
-												//confirmButton
-												this.publishreport({sendMsg: isPost?true:false})
-										}
-										done()
-								}
-						}
-				)
-
-			}
 		},
 
 		//发布报告
-		publishreport({sendMsg}) {
+		publishreport() {
 			reportpublish({ 
 				ReportIds: String(this.$route.query.id),
 				ReportUrl:this.generatePdfLinks()
@@ -466,7 +432,7 @@ export default {
 
 				if (res.Ret !== 200) return
 
-				sendMsg && reportMessageSend({ReportId: Number(this.$route.query.id)})
+				// sendMsg && reportMessageSend({ReportId: Number(this.$route.query.id)})
 
 				this.$message.success(this.$t('MsgPrompt.publish_msg'))
 				setTimeout(() => {
@@ -558,7 +524,7 @@ export default {
 
 		getclassifylist() {
 			//获取分类列表
-			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: '',Enabled:1  };
+			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: '',Enabled:1,ClassifyType:1  };
 			classifylist(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = [];

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/components/BaseInfo.vue

@@ -1,316 +0,0 @@
-<template>
-    <el-dialog
-        :title="$t('ReportManage.ReportList.information_title')"
-        :visible.sync="show"
-        :modal-append-to-body="false"
-        :close-on-click-modal="false"
-        :center="true"
-        v-dialogDrag
-        custom-class="dialogclass"
-        width="440px"
-        @close="handleClose"
-    >
-        <el-form 
-            :model="formData" 
-            :rules="rules" 
-            ref="baseinfoForm"
-            class="baseinfo-form-wrap"
-        >  
-            <el-form-item prop="type">
-                <el-radio-group v-model="formData.type" :disabled="id" @change="handleUpdateBaseInfo">
-                    <el-radio :label="1">{{$t('ReportManage.ReportList.new_report_radio')}}</el-radio>
-                    <el-radio :label="2">{{$t('ReportManage.ReportList.inherit_report_radio')}}</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item prop="classify">
-                <el-cascader
-					ref="cascader"
-					:options="classifyArr"
-					v-model="formData.classify"
-					:placeholder="$t('ReportManage.ReportList.please_select_category')"
-					size="medium"
-                    style="width:340px"
-                    @change="handleUpdateBaseInfo"
-				/>
-            </el-form-item>
-            <el-form-item prop="title">
-                <el-input :placeholder="$t('ReportManage.ReportList.input_title_please')" v-model="formData.title" style="width:340px"></el-input>
-            </el-form-item>
-            <el-form-item prop="abstract">
-                <el-input type="textarea" :placeholder="$t('ReportManage.ReportList.please_input_abstract')" v-model="formData.abstract" style="width:340px"></el-input>
-            </el-form-item>
-            <el-form-item prop="author">
-				<el-select
-					v-model="formData.author"
-					multiple
-					:placeholder="$t('ReportManage.ReportList.please_select_author')"
-					size="medium"
-					style="width: 340px"
-				>
-					<el-option
-						v-for="(item, i) in authorlist"
-						:key="i"
-						:label="item.ReportAuthor"
-						:value="item.ReportAuthor"
-					></el-option>
-				</el-select>
-			</el-form-item>
-            <el-form-item prop="frequency">
-                <el-select
-					v-model="formData.frequency"
-					:placeholder="$t('ReportManage.ReportList.please_select_frequency')"
-					size="medium"
-					style="width: 340px"
-				>
-                    <el-option :label="$t('ReportManage.smart_annually')" :value="$t('ReportManage.smart_annually')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_semi_annually')" :value="$t('ReportManage.smart_semi_annually')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_quarterly')" :value="$t('ReportManage.smart_quarterly')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_monthly')" :value="$t('ReportManage.smart_monthly')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_bi_weekly')" :value="$t('ReportManage.smart_bi_weekly')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_weekly')" :value="$t('ReportManage.smart_weekly')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_daily')" :value="$t('ReportManage.smart_daily')"></el-option>
-                    <el-option :label="$t('ReportManage.smart_irregularly')" :value="$t('ReportManage.smart_irregularly')"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item prop="time">
-                <el-date-picker
-					v-model="formData.time"
-					type="date"
-					value-format="yyyy-MM-dd"
-					:placeholder="$t('ReportManage.ReportList.please_select_date')"
-					size="medium"
-					:clearable="false"
-					style="width: 340px"
-				></el-date-picker>
-            </el-form-item>
-        </el-form>
-        <div style="text-align:center;margin-top:60px;margin-bottom:40px">
-            <el-button type="primary" plain style="width:120px" @click="handleClose">{{$t('Dialog.cancel_btn')}}</el-button>
-            <el-button type="primary" style="width:120px" @click="handleConfirm">{{$t('Dialog.confirm_btn')}}</el-button>
-        </div>
-    </el-dialog>
-</template>
-
-<script>
-import {apiSmartReport}  from '@/api/modules/smartReport'
-export default {
-    name:"BaseInfo",
-    model:{
-        prop:'show',
-        event:'showChange'
-    },
-    props:{
-        show:{
-            type:Boolean,
-            default:false
-        },
-        id:{
-            type:Number,
-            default:0
-        }
-    },
-    watch: {
-        show(n){
-            if(!n){
-                this.formData.type=1
-                this.formData.classify=[]
-                this.formData.title=''
-                this.formData.abstract=''
-                this.formData.author=['投研团队']
-                this.formData.frequency='日度'
-                this.formData.time=this.$moment().format('YYYY-MM-DD')
-            }else{
-                if(this.id){
-                    apiSmartReport.reportDetail({
-                        SmartReportId:Number(this.id)
-                    }).then(res=>{
-                        if(res.Ret===200){
-                            this.formData.type=res.Data.AddType
-                            this.formData.classify=[res.Data.ClassifyIdFirst,res.Data.ClassifyIdSecond]
-                            this.formData.title=res.Data.Title
-                            this.formData.abstract=res.Data.Abstract
-                            this.formData.author=res.Data.Author ? res.Data.Author.split(',') : []
-                            this.formData.frequency=res.Data.Frequency
-                            this.formData.time=res.Data.CreateTime
-                        }
-                    })
-                }
-            }
-        }  
-    },
-    data() {
-        return {
-            
-            formData:{
-                type:1,
-                classify:[],
-                title:'',
-                abstract:'',
-                author:['投研团队'],
-                frequency:'日度',
-                time:this.$moment().format('YYYY-MM-DD')||''
-            },
-            classifyArr:[],
-            authorlist:[]
-        }
-    },
-    computed:{
-        rules(){
-            return {
-                type:[{ required: true, message: this.$t('ReportManage.ReportList.please_report_type_select'), trigger: 'change' }],
-                classify:[{ required: true, message: this.$t('ReportManage.ReportList.please_report_type_select'), trigger: 'change' }],
-                title:[{ required: true, message: this.$t('ReportManage.ReportList.please_report_title_input'), trigger: 'blur' }],
-            }
-        }
-    },
-    methods: {
-        handleClose(){
-            this.$emit('showChange', false)
-        },
-
-        handleConfirm(){
-            this.$refs.baseinfoForm.validate((valid)=>{
-                if(valid){
-
-                    const params={
-                        AddType: this.formData.type,
-                        ClassifyIdFirst: this.formData.classify[0]?this.formData.classify[0]:0,
-                        ClassifyNameFirst: '',
-                        ClassifyIdSecond:this.formData.classify[1]?this.formData.classify[1]:0,
-                        ClassifyNameSecond:'',
-                        Title: this.formData.title,
-                        Abstract: this.formData.abstract,
-                        Author:
-                            this.formData.author.length > 0
-                                ? this.formData.author.join(',')
-                                : '',
-                        Frequency: this.formData.frequency,
-                        CreateTime: this.formData.time,
-                    }
-                    this.classifyArr.forEach(item=>{
-                        if(item.value===params.ClassifyIdFirst){
-                            params.ClassifyNameFirst=item.label
-                            const arr=item.children||[]
-                            arr.forEach(_item=>{
-                                if(_item.value===params.ClassifyIdSecond){
-                                    params.ClassifyNameSecond=_item.label
-                                }
-                            })
-                        }
-                    })
-                    // 编辑
-                    if(this.id){
-                        this.$emit('save',params)
-                        return
-                    }
-                    apiSmartReport.reportAdd(params).then(res=>{
-                        if(res.Ret===200){
-                            this.handleClose()
-                            let { href } = this.$router.resolve({
-                                path: "/smartReportEdit",
-                                query: { id: res.Data.SmartReportId },
-                            });
-                            window.open(href, "_blank");
-                        }
-                    })
-
-                }
-            })
-        },
-
-        handleUpdateBaseInfo(){
-            if(this.formData.type===1){
-                if(this.formData.classify.length===2){
-                    this.formData.title=this.getSelectClassifyName()[1]
-                }
-                return
-            }
-            //获取上次报告
-            apiSmartReport.getLastReport({
-                ClassifyIdFirst:this.formData.classify[0],
-                ClassifyIdSecond:this.formData.classify[1]
-            }).then(res=>{
-                if(res.Ret!==200) return
-                if (res.Data == null) {
-					this.$message.warning(this.$t('ReportManage.ReportList.no_reports_msg'));
-					return false;
-				}
-                this.formData.title=res.Data.Title
-                this.formData.abstract=res.Data.Abstract
-                this.formData.author=res.Data.Author ? res.Data.Author.split(',') : ''
-                this.formData.frequency=res.Data.Frequency
-            })
-        },
-
-        // 获取选择的分类名称
-        getSelectClassifyName(){
-            let arr=[]
-            this.classifyArr.forEach(item=>{
-                if(this.formData.classify[0]&&item.value===this.formData.classify[0]){
-                    arr.push(item.label)
-                    if(item.children&&item.children.length>0){
-                        item.children.forEach(_item=>{
-                            if(this.formData.classify[1]&&_item.value===this.formData.classify[1]){
-                                arr.push(_item.label)
-                            }
-                        })
-                    }
-                }
-            })
-            return arr
-        },
-
-        // 获取分类
-        getclassifylist() {
-            let params = { Enabled:1, KeyWord: "",HideDayWeek:1,/*不显示晨报/周报*/ };
-            apiSmartReport.classifyList(params).then((res) => {
-                if (res.Ret == 200 && Array.isArray(res.Data.List)) {
-                    this.classifyArr = [];
-                    res.Data.List.forEach((item, index) => {
-                        let newitem = {
-                            label: item.ClassifyName,
-                            value: item.Id,
-                        };
-                        if (item.Child) {
-                            let childnode = [];
-                            item.Child.forEach((itemchild, i) => {
-                                childnode.push({
-                                    label: itemchild.ClassifyName,
-                                    value: itemchild.Id,
-                                });
-                            });
-                            newitem.children = childnode;
-                        }
-                        this.classifyArr.push(newitem);
-                    });
-                }
-            });
-        },
-        // 获取作者
-        getreportauthor() {
-			apiSmartReport.reportAuthor({}).then((res) => {
-				if (res.Ret == 200) {
-					this.authorlist = res.Data.List || [];
-				}
-			});
-		},
-    },
-    mounted(){
-        this.getclassifylist()
-        this.getreportauthor()
-    },
-}
-</script>
-
-<style lang="scss">
-.baseinfo-form-wrap{
-    .el-input{
-        width: 100%;
-    }
-    .el-form-item{
-        width: 340px;
-        margin-left: auto;
-        margin-right: auto;
-    }
-}
-</style>

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

@@ -5,10 +5,7 @@
 			<chapterWrapper
 				v-show="isLeftWrapShow"
                 ref="chapterContRef"
-                :isApprove="isApprove"
-				:hasApproveFlow="hasApproveFlow"
 				@change="handleChapterInfo"
-				@checkClassifyNameArr="handleCheckClassifyNameArr"
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
                 @handlePublish="handlePublishOpt"
@@ -47,8 +44,6 @@
             <template v-else>
                 <!-- 顶部操作栏 -->
                 <editHeader
-                    :isApprove="isApprove"
-                    :hasApproveFlow="hasApproveFlow"
                     :reportInfo="reportInfo"
                     @handleClearContent="handleClearContent"
                     @openBaseInfo="showReportBaseInfo=true"
@@ -489,6 +484,9 @@ export default {
 
 		/* 单章节发布 */
 		async handlePublishChapter() {
+            await this.$confirm('是否确认提交章节?',this.$t('Confirm.prompt'),{
+				type:"warning"
+			})
 
             const saveRes = await this.handleAutoSaveChapter('auto');
 			if(!saveRes) return
@@ -971,8 +969,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 +1044,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)
                 }
             })
         },
@@ -1168,44 +1166,8 @@ export default {
             if(type==='dsfb'){
                 this.showDSFB=true
                 return
-            }
-            // 发布
-            if(type==='submit'){
-                this.submitReport()
-                return
-            }
-            //截止至ETA1.3.8 智能研报无推送模板消息，所有的reportInfo.MsgIsSend都为1
-            let sendMsg = this.reportCoopType===2 ? this.$refs.chapterContRef.reportBase.MsgIsSend : this.reportInfo.MsgIsSend;
-            if(sendMsg===1){//该报告已经推送过模板消息
-                this.reportPublish({sendMsg:false})
-            }else{
-                const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
-                this.$confirm(
-                    isPost?this.$t('ReportManage.smart_msg.publishing_messages'):this.$t('ReportManage.smart_msg.should_published_immediately'), 
-                    this.$t('ReportManage.smart_release_prompt_btn'), 
-                    {
-                        confirmButtonText: isPost?this.$t('ReportManage.smart_btn.push'):this.$t('ReportManage.smart_btn.publish'),
-				        cancelButtonText: isPost?this.$t('ReportManage.smart_btn.not_push'):this.$t('Dialog.cancel_btn'),
-                        type: 'warning',
-                        distinguishCancelAndClose:true,
-                    
-                        beforeClose:(action, instance,done)=>{
-                            if(action==='close') {
-                                //右上角
-                                // this.isPublishloading = false;
-                            } else if(action==='cancel') {
-                                //cancelButton
-                                if(isPost){
-                                    this.reportPublish({sendMsg:false})
-                                }
-                            }else {
-                                //confirmButton
-                                this.reportPublish({sendMsg:isPost?true:false})
-                            }
-                            done()
-                        }
-                    }
-                )
+            }else {
+                this.reportPublish()
             }
         },
         //提交报告
@@ -1300,15 +1262,13 @@ export default {
         },
 
         // 发布报告
-        reportPublish({sendMsg}){
+        reportPublish(){
             reportpublish({
                 ReportIds:String(this.$route.query.id),
                 ReportUrl:this.generatePdfLinks()
             }).then(res=>{
                 if(res.Ret===200){
-                    if(sendMsg){
-                        this.reportSendMsg()
-                    }
+
                     this.$message.success(this.$t('MsgPrompt.publish_msg'))
 
                     setTimeout(() => {
@@ -1709,7 +1669,7 @@ div{
         .report-drag-item-out{
             .report-drag-item-wrap_child-wrap{
                 position: absolute;
-                width: 40px;
+                width: 18px;
                 right: 0;
                 top: 0;
                 height: 100%;

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>
@@ -117,13 +117,6 @@ export default {
 			}
 			return str
 		},
-        //是否开启审批流,若开启,导图按钮在非已审批的状态不显示
-        isApprove(){
-            const type = this.$setting.dynamicOutLinks.ApprovalFlow ||
-                        this.$store.state.dynamicOutLinks.ApprovalFlow ||
-                        JSON.parse(localStorage.getItem('dynamicOutLinks')).ApprovalFlow||''
-            return ['2','3'].includes(type)
-        }
     },
     props:{
         reportId:{//审批详情-预览报告

src/views/supply_manage/analyseVariety.vue

@@ -39,7 +39,7 @@
       style="border-bottom: 1px dashed #dcdfe6"
       v-if="targetData.length"
     >
-      <targetTable :data="targetData" @createTarget="createTargetHandle" />
+      <targetTable :data="targetData" :isCopyData="false" @createTarget="createTargetHandle" />
     </div>
     <div class="section">
       <plantTable

src/views/supply_manage/components/targetTable.vue

@@ -19,7 +19,7 @@
       </el-table-column>
       <el-table-column :label="$t('Table.column_operations')" align="center" width="250">
         <template slot-scope="{row}">
-          <el-button type="text" @click="copyData(row)" v-if="row.Button.Copy">{{$t('Edb.detail_copydata_btn')}}</el-button>
+          <el-button type="text" @click="copyData(row)" v-if="row.Button.Copy&&isCopyData">{{$t('Edb.detail_copydata_btn')}}</el-button>
           <el-button type="text" @click="goToDatabase(row)" v-if="row.Button.Show">{{$t('Edb.detail_lookdata_btn')}}</el-button>
           <el-button type="text" @click="joinDataBase(row)" v-if="row.Button.Add">{{$t('Edb.Detail.add_to_edb')}}</el-button>
           <el-button type="text" @click="createChartHandle(row.VarietyEdbId)">{{$t('Edb.Detail.create_chart_btn')}}</el-button>
@@ -42,7 +42,11 @@ import * as supplyApi from '@/api/modules/supplyApi.js';
 import createChart from '@/views/dataEntry_manage/databaseComponents/createChart.vue'
 export default {
   props: {
-    data: Array
+    data: Array,
+    isCopyData:{
+      type:Boolean,
+      default:true
+    }
   },
   components: { createChart },
   watch: {

src/views/system_manage/components/opearAuthSetDia.vue

@@ -49,7 +49,7 @@
       </div>
 
       <div class="classify-cont" v-if="form.type==='classify'">
-        <el-radio-group v-model="currentTab" @input="()=>{ currentSubTab='2';getClassifyList()}" style="margin-bottom:10px;">
+        <el-radio-group v-model="currentTab" @input="changeClassifyTab" style="margin-bottom:10px;">
           <el-radio-button
             v-for="item in tabs" 
             :key="item.key"
@@ -57,7 +57,7 @@
           >{{item.label}}</el-radio-button>
         </el-radio-group>
 
-        <el-tabs v-model="currentSubTab" @tab-click="getClassifyList" v-if="currentTab===6">
+        <el-tabs v-model="currentSubTab" @tab-click="refreshClassify" v-if="currentTab===6">
           <el-tab-pane 
             :label="item.label" 
             v-for="item in subTabs.filter(_ => _.key!==4)" 
@@ -169,6 +169,17 @@ export default {
         })
     },
 
+    /* 切换分类 */
+    changeClassifyTab() {
+      this.currentSubTab='2';
+      this.refreshClassify()
+    },
+
+    refreshClassify() {
+      this.getClassifyList()
+      if(this.selectUserIds.length===1&&this.$refs.clssifyTreeRef) this.getOwnAuthClassify()
+    },
+
     /* 选择用户 */
     checkUser() {
       let selectUser = this.$refs.userRef.getCheckedNodes(true);

src/views/system_manage/etaBaseConfig.vue

@@ -194,7 +194,7 @@
                             
                         </div>
                         <!-- 研报审批 -->
-                        <div v-if="isShowApprove">
+                        <!-- <div v-if="isShowApprove">
                             <div style="width:100%;margin-bottom: 20px;">
                                 <span style="color:#606266;">{{$t('SystemManage.BaseConfig.report_approval')}}</span> 
                                 <el-switch v-model="approve"></el-switch>
@@ -214,7 +214,7 @@
                                     </el-radio-group>
                                 </el-form-item>
                             </div>
-                        </div>
+                        </div> -->
 
                         
 
@@ -521,7 +521,7 @@ export default {
                 ReportEnLogoShow: false,//英文研报logo显示
             },//表单预设值
             rules: {
-                Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
+                // Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
                 CompanyName:[{ required: true, message: '请输入公司名称', trigger: 'blur' }],
                 LoginSmsTpId:[{ required: true, message: '请输入国内短信模板ID', trigger: 'blur' },
                             {
@@ -792,7 +792,7 @@ export default {
                 const {WatermarkChart='',UseXf='',IsReportApprove='',CnPptCoverImgs='',EnPptCoverImgs='',IsBIApprove=''} = res.Data
                 this.checkList = WatermarkChart==='true'?['研报图表']:[]
                 this.Iflytek = UseXf==='true'?true:false
-                this.approve = IsReportApprove==='true'?true:false
+                // this.approve = IsReportApprove==='true'?true:false
                 this.BIApprove = IsBIApprove==='true'?true:false
                 if(res.Data){
                     // this.$set(this,'formData',res.Data)
@@ -847,7 +847,7 @@ export default {
                     this.formData.LoginEmailTemplateContent = this.formData.LoginEmailTemplateContent.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
                     this.formData.WatermarkChart = ''+(this.checkList.includes('研报图表')?true:false)
                     this.formData.UseXf = ''+(this.Iflytek?true:false)
-                    this.formData.IsReportApprove = ''+(this.approve?true:false)
+                    // this.formData.IsReportApprove = ''+(this.approve?true:false)
                     this.formData.IsBIApprove = ''+(this.BIApprove?true:false)
                     const CnPptCoverImgs = this.formData.CnPptCoverImgs.join(',')
                     const EnPptCoverImgs = this.formData.EnPptCoverImgs.join(',')