ETA_1.1.7 bug修复

src/views/reportEn/AddReport.vue

@@ -60,6 +60,10 @@ async function getReportDetail(){
         reportData.value=res.Data
         reportBaseInfoData.addType=res.Data.AddType
         reportBaseInfoData.classifyName=[
+            {
+                id:res.Data.ClassifyIdRoot,
+                text:res.Data.ClassifyNameRoot
+            },
             {
                 id:res.Data.ClassifyIdFirst,
                 text:res.Data.ClassifyNameFirst
@@ -96,10 +100,10 @@ async function handleReportBaseInfoChange(e){
     reportBaseInfoData=e
 
     // 继承报告 覆盖一次
-    if(e.addType===2&&e.classifyName.length===2){
+    if(e.addType===2&&e.classifyName.length===3){
         const res=await apiReportEn.reportDetailByClassifyId({
-            ClassifyIdFirst:e.classifyName[0].id,
-            ClassifyIdSecond:e.classifyName[1].id
+            ClassifyIdFirst:e.classifyName[1].id,
+            ClassifyIdSecond:e.classifyName[2].id
         })
         if(res.Ret===200){
             if(res.Data===null){
@@ -222,10 +226,10 @@ async function handleReportOpt(e){
     $('#editor .fr-element').find('img.fr-uploading').length&&$('#editor .fr-element').find('img.fr-uploading').remove()
     const params={
         AddType:reportBaseInfoData.addType,
-        ClassifyIdFirst:reportBaseInfoData.classifyName[0]?.id,
-        ClassifyNameFirst:reportBaseInfoData.classifyName[0]?.text,
-        ClassifyIdSecond:reportBaseInfoData.classifyName[1]?.id,
-        ClassifyNameSecond:reportBaseInfoData.classifyName[1]?.text,
+        ClassifyIdFirst:reportBaseInfoData.classifyName[1]?.id,
+        ClassifyNameFirst:reportBaseInfoData.classifyName[1]?.text,
+        ClassifyIdSecond:reportBaseInfoData.classifyName[2]?.id,
+        ClassifyNameSecond:reportBaseInfoData.classifyName[2]?.text,
         Title:reportBaseInfoData.title,
         Abstract:reportBaseInfoData.abstract,
         Author:reportBaseInfoData.author.join(','),
@@ -237,7 +241,7 @@ async function handleReportOpt(e){
         Overview:temOverviewData.value
     }
     
-    if(reportBaseInfoData.classifyName.length!=2){
+    if(reportBaseInfoData.classifyName.length!=3){
         showToast('请选择分类')
         return
     }

src/views/reportEn/components/EditReportBaseInfo.vue

@@ -56,20 +56,20 @@ function selectAddType(e){
 // 报告所属分类
 const showClassifyPop=ref(false)
 const setClassifyVal=computed(()=>{
-    if(reportBaseInfo.classifyName.length===2){
-        return `${reportBaseInfo.classifyName[0].text}/${reportBaseInfo.classifyName[1].text}`
+    if(reportBaseInfo.classifyName.length===3){
+        return `${reportBaseInfo.classifyName[0].text} / ${reportBaseInfo.classifyName[1].text} / ${reportBaseInfo.classifyName[2].text}`
     }
     return '请选择分类'
 })
 function handleShowClassify(){
     showClassifyPop.value=true
 }
-function handleConfirmClassify({firstClassify,secondClassify}){
-    if(!firstClassify.id||!secondClassify.id){
+function handleConfirmClassify({rootClassify,firstClassify,secondClassify}){
+    if(!rootClassify||!firstClassify.id||!secondClassify.id){
         showToast('请选择分类')
         return
     }
-    reportBaseInfo.classifyName=[firstClassify,secondClassify]
+    reportBaseInfo.classifyName=[rootClassify,firstClassify,secondClassify]
     reportBaseInfo.title=secondClassify.text
     showClassifyPop.value=false
 }

src/views/reportEn/components/EditStrategyReport.vue

@@ -115,7 +115,8 @@ async function handleSave(){
 <template>
     <div class="edit-strategy-report-wrap">
         <van-cell-group>
-            <van-cell value-class="cell-con" required title="分类" :value="defaultData.ClassifyNameFirst+'/'+defaultData.ClassifyNameSecond" />
+            <van-cell value-class="cell-con" required title="分类" 
+            :value="defaultData.ClassifyNameRoot+'/'+defaultData.ClassifyNameFirst+'/'+defaultData.ClassifyNameSecond" />
             <van-cell value-class="cell-con" title="作者" :value="baseInfo.author.join(',')" is-link @click="handleShowSelectAuthor"/>
             <van-cell value-class="cell-con" title="频度" :value="baseInfo.frequency.join('')" is-link @click="handleShowFrequency"/>
             <van-cell value-class="cell-con" title="创建时间" :value="baseInfo.createtime" is-link @click="handleShowCreatetime"/>