Merge branch 'master' into crm_16.9.2

src/views/ficc_manage/reportVariety.vue

@@ -263,12 +263,12 @@
           <!-- 二级分类配置列表背景图 -->
           <el-form-item
             label="列表背景图"
-            v-if="aeForm.parent_id != 0 && (parentIsList || parentIsVariety)"
+            v-if="(aeForm.parent_id != 0 && (parentIsList || parentIsVariety)) || ['周报','晨报'].includes(aeForm.classify_name)"
             prop="YbListImg"
           >
             <span slot="label" class="item-label-wrap">
               <span>列表背景图</span>
-              <el-tooltip class="item" effect="dark" content="进入该报告的一级分类列表，报告所在的二级分类配图" placement="top">
+              <el-tooltip class="item" effect="dark" :content="['周报','晨报'].includes(aeForm.classify_name)?'ETA投研资源库研报列表配图':'进入该报告的一级分类列表，报告所在的二级分类配图'" placement="top">
                  <img src="../../assets/img/icons/black_tip.png" class="tip-cion">
               </el-tooltip>
             </span>