src/views/classify_manage/classifylistV2.vue

@@ -135,7 +135,7 @@
                             </el-tooltip>
                         </template>
 
-                        <el-select v-model="classifyForm.reportType" style="width:400px" :disabled="classifyForm.classify_id||classifyForm.parent_id">
+                        <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>
@@ -268,7 +268,8 @@ export default {
                 variety:'',//关联的品种
                 reportType: 1,
                 isReportWarn: 0,
-                warnTime:'09:00'
+                warnTime:'09:00',
+                hasClassifyChild:false
             },
             formRules: {
                 classify_name: [{ required:true,message:this.$t('ReportManage.CategoryList.category_name_hint'),trigger:'blur'}]
@@ -319,7 +320,10 @@ export default {
                 let item = this.$refs.classifyRef.getCheckedNodes(true)
                 console.log(item)
                 if(item&&item[0]) {
-                    this.classifyForm.reportType = item[0].data.ClassifyType
+                    this.classifyForm.reportType = item[0].data.ClassifyType;
+                    this.classifyForm.hasClassifyChild = item[0].data.HasChild ? true : false;
+                }else {
+                    this.classifyForm.hasClassifyChild = false
                 }
         },
 
@@ -347,7 +351,8 @@ export default {
                 variety:'',//关联的品种
                 reportType: 1,
                 isReportWarn: 0,
-                warnTime:'09:00'
+                warnTime:'09:00',
+                hasClassifyChild:false
             }
         },
         async handleEdit(item){
@@ -359,7 +364,8 @@ export default {
                 isLastLevel: !item.Child,
                 reportType: item.ClassifyType,
                 isReportWarn: item.IsRemind,
-                warnTime: item.RemindTime
+                warnTime: item.RemindTime,
+                hasClassifyChild:false
             }
         },
         async setClassifyHandle(){

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

@@ -16,13 +16,14 @@
           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">
+    <span></span>
+    <!-- <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%;"

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -438,7 +438,8 @@ export default {
     },
 
     //点击列表操作栏事件处理
-    async handleListToolClick(item,{PptId,PptxUrl,Title,Editor}){
+    async handleListToolClick(item,pptItem){
+      const {PptId,PptxUrl,Title,Editor} = pptItem
       if(item.key==='edit'&&Editor.IsEditing&&Editor.AdminId!==Number(localStorage.getItem('AdminId'))){
         this.$message.warning(`${Editor.Editor}${this.$t('Slides.editing_progress_msg') }...`)
         return
@@ -457,7 +458,7 @@ export default {
         const editRes=await pptInterface.pptEditLock({PptId:Number(PptId),Status:0})
         if(editRes.Ret!==200) return
         if(editRes.Data&&editRes.Data.IsEditing&&editRes.Data.AdminId!==Number(localStorage.getItem('AdminId'))){
-          Editor=editRes.Data
+          pptItem.Editor=editRes.Data
           this.$message.warning(`${editRes.Data.Editor}${this.$t('Slides.editing_progress_msg') }...`)
           return
         }
@@ -471,8 +472,9 @@ export default {
       }
       const handleCommand = {
         'download':this.downloadPpt,
+        'delete':this.deletePPT,
       }
-      handleCommand[item.key]({PptxUrl,Title})
+      handleCommand[item.key](pptItem)
     },
 
     //详情操作栏事件处理