Merge branch 'feature_20241025_删除店铺详情页-无效关店按钮，日报详情页面调整' into uat

src/views/week/dailyHistoricalDetails.vue

@@ -20,40 +20,6 @@
         <span v-if="reportTarget.status > 1"><{{ ptitle }}审批></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">{{ptitle}}审批</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"
-                placeholder="请输入评语" />
-            </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
-          </div>
-        </div>
-      </div>
       <p style="font-size: 14px; margin: 10px 0">{{ title }}</p>
       <van-collapse v-model="activeNames">
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
@@ -893,6 +859,39 @@
           <van-field v-model="Content2" rows="4" autosize readonly type="textarea" />
         </div>
       </div>
+      <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>
+        <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"
+                placeholder="请输入评语" />
+            </div>
+            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+          </div>
+        </div>
+      </div>
       <div class="contentContainer">
         <p class="contentContainerTitle">点评</p>
         <div style="padding: 10px 0">