Merge branch 'master' into cygx_crm_14.7.1

src/views/Home.vue

@@ -62,7 +62,7 @@
                   </template>
                   <el-menu-item
                     v-for="child in item.children"
-                    :index="child.path=='etaForum'?null:child.path"
+                    :index="child.path=='etaForum'?'etaForum':child.path"
                     :path="child.path"
                     :key="child.path"
                     v-show="!child.hidden"
@@ -925,7 +925,7 @@ export default {
       this.$router.push({ path: "/resetpsd" });
     },
     handleselect: function (a, b) {
-      
+
       // 清除筛选条件
       sessionStorage.removeItem('pickListBack');
       sessionStorage.removeItem('customSearchBack');

src/views/ficc_manage/chapterVariety.vue

@@ -196,10 +196,12 @@ import { bannerupload, getchapterTypeList,editChapterType } from 'api/api.js';
 export default {
     components: { mDialog },
   beforeRouteEnter(to, from, next) {
-    if (to.query.reportType == 'day') {
+    if (to.query.reportType === 'day') {
       to.matched[1].name = '晨报章节设置'
-    } else {
+    } else if(to.query.reportType === 'week') {
       to.matched[1].name = '周报章节设置'
+    }else {
+      to.matched[1].name = '章节设置'
     }
     next()
   },
@@ -222,7 +224,7 @@ export default {
   },
   methods: {
     async getList() {
-      getchapterTypeList({ ReportType: this.$route.query.reportType == 'week' ? 'week' : 'day' }).then(res => {
+      getchapterTypeList({ ClassifyId:Number(this.$route.query.id) }).then(res => {
         if (res.Ret === 200) {
           this.list = res.Data.List || []
         }

src/views/ficc_manage/reportVariety.vue

@@ -30,7 +30,7 @@
           </div>
 
           <div class="opt-box">
-            <span class="editsty" v-if="['晨报','周报'].includes(data.ClassifyName)" @click="chapterSetting(data)">章节设置</span>
+            <span class="editsty" v-if="!data.Child" @click="chapterSetting(data)">章节设置</span>
             <span
               style="cursor: pointer; color: #409eff"
               @click.stop="handleShowEdit(data)"
@@ -295,7 +295,7 @@
           <el-form-item
             label="关联线上路演"
             prop="RelateVideo"
-            v-if="aeForm.parent_id!=0"
+            v-if="aeForm.isLastLevel"
           >
             <el-switch
               v-model="aeForm.RelateVideo"
@@ -544,13 +544,13 @@ export default {
   },
   methods: {
     chapterSetting(row){
-      let reportType;
+      let reportType='';
 			if(row.ClassifyName=='周报'){
 				reportType='week'
-			}else{
+			}else if(row.ClassifyName=='晨报'){
 				reportType='day'
 			}
-			this.$router.push({path:'chapterVariety',query:{reportType}})
+			this.$router.push({path:'chapterVariety',query:{id:row.Id,reportType}})
     },
     showInput(index){
 			if(index!=-1){
@@ -650,7 +650,8 @@ export default {
         ClassifyMenuId: item.ClassifyMenuId || '',
         YbRightBanner: item.YbRightBanner || '',
         relate: [item.RelateTel == 1 ? 1 : null, item.RelateVideo == 1 ? 2 : null],
-        RelateVideo:item.RelateVideo == 1?true:false
+        RelateVideo:item.RelateVideo == 1?true:false,
+        isLastLevel: item.Child ? false : true
       }
       this.ClassifyMenuList = item.ClassifyMenuList ? item.ClassifyMenuList.map(item => {
         return {

src/views/report_manage/components/setVarietyPause.vue

@@ -63,10 +63,11 @@ export default {
 		'isOpenDialog': {
 			handler(newval) {
         if(newval) {
+          console.log(this.setArr)
           this.pauseList = this.setArr.map(_=>({
             id: _.ReportChapterTypeId,
             name: _.ReportChapterTypeName,
-            date: _.PauseStartTime ? [_.PauseStartTime,_.PauseEndTime] : []
+            date: _.PauseStartTime ? [_.PauseStartTime,_.PauseEndTime] : [this.$moment().format('YYYY-MM-DD'),this.$moment().format('YYYY-MM-DD')]
           }))
         }
 			}