月报

src/views/monthlyReport/childrenPage/editReport/components/MrTable/TableExpandRowList.vue

@@ -2,7 +2,8 @@
   <div class="TableExpandRowList-wrapper">
     <div>
       <div v-for="(parentItem, parentIndex) in analyticFeedbackList" :key="parentIndex">
-        <div v-if="parentItem && parentItem.feedbackCharge && parentItem.analyticContents && parentItem.analyticContents.length" style="margin-bottom: 30px;">
+<!--        <div v-if="parentItem && parentItem.feedbackCharge && parentItem.analyticContents && parentItem.analyticContents.length" style="margin-bottom: 30px;">-->
+        <div v-if="parentItem" style="margin-bottom: 30px;">
           <div v-if="parentItem && parentItem.feedbackCharge " class="contentItem-wrapper-feedbackCharge">
             <MultiplePeopleInfo
               class="contentItem-wrapper-MultiplePeopleInfo"
@@ -17,7 +18,7 @@
             </div>
           </div>
 
-          <div v-if="parentItem && parentItem.analyticContents && parentItem.analyticContents.length">
+          <div v-if="parentItem && parentItem.analyticContents && parentItem.analyticContents.length || parentItem.contentItem">
             <div
               v-for="(item, index) in parentItem.analyticContents"
               :key="index"
@@ -115,11 +116,14 @@
               </span>
               <!--责任人： 计划完成时间：进度-->
             </div>
+          </div>
+          <div v-else style="padding-bottom: 0px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>
+          <div>
             <div class="contentItem-wrapper-title">反思与思考</div>
             <div class="contentItem-wrapper-content" v-html="parentItem.contentItem" />
             <div v-if="!parentItem.contentItem" style="padding-bottom: 10px;padding-left: 0;font-size: 14px">暂无反思与思考!</div>
           </div>
-          <div v-else style="padding-bottom: 0px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>
+
         </div>
       </div>
 <!--      <div v-if="!analyticFeedbackList" style="padding-bottom: 20px;padding-top: 10px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>-->

src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -138,5 +138,6 @@ export default {
 }
 .fontWeight {
   font-weight: 600;
+  padding-top: 10px;
 }
 </style>