| 
					
				 | 
			
			
				@@ -3,11 +3,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div class="operateJournal"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 搜索框 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div class="table-page-search-wrapper"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <a-form layout="inline"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <a-row :gutter="48"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <a-col :md="8" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <a-row :gutter="15"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-item label="操作时间"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-range-picker :format="dateFormat" show-time :placeholder="['开始时间', '结束时间']" v-model="time" @change="onChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <rangeDateTime ref="rangeDate" :value="time" @change="dateChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -36,23 +36,27 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import moment from 'moment' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import getDate from '@/libs/getDate' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { STable } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { journalList } from '@/api/OperateJournal.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import getDate from '@/libs/getDate' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import moment from 'moment' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import rangeDateTime from '@/views/common/rangeDateTime.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'OperateJournal', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { STable }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { STable, rangeDateTime }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       form: this.$form.createForm(this, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: 'OperateJournal' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      time: [moment(getDate.getToday().starttime, this.dateFormat), moment(getDate.getToday().endtime, this.dateFormat)], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      time: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        moment(getDate.getTodayTime().starttime, this.dateFormat), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        moment(getDate.getTodayTime().endtime, this.dateFormat) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       searchData: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        beginDate: null, // 查询的开始时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        endDate: null, // 查询的结束时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        beginDate: getDate.getTodayTime().starttime, // 查询的开始时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        endDate: getDate.getTodayTime().endtime, // 查询的结束时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         queryWord: '' // 操作人 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       dateFormat: 'YYYY-MM-DD HH:mm:ss', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -86,8 +90,6 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 加载数据方法 必须为 Promise 对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       loadData: parameter => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.searchData.beginDate == null ? (this.searchData.beginDate = getDate.getToday().starttime) : null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.searchData.endDate == null ? (this.searchData.endDate = getDate.getToday().endtime) : null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return journalList(Object.assign(parameter, this.searchData)).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const no = (res.data.data.pageNo - 1) * res.data.data.pageSize 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           for (let i = 0; i < res.data.data.list.length; i++) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -100,31 +102,19 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    moment, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 操作时间change 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    onChange (dates, dateStrings) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.searchData.beginDate = dateStrings[0] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.searchData.endDate = dateStrings[1] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //  时间  change 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    dateChange (date) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.searchData.beginDate = date[0] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.searchData.endDate = date[1] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     resetForm () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.searchData.beginDate = getDate.getToday().starttime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.searchData.endDate = getDate.getToday().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.time = [moment(getDate.getToday().starttime, this.dateFormat), moment(getDate.getToday().endtime, this.dateFormat)] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.$refs.rangeDate.resetDate(this.time) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.searchData.beginDate = getDate.getTodayTime().starttime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.searchData.endDate = getDate.getTodayTime().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.searchData.queryWord = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.table.refresh(true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // beforeRouteEnter (to, from, next) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  //   next(vm => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  //     // const todayDate= [getDate.getToday().starttime, getDate.getToday().endtime] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // 	// console.log(todayDate) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // 	// vm.searchData.beginDate = getDate.getToday().starttime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // 	// vm.searchData.endDate = getDate.getToday().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // 	// console.log(vm.searchData.beginDate, '--------------',  vm.searchData.endDate ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  //   }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<style></style> 
			 |