变更申请审核 申请时间

danger-manage-system/src/main/java/com/zehong/system/domain/TChangeApplyApproval.java

@@ -53,6 +53,10 @@ public class TChangeApplyApproval extends BaseEntity
     @Excel(name = "是否删除(0正常，1删除)")
     private String isDel;
 
+    private Date enterTimeBegin;
+
+    private Date enterTimeEnd;
+
     public void setChangeApplyId(Long changeApplyId) 
     {
         this.changeApplyId = changeApplyId;
@@ -135,6 +139,22 @@ public class TChangeApplyApproval extends BaseEntity
         return isDel;
     }
 
+    public Date getEnterTimeBegin() {
+        return enterTimeBegin;
+    }
+
+    public void setEnterTimeBegin(Date enterTimeBegin) {
+        this.enterTimeBegin = enterTimeBegin;
+    }
+
+    public Date getEnterTimeEnd() {
+        return enterTimeEnd;
+    }
+
+    public void setEnterTimeEnd(Date enterTimeEnd) {
+        this.enterTimeEnd = enterTimeEnd;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

danger-manage-system/src/main/resources/mapper/system/TChangeApplyApprovalMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="changeProjectName != null  and changeProjectName != ''"> and change_project_name like concat('%', #{changeProjectName}, '%')</if>
             <if test="tableData != null  and tableData != ''"> and table_data = #{tableData}</if>
             <if test="enterPerson != null "> and enter_person = #{enterPerson}</if>
-            <if test="enterTime != null "> and enter_time = #{enterTime}</if>
+            <if test="enterTimeBegin != null and enterTimeEnd != null "> and enter_time BETWEEN #{enterTimeBegin} AND #{enterTimeEnd}</if>
             <if test="trainMaterial != null  and trainMaterial != ''"> and train_material = #{trainMaterial}</if>
             <if test="changeApplyStatus != null  and changeApplyStatus != ''"> and change_apply_status = #{changeApplyStatus}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>

danger-manage-web/src/views/deviceManagement/changeApplyApproval/index.vue

@@ -12,11 +12,14 @@
       </el-form-item>
 
       <el-form-item label="录入时间" prop="enterTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.enterTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择录入时间">
+        <el-date-picker
+          v-model="enterTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="录入开始日期"
+          end-placeholder="录入结束日期"
+          @change="dateFormat">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -236,6 +239,8 @@ export default {
         enterTime: null,
         changeApplyStatus: null,
         isDel: null,
+        enterTimeBegin: null,
+        enterTimeEnd: null
       },
       // 表单参数
       form: {},
@@ -321,7 +326,8 @@ export default {
       peopleList: [],
       changeApplyId: "",
       detailOpen: false,
-      approverList: []
+      approverList: [],
+      enterTime: [],
     };
   },
   created() {
@@ -441,6 +447,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.enterTime = [];
+      this.queryParams.enterTimeBegin = null;
+      this.queryParams.enterTimeEnd = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -578,7 +587,12 @@ export default {
           this.approverList = res.rows
         }
       })
-    }
+    },
+    dateFormat(picker){
+      this.enterTime = picker;
+      this.queryParams.enterTimeBegin = picker[0];
+      this.queryParams.enterTimeEnd = picker[1];
+    },
   }
 };
 </script>