入库管理bug修复+实现不触底也有底部滑动栏的效果

cors.js

@@ -205,9 +205,9 @@ module.exports = {
       }
     }
   },
-  // devModules: ['index', 'entrustedManagement','approveManagement','screeningTests', 'resourceManager']
+  // devModules: ['index', 'entrustedManagement','sampleManager','screeningTests', 'resourceManager']
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
-  //  devModules: ['all']
-   devModules:['index']
+   devModules: ['all']
+  //  devModules:['index']
   // devModules: ['index',  'entrustedManagement','approveManagement','sampleManager']
 }

src/views/resourceManager/components/goodsMangement/goodsMangementruku.vue

@@ -1,4 +1,4 @@
-<!-- 物品管理 -->
+<!-- 物品管理：有bug还没解决完 -->
 <template>
   <div class="resource">
     <div class="zy-head-search">
@@ -510,15 +510,19 @@ export default {
       // let endTime = '';
       // startTime = this.search.times[0] === '' ? '' : (this.search.times[0] + ' 00:00:00')
       // endTime = this.search.times[1] === ''? '' : (this.search.times[1] + ' 23:59:59')
-      let startTime = ''
-      let endTime = ''
-      if (this.search.times[0]==''||this.search.times[1]=='') {
-        startTime = null
-        endTime = null
-      } else {
-        startTime = this.search.times[0]+ ' 00:00:00'
-        endTime = this.search.times[1]+ ' 23:59:59'
-      }
+      // let startTime = ''
+      // let endTime = ''
+      // if (this.search.times[0]==''||this.search.times[1]=='') {
+      //   startTime = null
+      //   endTime = null
+      // } else {
+      //   startTime = this.search.times[0]+ ' 00:00:00'
+      //   endTime = this.search.times[1]+ ' 23:59:59'
+      // }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
       let obj = {
         stuffTypeName: this.search.stuffTypeName,
         stuffName: this.search.stuffName,
@@ -1330,11 +1334,14 @@ export default {
     pageSizeChange3(size) {
       this.page3.pageSize = size;
       // this.page3.pageNum = 1;
-      this.getDataList3();
+      // this.getDataList3();
+      this.searchData()
     },
     pageCurrentChange3(index) {
       this.page3.pageNum = index;
-      this.getDataList3();
+      // this.getDataList3();
+      this.searchData()
+
     },
     handleSelectionChange3(val) {
       this.multipleSelection5 = val;
@@ -1462,19 +1469,19 @@ export default {
     },
     getDataList3() {
       this.dataLoading3 = true;
-      // let startTime = '';
-      // let endTime = '';
-      // startTime = this.search.times[0] === '' ? '' : (this.search.times[0] + ' 00:00:00')
-      // endTime = this.search.times[1] === '' ? '' : (this.search.times[1] + ' 23:59:59')
-      let startTime = ''
-      let endTime = ''
-      if (!this.search.times) {
-        startTime = null
-        endTime = null
-      } else {
-        startTime = this.search.times[0]+ ' 00:00:00'
-        endTime = this.search.times[1]+ ' 23:59:59'
-      }
+      let startTime = '';
+      let endTime = '';
+      startTime = this.search.times[0] === '' ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] ===  ''? null : (this.search.times[1] + ' 23:59:59')
+      // let startTime = ''
+      // let endTime = ''
+      // if (!this.search.times) {
+      //   startTime = null
+      //   endTime = null
+      // } else {
+      //   startTime = this.search.times[0]+ ' 00:00:00'
+      //   endTime = this.search.times[1]+ ' 23:59:59'
+      // }
       this.axios.post('pass/baseManagement/v1/limslrcstuffis/selectRuku' + '?pageNum=' + this.page3.pageNum + '&pageSize=' + this.page3.pageSize
         + '&stuffTypeName=' + this.search.stuffTypeName + '&stuffName=' + this.search.stuffName
         + '&startTime=' + startTime + '&endTime=' + endTime)