| 
					
				 | 
			
			
				@@ -95,7 +95,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <!--      </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <right-toolbar :showSearch.sync="showSearch" @queryTable="resetQuery"></right-toolbar> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange" ref="table" :height="tableHeight"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column type="selection" width="55" align="center" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column label="序号" type="index" width="50" fixed align="center"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column label="仓库名称" align="center" prop="fWarehouseName"/> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -453,6 +453,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   components: {}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      tableHeight: '600', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       headers: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Authorization: "Bearer " + getToken(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -501,6 +502,20 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   created() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let date = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let year = parseInt(date.getFullYear()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let month = parseInt(date.getMonth() + 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let currentMonth = date.getMonth() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let nextMonth = ++currentMonth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let oneDay = 1000*60*60*24 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    let day = lastTime.getDate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if (day < 10) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      day = '0' + day 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    this.fPlanneddate = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     currentLogin().then(res=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       console.log(res) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -513,7 +528,33 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.getList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  mounted() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    this.$nextTick(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      // 根据浏览器高度设置初始高度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      // 监听浏览器高度变化,改变表格高度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      window.onresize = () => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 获取当前月的第一天和最后一天 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    getMonth() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let date = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let year = parseInt(date.getFullYear()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let month = parseInt(date.getMonth() + 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let currentMonth = date.getMonth() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let nextMonth = ++currentMonth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let oneDay = 1000*60*60*24 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let day = lastTime.getDate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if (day < 10) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        day = '0' + day 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     onSuccess(response, file, fileList){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       console.log(fileList) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.pictureEist = fileList 
			 |