20241111_汇报点评页面调整

src/views/week/dailyDetails.vue

@@ -13,41 +13,6 @@
     <!--    <div class="lineGrey"></div>-->
     <!--        主体内容-->
     <div class="container linep">
-      <p class="texttitle texttitledaily">
-        <span class="opint"></span>
-        <span v-if="reportTarget.status == 1">待审批</span>
-        <span v-if="reportTarget.status == 3">审批完成</span>
-        <span v-if="reportTarget.status == 2">退回重写</span>
-      </p>
-      <br />
-      <div
-        class="contentContainer"
-        v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">
-        <div style="padding: 10px 0" v-if="reportTarget.status > 1">
-          <van-rate
-            v-model="reportTarget.number"
-            :size="25"
-            readonly
-            color="#ffd21e"
-            void-icon="star"
-            void-color="#eee" /><span class="rateText"
-            >&nbsp;&nbsp;&nbsp;&nbsp;{{ reportTarget.number }}分</span
-          >
-        </div>
-        <p class="contentContainerTitle" v-if="reportTarget.status > 1">评语</p>
-        <div style="padding: 10px 0" v-if="reportTarget.status > 1">
-          <van-field v-model="successContent" rows="4" autosize readonly type="textarea" />
-        </div>
-        <div v-if="reportTarget.reportRemarks != null">
-          <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-            <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}点评</p>
-            <div style="padding: 10px 0">
-              <van-field v-model="item.remarkContent" rows="4" autosize readonly type="textarea" />
-            </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
-          </div>
-        </div>
-      </div>
       <van-collapse v-model="activeNames">
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
           <van-row>
@@ -875,6 +840,42 @@
           <van-field v-model="Content2" rows="4" autosize readonly type="textarea" />
         </div>
       </div>
+      <div
+        class="contentContainer"
+        v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">
+        <p class="texttitle texttitledaily">
+          <span class="opint"></span>
+          <span v-if="reportTarget.status == 1">待审批</span>
+          <span v-if="reportTarget.status == 3">审批完成</span>
+          <span v-if="reportTarget.status == 2">退回重写</span>
+        </p>
+        <div style="padding: 10px 0" v-if="reportTarget.status > 1">
+          <van-rate
+            v-model="reportTarget.number"
+            :size="25"
+            readonly
+            color="#ffd21e"
+            void-icon="star"
+            void-color="#eee" /><span class="rateText"
+            >&nbsp;&nbsp;&nbsp;&nbsp;{{ reportTarget.number }}分</span
+          >
+        </div>
+        <p class="contentContainerTitle" v-if="reportTarget.status > 1">评语</p>
+        <div style="padding: 10px 0" v-if="reportTarget.status > 1">
+          <van-field v-model="successContent" rows="4" autosize readonly type="textarea" />
+        </div>
+      </div>
+      <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
+        <div>
+          <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
+            <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}点评</p>
+            <div style="padding: 10px 0">
+              <van-field v-model="item.remarkContent" rows="4" autosize readonly type="textarea" />
+            </div>
+            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+          </div>
+        </div>
+      </div>
     </div>
     <br />
     <div class="contentborder" v-if="reportTarget.status == 2">