增加入库时间查询条件

src/view/ware/storechange.vue

@@ -44,6 +44,10 @@
 						<el-input v-model="query.ordNo" size="small" style="width:120px;margin-left: -8px">
 						</el-input>
 					</el-form-item>
+					<el-form-item label="入库时间" style="margin-left: -35px">
+						<el-date-picker size="small" v-model="query.inRecordDate"  style="width:330px;margin-left: -8px" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+						</el-date-picker>
+					</el-form-item>
 					<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
 						<el-button @click="handleSearch" size="small"  type="primary">查询</el-button>
 						<el-button @click="showChangeCustomer" size="small"  type="primary">货权转移</el-button>
@@ -99,6 +103,8 @@
 				</el-table-column>
 				<el-table-column prop="addTime" label="入库时间" width="200" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="carNo" label="入库车号" width="200" show-overflow-tooltip header-align="center">
+				</el-table-column>
 			</el-table>
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 			 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
@@ -223,6 +229,7 @@
 					customerName: '',
 					plateNo: '',
 					wareId:'',
+					inRecordDate:[],
 				},
 				multipleSelection: [],
 				tableData: [],
@@ -253,10 +260,15 @@
 			};
 		},
 		mounted() {
-			this.getWare()
+			this.getWare(),
+			THIS.setSearchTime()
 			//this.getTableData()
 		},
 		methods: {
+			setSearchTime(){
+				var now = new Date();
+				this.query.inRecordDate = [new Date(now.getFullYear(), now.getMonth(), now.getDate()),new Date(now.getFullYear(), now.getMonth(), now.getDate()+1)];
+			},
 			showMaterial() {
 				this.$refs.PopupMaterial.show()
 			},
@@ -389,6 +401,9 @@
 			getTableData() {
 				this.loading = true
 				var url = 'WareStore/queryStore.do'
+				if(this.query.inRecordDate == null){
+					this.query.inRecordDate = [false,false];
+				}
 				var param = {
 					page: this.currentPage,
 					rows: this.pageSize,
@@ -397,7 +412,9 @@
 					model: this.query.model,
 					materialName: this.query.materialName,
 					standard: this.query.standard,
-					customerName: this.query.customerName
+					customerName: this.query.customerName,
+					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
+					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 				}
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
@@ -680,6 +697,9 @@
 
 			handleExport() {
 				var imptData = [];
+				if(this.query.inRecordDate == null){
+					this.query.inRecordDate = [false,false];
+				}
 				var url = 'WareStore/queryStore.do'
 				var param = {
 					page: this.currentPage,
@@ -689,7 +709,9 @@
 					model: this.query.model,
 					materialName: this.query.materialName,
 					standard: this.query.standard,
-					customerName: this.query.customerName
+					customerName: this.query.customerName,
+					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
+					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 				}
 
 
@@ -734,6 +756,7 @@
 								,"产地"
 								,"备注"
 								,"入库时间"
+								,"车号"
 
 				] // 导出的表头名
 				const filterVal = ["layer"
@@ -752,6 +775,7 @@
 									,"productionPlace"
 									,"remark"
 									,"addTime"
+									,"carNo"
 				]
 				for(var i=0;i<imptData.length;i++){
 					imptData[i]["stackName"] 			= imptData[i].stack.name;