Merge branch 'feature_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,44 @@
           <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>
+          <span v-if="reportTarget.status == -1">过期未汇报</span>
+          <span v-if="reportTarget.status > 1"><{{ ptitle }}审批></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">
@@ -942,6 +945,7 @@ export default {
       GZQuota: false,
       titlejz: '',
       saptitle: '业绩目标SAP(千元)',
+      ptitle: '',
       //
     };
   },
@@ -992,6 +996,7 @@ export default {
         this.reportTarget = res.data;
         this.JZQuota = false;
         this.GZQuota = false;
+        this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;
         if (res.data.postType == 'JZ') {
           this.JZQuota = true;
         } else if (res.data.postType == 'GZ') {

src/views/week/dailyHistoricalDetails.vue

@@ -875,7 +875,9 @@
         <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>
+      <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">

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -571,7 +571,9 @@
             type="textarea"
             placeholder="再接再厉，继续努力，保持态度，你能行！" />
         </div>
-        <div v-if="reportTarget.reportRemarks != null">
+      </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">

src/views/week/doubleWeeklyDetils.vue

@@ -13,47 +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" />
-          <!--          <p style="  padding: 10px;-->
-          <!--  background-color: aliceblue;-->
-          <!--  border-radius: 8px;" v-if="reportTarget.status==3">{{ reportTarget.successContent }}</p>-->
-          <!--          <p style="  padding: 10px;-->
-          <!--  background-color: aliceblue;-->
-          <!--  border-radius: 8px;" v-if="reportTarget.status==2">{{ reportTarget.failContent }}</p>-->
-        </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 title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <van-row>
@@ -583,6 +542,55 @@
             </div>
           </div>
         </van-collapse-item>
+        <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>
+            <span v-if="reportTarget.status == -1">过期未汇报</span>
+            <span v-if="reportTarget.status > 1"><{{ ptitle }}审批></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>
+          <div style="padding: 10px 0" v-if="reportTarget.status > 1">
+            <van-field
+              v-model="successContent"
+              rows="4"
+              autosize
+              readonly
+              type="textarea"
+              placeholder="再接再厉，继续努力，保持态度，你能行！" />
+          </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"
+                  placeholder="请输入评语" />
+              </div>
+              <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            </div>
+          </div>
+        </div>
       </van-collapse>
     </div>
     <br />
@@ -639,6 +647,7 @@ export default {
       weekType: [],
       successContent: '',
       type: '-1',
+      ptitle: '',
       //
     };
   },
@@ -688,6 +697,7 @@ export default {
         this.reportTarget = res.data;
         this.type = res.data.userType;
         this.reportContents = res.data.reportContents;
+        this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;
         var reportContentsList1 = [];
         var reportContentsList2 = [];
         var reportContentsList3 = [];

src/views/week/weeklyApprovalDetils.vue

@@ -11,52 +11,6 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <div style="height: 4px"></div>
-      <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"
-            color="#ffd21e"
-            void-icon="star"
-            void-color="#eee"
-            readonly />
-          <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"
-            placeholder="再接再厉，继续努力，保持态度，你能行！" />
-        </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>
       <van-collapse v-model="activeNames">
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <van-row>
@@ -618,6 +572,57 @@
             </div>
           </div>
         </van-collapse-item>
+        <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>
+            <span v-if="reportTarget.status == -1">过期未汇报</span>
+            <span v-if="reportTarget.status > 1"><{{ ptitle }}审批></span>
+          </p>
+          <div style="padding: 10px 0" v-if="reportTarget.status > 1">
+            <van-rate
+              v-model="reportTarget.number"
+              :size="25"
+              color="#ffd21e"
+              void-icon="star"
+              void-color="#eee"
+              readonly />
+            <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"
+              placeholder="再接再厉，继续努力，保持态度，你能行！" />
+          </div>
+        </div>
+        <div
+          class="contentContainer"
+          v-if="reportTarget.status > 1 || 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"
+                  placeholder="请输入评语" />
+              </div>
+              <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            </div>
+          </div>
+        </div>
       </van-collapse>
     </div>
     <br />
@@ -675,6 +680,7 @@ export default {
       updateReport: {},
       reportTarget: {},
       type: '-1',
+      ptitle: '',
     };
   },
   created() {
@@ -707,6 +713,7 @@ export default {
         if (res.code == 200) {
           var dayTime = res.data.date;
           this.type = res.data.userType;
+          this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;
           this.timeList = this.parseTimeParagraph(
             dayTime.slice(0, 4) + '-' + dayTime.slice(4, 6) + '-' + dayTime.slice(6, 8)
           );

src/views/week/weeklyHistoricalDetils.vue

@@ -597,7 +597,9 @@
         <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>
+      <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">