Merge branch 'feature_20250211_物料领用页面列表接口修改&AB类指标时间位置调整' into release

src/views/home/ABtarget.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="ABtarage">
+    <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p>
     <template v-if="tabVal == 0 || tabVal == 1">
       <div v-if="tabVal == 1 && type != 4" class="container linep">
         <van-collapse v-model="activeNames">

src/views/home/bottomBtn.vue

@@ -92,7 +92,7 @@
         >查看我的历史汇报</van-button
       >
     </div>
-    <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p>
+    <!-- <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p> -->
   </div>
 </template>
 <script>

src/views/my/material.vue

@@ -77,16 +77,16 @@ export default {
       },
     };
   },
-  created() {
+  activated() {
     this.getReceiveList();
   },
-  watch: {
-    $route(to, from) {
-      if (to.path == '/material') {
-        this.getReceiveList();
-      }
-    },
-  },
+  // watch: {
+  //   $route(to, from) {
+  //     if (to.path == '/material') {
+  //       this.getReceiveList();
+  //     }
+  //   },
+  // },
   methods: {
     inputblurs(val, index, num) {
       if (this.$route.query.tabVal == 'B') {
@@ -213,6 +213,7 @@ export default {
       fromValue.pageNum = this.pageNum;
       fromValue.pageSize = this.pageSize;
       fromValue.inventoryLyUserId = localStorage.getItem('userId');
+      fromValue.type = this.$route.query.tabVal == 'A' ? 'ly' : 'th';
       getReceiveList(fromValue).then((res) => {
         loading1.clear();
         this.disabled = false;