Merge remote-tracking branch 'origin/master'

dibang-ui/src/views/weighbridge/weightInfo/index.vue

@@ -97,7 +97,47 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="重量单位" prop="weightUnit">
+       <!-- <el-form-item label="毛重时间" prop="grossTime">
+        <el-date-picker clearable
+          v-model="queryParams.grossTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择毛重时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="皮重时间" prop="tareTime">
+        <el-date-picker clearable
+          v-model="queryParams.tareTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择皮重时间">
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item label="毛重时间">
+            <el-date-picker clearable
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+           <el-form-item label="皮重时间">
+            <el-date-picker clearable
+              v-model="dateRange2"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+      <!-- <el-form-item label="重量单位" prop="weightUnit">
         <el-input
           v-model="queryParams.weightUnit"
           placeholder="请输入重量单位"
@@ -169,22 +209,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毛重时间" prop="grossTime">
-        <el-date-picker clearable
-          v-model="queryParams.grossTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择毛重时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="皮重时间" prop="tareTime">
-        <el-date-picker clearable
-          v-model="queryParams.tareTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择皮重时间">
-        </el-date-picker>
-      </el-form-item>
+     
       <el-form-item label="一次时间" prop="firstTime">
         <el-date-picker clearable
           v-model="queryParams.firstTime"
@@ -216,7 +241,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -525,7 +550,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      // 日期范围
+      dateRange: [],
+      // 日期范围
+      dateRange2: [],
     };
   },
   created() {
@@ -535,7 +564,7 @@ export default {
     /** 查询称重单列表 */
     getList() {
       this.loading = true;
-      listWeightInfo(this.queryParams).then(response => {
+      listWeightInfo(this.addDateRange(this.queryParams, this.dateRange, this.dateRange2)).then(response => {
         this.weightInfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -588,6 +617,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+       this.dateRange = [];
+       this.dateRange2 = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

ruoyi-system/src/main/resources/mapper/weighbridge/TblWeightinfoMapper.xml

@@ -64,12 +64,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tareStation != null  and tareStation != ''"> and tare_station = #{tareStation}</if>
             <if test="grossMan != null  and grossMan != ''"> and gross_man = #{grossMan}</if>
             <if test="tareMan != null  and tareMan != ''"> and tare_man = #{tareMan}</if>
-            <if test="grossTime != null "> and gross_time = #{grossTime}</if>
-            <if test="tareTime != null "> and tare_time = #{tareTime}</if>
             <if test="firstTime != null "> and first_time = #{firstTime}</if>
             <if test="secondTime != null "> and second_time = #{secondTime}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and grossTime = to_date(#{params.beginTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and grossTime = to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
+            <if test="params.modBeginTime != null and params.modBeginTime != ''"><!-- 开始时间检索 -->
+                and tareTime = to_date(#{params.modBeginTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
+            <if test="params.modEndTime != null and params.modEndTime != ''"><!-- 结束时间检索 -->
+                and tareTime = to_date(#{params.modEndTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
         </where>
     </select>