fix something

src/lang/modules/ReportManagement/ReportList.js

@@ -22,8 +22,8 @@ export const ReportListEn = {
   information_title: "Basic information",
   new_report_radio: "New report",
   inherit_report_radio: "Inherit report",
-  please_select_category: "Please select a category",
-  input_title_please: "Please input title",
+  please_select_category: "Please select a Report category",
+  input_title_please: "Please input Report title",
   please_input_abstract: "Please input abstract",
   please_select_author: "Please select the author",
   please_select_frequency: "Please select the frequency",
@@ -133,7 +133,7 @@ export const ReportListEn = {
   choose_inherit_report: 'Select Inherited Report',
   label_report_classify:'Report Category',
   label_relation_variety: 'Associated Varieties',
-  label_report_abstract:'Report Summary',
+  label_report_abstract:'Report Abstract',
   label_report_author:'Report Author',
   label_frequency:'Frequency',
   label_createtime:'CreateTime',
@@ -164,7 +164,9 @@ export const ReportListEn = {
   choose_head_img:'Select Header',
   choose_end_img:'Select Footer',
   canvas_set:'Canvas Settings',
-  choose_layout_img:'Select Layout'
+  choose_layout_img:'Select Layout',
+  variety_tip:`If a section is associated with a variety, then the reading permissions for the section are controlled by the permissions of the associated variety;<br>
+  If a section is not associated with any variety, then the reading permissions for the section are controlled by the permissions of the category-associated varieties;`
 };
 
 /* 中文 */
@@ -187,8 +189,8 @@ export const ReportListZh = {
   information_title: "基础信息",
   new_report_radio: "新增报告",
   inherit_report_radio: "继承报告",
-  please_select_category: "请选择分类",
-  input_title_please: "请输入标题",
+  please_select_category: "请选择报告分类",
+  input_title_please: "请输入报告标题",
   please_input_abstract: "请输入摘要",
   please_select_author: "请选择作者",
   please_select_frequency: "请选择频度",
@@ -329,5 +331,7 @@ export const ReportListZh = {
   choose_head_img:'选择版头',
   choose_end_img:'选择版尾',
   canvas_set:'画布设置',
-  choose_layout_img:'选择版图'
+  choose_layout_img:'选择版图',
+  variety_tip:`若章节关联品种，则章节阅读权限受章节关联品种的权限控制；<br>
+  若章节不关联品种，则章节阅读权限受分类关联品种的权限控制；`
 };

src/lang/modules/ReportManagement/SmartReport.js

@@ -52,7 +52,7 @@ export const SmartReportEn = {
   smart_release_prompt_btn: "Release prompt",
   smart_template_msg: "The report has been set to be released regularly. Do you want to publish the report immediately and push the template message?",
   smart_push_template_btn: "Do you want to publish the report immediately and push template messages?",
-  smart_status_table: "status",
+  smart_status_table: "Report status",
   smart_abstract_table: "Abstract",
   smart_select_file: "Select file",
   smart_sync_policy_report: "Sync Policy Report",
@@ -180,7 +180,7 @@ export const SmartReportZh = {
   smart_release_prompt_btn: "发布提示",
   smart_template_msg: "该报告已设置定时发布，是否立即发布报告并推送模板消息？",
   smart_push_template_btn: "是否立即发布报告，并推送模板消息？",
-  smart_status_table: "状态",
+  smart_status_table: "报告状态",
   smart_abstract_table: "摘要",
   smart_select_file: "选择文件",
   smart_sync_policy_report: "同步策略报告",

src/routes/modules/oldRoutes.js

@@ -312,8 +312,11 @@ export default [
       },
       {
         path: 'reportNew',
-        name:'研报',
-        component: () => import("@/views/report_manage/reportV2/list.vue")
+        name:'研报中心',
+        component: () => import("@/views/report_manage/reportV2/list.vue"),
+        meta:{
+          name_en:"Report Center"
+        }
       }
     ],
   },

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

@@ -108,25 +108,8 @@
             @click="chooseChapter(item)"
             :class="selectChapterId===item.ReportChapterId&&'act'"
           >
-            <div class="card-top">
-              <div class="type-name" v-if="item.TypeName">{{item.TypeName}}</div>
-              <span v-else></span>
-
-              <el-popover
-                  placement="right"
-                  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>
+            <div class="card-top" v-if="item.TypeName">
+              <div class="type-name" >{{item.TypeName}}</div>
             </div>
 
             <div class="card-top">
@@ -137,7 +120,24 @@
               <span 
                 :style="{color:item.PublishState===2&&'#67C23A'}" 
                 v-if="item.CanEdit"
-              >{{item.PublishState===2 ? $t('ReportManage.smart_published') : $t('ReportManage.smart_unpublished') }}</span>
+              >
+                {{item.PublishState===2 ? $t('ReportManage.smart_published') : $t('ReportManage.smart_unpublished') }}
+                <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
@@ -146,12 +146,6 @@
                   style="width: 16px; height: 16px;margin-right:5px;"
                 />
 
-                <!-- <i 
-                  class="el-icon-edit editsty" 
-                  v-if="item.CanEdit&&item.IsAuth" 
-                  @click.stop="chooseChapter(item,'edit')"
-                  style="font-size: 18px;margin:0 10px;"
-                /> -->
                 
                 <el-dropdown 
                   trigger="click" 
@@ -214,7 +208,8 @@
           </el-form-item>
           <el-form-item prop="varietys">
               <template slot="label">
-                  <el-tooltip class="item" effect="dark" :content="$t('ReportManage.CategoryList.related_variety_hint')">
+                  <el-tooltip class="item" effect="dark">
+                      <div slot="content" v-html="varietyTip"></div>
                       <div>
                           <span>{{ $t('ReportManage.CategoryList.related_variety') }}</span>
                           <i class="el-icon-info"></i>
@@ -408,12 +403,13 @@ export default {
       chapterRules: {
         chapterName: [{
           required:true,message:'章节名称不能为空',trigger:'blur'
-        }],
-        editors: [{
-          required:true,message:'编辑人不能为空',trigger:'blur'
-        }],
+        }]
       },
 
+      varietyTip:`若章节关联品种，则章节阅读权限受章节关联品种的权限控制；<br>
+        若章节不关联品种，则章节阅读权限受分类关联品种的权限控制；
+      `,
+
       /* 标签弹窗 */
       isOpenChapterTag: false,
       tagOptions: [],

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

@@ -66,6 +66,10 @@
                 <span v-if="row.ClassifyNameThird">/ {{ row.ClassifyNameThird }}</span>
               </span>
 
+              <span v-else-if="item.key==='CreateTime'">
+                {{ $moment(row.CreateTime).format('YYYY-MM-DD') }}
+              </span>
+
               <span v-else>{{ row[item.key] }}</span>
             </template>
           </el-table-column>

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

@@ -53,7 +53,7 @@
 
         <el-form-item prop="relationVariety" :label="$t('ReportManage.ReportList.label_relation_variety')" v-if="formData.relationVariety.length">
           <div class="permission-wrap">
-            <el-tag v-for="item in formData.relationVariety" :key="item.ChartPermissionId">{{item.ChartPermissionName}}</el-tag>
+            <el-tag v-for="item in formData.relationVariety" :key="item.ChartPermissionId">{{item.PermissionName}}</el-tag>
           </div>
         </el-form-item>
 
@@ -158,7 +158,7 @@
             v-model="formData.isPublcPublish"
           >
             <el-radio :label="1">{{$t('Common.yes_text')}}</el-radio>
-            <el-radio :label="0">{{$t('Common.no_text')}}</el-radio>
+            <el-radio :label="2">{{$t('Common.no_text')}}</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -447,7 +447,7 @@ export default {
 
     /* 选择继承报告 */
     async chooseInheritReport(item) {
-      const { Id,Title,Abstract,Author,CollaborateType,ReportLayout,IsPublicPublish } = item;
+      const { Id,Title,Abstract,Author,CollaborateType,ReportLayout,IsPublicPublish,ClassifyIdFirst,ClassifyIdSecond,ClassifyIdThird } = item;
 
       this.formData.title = Title;
       this.formData.abstract = Abstract;
@@ -458,6 +458,11 @@ export default {
       this.formData.inheritId = Id;
       this.formData.reportLayout = ReportLayout;
       this.formData.isPublcPublish = IsPublicPublish;
+      this.formData.classify = ClassifyIdThird
+        ? [ClassifyIdFirst,ClassifyIdSecond,ClassifyIdThird]
+        : ClassifyIdSecond 
+        ? [ClassifyIdFirst,ClassifyIdSecond]
+        : [ClassifyIdFirst]
       
       //继承的章节报告默认带出协作人
       if(CollaborateType===1) {
@@ -532,23 +537,6 @@ export default {
       classifylist(params).then((res) => {
         if (res.Ret == 200 && Array.isArray(res.Data.List)) {
           this.classifyArr = res.Data.List||[];
-          // res.Data.List.forEach(item => {
-          //   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);
-          // });
         }
       });
     },

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

@@ -947,6 +947,16 @@ export default {
                         this.layoutBaseInfo['研报标题']=params.Title
                         this.layoutBaseInfo['研报作者']=params.Author
                         this.layoutBaseInfo['创建时间']=params.CreateTime
+                        this.reportInfo.ClassifyIdFirst=params.ClassifyIdFirst;
+                        this.reportInfo.ClassifyIdSecond=params.ClassifyIdSecond;
+                        this.reportInfo.ClassifyIdThird=params.ClassifyIdThird;
+                        this.reportInfo.ClassifyNameFirst=params.ClassifyNameFirst;
+                        this.reportInfo.ClassifyNameSecond=params.ClassifyNameSecond;
+                        this.reportInfo.ClassifyNameThird=params.ClassifyNameThird;
+                        this.reportInfo.Abstract=params.Abstract;
+                        this.reportInfo.Author=params.Author;
+                        this.reportInfo.CreateTime=params.CreateTime;
+                        this.reportInfo.IsPublicPublish=params.IsPublicPublish;
                     }else {
                         this.$refs.chapterContRef.getReportBaseInfo('notCheck')
                     }