Billion-Mes.git

			@@ -1,12 +1,13 @@
			package com.billion.main.da.domain;

			import java.util.Date;

			import com.billion.common.core.domain.BaseEntity;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import lombok.Data;
			import org.apache.commons.lang3.builder.ToStringBuilder;
			import org.apache.commons.lang3.builder.ToStringStyle;
			import com.billion.common.annotation.Excel;
			import com.billion.main.common.BaseEntity;

			/**
			* 物料采集对象 da_material_collection

			@@ -25,6 +25,9 @@
			<if test="locationCode != null and locationCode != ''"> and location_code like concat('%', #{locationCode}, '%')</if>
			<if test="paramCode != null and paramCode != ''"> and param_code like concat('%', #{paramCode}, '%')</if>
			<if test="paramName != null and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
			<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"><!-- 开始时间检索 -->
			and collect_time BETWEEN #{params.beginTime} and #{params.endTime}
			</if>
			</where>
			</select>

			@@ -9,14 +9,24 @@
			@keyup.enter.native="handleQuery"
			/>
			</el-form-item>
			<el-form-item label="工位编码" prop="locationCode">
			<el-input
			v-model="queryParams.locationCode"
			placeholder="请输入工位编码"
			clearable
			@keyup.enter.native="handleQuery"
			/>
			<el-form-item label-width="120" label="采集时间">
			<el-date-picker
			v-model="dateRange"
			type="datetimerange"
			range-separator="至"
			value-format="yyyy-MM-dd HH:mm:ss"
			start-placeholder="开始日期"
			end-placeholder="结束日期">
			</el-date-picker>
			</el-form-item>
			<!-- <el-form-item label="工位编码" prop="locationCode">-->
			<!-- <el-input-->
			<!-- v-model="queryParams.locationCode"-->
			<!-- placeholder="请输入工位编码"-->
			<!-- clearable-->
			<!-- @keyup.enter.native="handleQuery"-->
			<!-- />-->
			<!-- </el-form-item>-->
			<!-- <el-form-item label="参数编码" prop="paramCode">-->
			<!-- <el-input-->
			<!-- v-model="queryParams.paramCode"-->
			@@ -138,6 +148,8 @@
			name: "MaterialCollection",
			data() {
			return {
			// 日期范围
			dateRange: [],
			// 遮罩层
			loading: true,
			// 选中数组
			@@ -179,7 +191,7 @@
			/** 查询物料采集列表 */
			getList() {
			this.loading = true;
			listMaterialCollection(this.queryParams).then(response => {
			listMaterialCollection(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
			this.materialCollectionList = response.rows;
			this.total = response.total;
			this.loading = false;
			@@ -205,6 +217,7 @@
			},
			/** 搜索按钮操作 */
			handleQuery() {
			this.dateRange = [];
			this.queryParams.pageNum = 1;
			this.getList();
			},

	billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	billion-main/src/main/resources/mapper/da/DaMaterialCollectionMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	billion-ui/src/views/main/da/materialCollection/index.vue	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史