Merge branch 'feature_20250106_日报，周报填写添加应用服务平台' into uat(dev)

src/views/deviceOutside/index.vue

@@ -736,6 +736,9 @@ export default {
       this.otherShow = false;
     }
     this.getMonth();
+  },
+  mounted() {
+    // 解决iOS 上拉边界下拉出现白色空白
     let node = document.getElementsByClassName('deviceOutside')[0];
     node.addEventListener(
       'touchmove',

src/views/deviceWithin/index.vue

@@ -45,7 +45,7 @@
       </div>
     </div>
     <!--        主体内容-->
-    <div class="container content" style="margin-top: 190px">
+    <div class="container content" style="margin-top: 190px" @touchmove="handleTouch">
       <div class="cellcontent" v-for="(item, index) in list" :key="index">
         <van-cell>
           <div class="card">
@@ -448,7 +448,24 @@ export default {
       this.getUserInPlanList();
     });
   },
+  mounted() {
+    // 解决iOS 上拉边界下拉出现白色空白
+    let node = document.getElementsByClassName('deviceWithin')[0];
+    node.addEventListener(
+      'touchmove',
+      (e) => {
+        if (e._isScroller) return;
+        e.preventDefault();
+      },
+      {
+        passive: false,
+      }
+    );
+  },
   methods: {
+    handleTouch(e) {
+      e._isScroller = true;
+    },
     linkapp(val) {
       var poind = this.gcj02BD(val.lat, val.lon);
       let url = window.location.href;

src/views/week/dailyApprovalList.vue

@@ -28,7 +28,7 @@
             <div class="cardContent">
               <div class="title" v-if="type == 'approvalPending'">
                 <!-- reportType: 1日报；2周报；3半月报 -->
-                <p class="textLeft" v-if="item.reportType == 1">
+                <!-- <p class="textLeft" v-if="item.reportType == 1">
                   {{ item.nickName }}的{{ item.reportTypeStr }}
                 </p>
                 <p class="textLeft" v-if="item.reportType == 2">
@@ -36,7 +36,8 @@
                 </p>
                 <p class="textLeft" v-if="item.reportType == 3">
                   {{ item.dqName }}的{{ item.reportTypeStr }}
-                </p>
+                </p> -->
+                <p class="textLeft">{{ filterName(item) }}的{{ item.reportTypeStr }}</p>
                 <p class="textRight">审批</p>
               </div>
               <div class="title" v-if="type == 'approvalSuccess'">
@@ -130,6 +131,23 @@ export default {
     },
   },
   methods: {
+    filterName(item) {
+      // <!-- reportType: 1日报；2周报；3半月报 -->
+      let name = '';
+      // 应用服务平台
+      if (item.postType == 'DIY') {
+        if (item.reportType == 1) {
+          name = item.nickName;
+        } else if (item.reportType == 2) {
+          name = item.deptName;
+        } else if (item.reportType == 3) {
+          name = item.dqName;
+        }
+      } else {
+        name = item.nickName;
+      }
+      return name;
+    },
     onLoad() {
       this.approveList();
     },