SAI开项管理：登记时间、预计完成时间范围搜索

master/src/main/java/com/ruoyi/project/production/controller/TSaiApplyController.java

@@ -19,6 +19,7 @@ import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.process.domain.TMoc;
 import com.ruoyi.project.production.controller.vo.SaiApplyExportVO;
+import com.ruoyi.project.production.controller.vo.SaiApplyQueryVO;
 import com.ruoyi.project.production.domain.TSaiApply;
 import com.ruoyi.project.production.domain.TSaiApproveFile;
 import com.ruoyi.project.production.service.ITSaiApplyService;
@@ -102,7 +103,7 @@ public class TSaiApplyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:apply:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TSaiApply tSaiApply)
+    public TableDataInfo list(SaiApplyQueryVO tSaiApply)
     {
         startPage();
         List<TSaiApply> list = tSaiApplyService.selectTSaiApplyList(tSaiApply);
@@ -249,7 +250,7 @@ public class TSaiApplyController extends BaseController
     @PreAuthorize("@ss.hasPermi('production:apply:export')")
     @Log(title = "SAI开项管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSaiApply tSaiApply)
+    public AjaxResult export(SaiApplyQueryVO tSaiApply)
     {
         // 实体类集合
         List<TSaiApply> list = tSaiApplyService.selectTSaiApplyList(tSaiApply);

master/src/main/java/com/ruoyi/project/production/controller/vo/SaiApplyQueryVO.java

@@ -0,0 +1,569 @@
+package com.ruoyi.project.production.controller.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.project.production.domain.TSaiApproveFile;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * SAI开项申请查询VO
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2023/04/20 10:30:37
+ */
+public class SaiApplyQueryVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long saiApplyId;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /** 部门编号 */
+    private Long deptId;
+
+    /** 问题描述 */
+    @Excel(name = "问题描述")
+    private String description;
+
+    /** 申请状态 */
+    @Excel(name = "申请状态")
+    private long applyStatus;
+
+    /** 登记人部门 */
+    @Excel(name = "登记人部门")
+    private String applicantDept;
+
+    private String applicantDeptName;
+
+    /** 登记人班组 */
+    @Excel(name = "登记人班组")
+    private String applicantTeam;
+
+    /** 登记人 */
+    @Excel(name = "登记人")
+    private String applicant;
+
+    private String applicantName;
+
+    /** 当前处理人 */
+    @Excel(name = "当前处理人")
+    private String handler;
+
+    private String handlerName;
+
+    /** 整改负责人 */
+    @Excel(name = "整改负责人")
+    private String executor;
+
+    private String executorName;
+
+    /** SAI级别 */
+    private Long saiLevel;
+
+    /** SAI类别 */
+    private String category;
+
+    /** 登记时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "登记时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
+    /** 预计完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "预计完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date estimateFinishDate;
+
+    /** 登记时间开始*/
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date applyDateStart;
+
+    /** 登记时间结束 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date applyDateEnd;
+
+    /** 预计完成时间开始*/
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date estimateFinishDateStart;
+
+    /** 预计完成时间结束 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date estimateFinishDateEnd;
+
+    /** 实际完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date actualFinishDate;
+
+    /** 是否录入开项系统 */
+    @Excel(name = "是否录入开项系统")
+    private Long isRecorded;
+
+    /** 开项编号 */
+    @Excel(name = "开项编号")
+    private String recordNo;
+
+    /** 申请编号 */
+    private String apNo;
+
+    /** 流程id */
+    private String processId;
+
+    /** 评估人 */
+    private String assessor;
+
+    /** 验收人 */
+    private String inspectors;
+
+    /** 不安全状态 */
+    private Long unsafeStatus;
+
+    /** 不安全行为 */
+    private Long unsafeAction;
+
+    /** 任务编号 */
+    private String taskId;
+
+    /** 任务名称 */
+    private String taskName;
+
+    /** 采取的措施 */
+    private String reaction;
+
+    /** 是否需要VE验证 */
+    private Long needVe;
+
+    /** VE验证条款 */
+    private String veItems;
+
+    /** VC/VE验证成果 */
+    private String veResult;
+
+    /** 备注 */
+    private String remarks;
+
+    /** VC/VE验证条款（其它） */
+    private String veItemOther;
+
+    @TableField(exist = false)
+    private List<TSaiApproveFile> files;
+
+    /** 备注（评估阶段） */
+    private String remarksAssess;
+
+    /** 备注（执行阶段） */
+    private String remarksExecute;
+
+    public String getRemarksAssess() {
+        return remarksAssess;
+    }
+
+    public void setRemarksAssess(String remarksAssess) {
+        this.remarksAssess = remarksAssess;
+    }
+
+    public String getRemarksExecute() {
+        return remarksExecute;
+    }
+
+    public void setRemarksExecute(String remarksExecute) {
+        this.remarksExecute = remarksExecute;
+    }
+
+    public Long getSaiLevel() {
+        return saiLevel;
+    }
+
+    public void setSaiLevel(Long saiLevel) {
+        this.saiLevel = saiLevel;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public List<TSaiApproveFile> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<TSaiApproveFile> files) {
+        this.files = files;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public String getExecutorName() {
+        return executorName;
+    }
+
+    public void setExecutorName(String executorName) {
+        this.executorName = executorName;
+    }
+
+    public String getApplicantDeptName() {
+        return applicantDeptName;
+    }
+
+    public void setApplicantDeptName(String applicantDeptName) {
+        this.applicantDeptName = applicantDeptName;
+    }
+
+    public String getHandlerName() {
+        return handlerName;
+    }
+
+    public void setHandlerName(String handlerName) {
+        this.handlerName = handlerName;
+    }
+
+    public void setSaiApplyId(Long saiApplyId)
+    {
+        this.saiApplyId = saiApplyId;
+    }
+
+    public Long getSaiApplyId()
+    {
+        return saiApplyId;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setApplyStatus(long applyStatus)
+    {
+        this.applyStatus = applyStatus;
+    }
+
+    public long getApplyStatus()
+    {
+        return applyStatus;
+    }
+    public void setApNo(String apNo)
+    {
+        this.apNo = apNo;
+    }
+
+    public String getApNo()
+    {
+        return apNo;
+    }
+    public void setProcessId(String processId)
+    {
+        this.processId = processId;
+    }
+
+    public String getProcessId()
+    {
+        return processId;
+    }
+    public void setApplicant(String applicant)
+    {
+        this.applicant = applicant;
+    }
+
+    public String getApplicant()
+    {
+        return applicant;
+    }
+    public void setAssessor(String assessor)
+    {
+        this.assessor = assessor;
+    }
+
+    public String getAssessor()
+    {
+        return assessor;
+    }
+    public void setExecutor(String executor)
+    {
+        this.executor = executor;
+    }
+
+    public String getExecutor()
+    {
+        return executor;
+    }
+    public void setInspectors(String inspectors)
+    {
+        this.inspectors = inspectors;
+    }
+
+    public String getInspectors()
+    {
+        return inspectors;
+    }
+    public void setApplicantDept(String applicantDept)
+    {
+        this.applicantDept = applicantDept;
+    }
+
+    public String getApplicantDept()
+    {
+        return applicantDept;
+    }
+    public void setApplicantTeam(String applicantTeam)
+    {
+        this.applicantTeam = applicantTeam;
+    }
+
+    public String getApplicantTeam()
+    {
+        return applicantTeam;
+    }
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+    public void setUnsafeStatus(Long unsafeStatus)
+    {
+        this.unsafeStatus = unsafeStatus;
+    }
+
+    public Long getUnsafeStatus()
+    {
+        return unsafeStatus;
+    }
+    public void setUnsafeAction(Long unsafeAction)
+    {
+        this.unsafeAction = unsafeAction;
+    }
+
+    public Long getUnsafeAction()
+    {
+        return unsafeAction;
+    }
+    public void setApplyDate(Date applyDate)
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate()
+    {
+        return applyDate;
+    }
+    public void setHandler(String handler)
+    {
+        this.handler = handler;
+    }
+
+    public String getHandler()
+    {
+        return handler;
+    }
+    public void setTaskId(String taskId)
+    {
+        this.taskId = taskId;
+    }
+
+    public String getTaskId()
+    {
+        return taskId;
+    }
+    public void setTaskName(String taskName)
+    {
+        this.taskName = taskName;
+    }
+
+    public String getTaskName()
+    {
+        return taskName;
+    }
+    public void setEstimateFinishDate(Date estimateFinishDate)
+    {
+        this.estimateFinishDate = estimateFinishDate;
+    }
+
+    public Date getEstimateFinishDate()
+    {
+        return estimateFinishDate;
+    }
+    public void setActualFinishDate(Date actualFinishDate)
+    {
+        this.actualFinishDate = actualFinishDate;
+    }
+
+    public Date getActualFinishDate()
+    {
+        return actualFinishDate;
+    }
+    public void setIsRecorded(Long isRecorded)
+    {
+        this.isRecorded = isRecorded;
+    }
+
+    public Long getIsRecorded()
+    {
+        return isRecorded;
+    }
+    public void setRecordNo(String recordNo)
+    {
+        this.recordNo = recordNo;
+    }
+
+    public String getRecordNo()
+    {
+        return recordNo;
+    }
+    public void setReaction(String reaction)
+    {
+        this.reaction = reaction;
+    }
+
+    public String getReaction()
+    {
+        return reaction;
+    }
+    public void setNeedVe(Long needVe)
+    {
+        this.needVe = needVe;
+    }
+
+    public Long getNeedVe()
+    {
+        return needVe;
+    }
+    public void setVeItems(String veItems)
+    {
+        this.veItems = veItems;
+    }
+
+    public String getVeItems()
+    {
+        return veItems;
+    }
+    public void setVeResult(String veResult)
+    {
+        this.veResult = veResult;
+    }
+
+    public String getVeResult()
+    {
+        return veResult;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setVeItemOther(String veItemOther)
+    {
+        this.veItemOther = veItemOther;
+    }
+
+    public String getVeItemOther()
+    {
+        return veItemOther;
+    }
+
+    public Date getApplyDateStart() {
+        return applyDateStart;
+    }
+
+    public void setApplyDateStart(Date applyDateStart) {
+        this.applyDateStart = applyDateStart;
+    }
+
+    public Date getApplyDateEnd() {
+        return applyDateEnd;
+    }
+
+    public void setApplyDateEnd(Date applyDateEnd) {
+        this.applyDateEnd = applyDateEnd;
+    }
+
+    public Date getEstimateFinishDateStart() {
+        return estimateFinishDateStart;
+    }
+
+    public void setEstimateFinishDateStart(Date estimateFinishDateStart) {
+        this.estimateFinishDateStart = estimateFinishDateStart;
+    }
+
+    public Date getEstimateFinishDateEnd() {
+        return estimateFinishDateEnd;
+    }
+
+    public void setEstimateFinishDateEnd(Date estimateFinishDateEnd) {
+        this.estimateFinishDateEnd = estimateFinishDateEnd;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("saiApplyId", getSaiApplyId())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("deptId", getDeptId())
+                .append("applyStatus", getApplyStatus())
+                .append("apNo", getApNo())
+                .append("processId", getProcessId())
+                .append("applicant", getApplicant())
+                .append("assessor", getAssessor())
+                .append("executor", getExecutor())
+                .append("inspectors", getInspectors())
+                .append("applicantDept", getApplicantDept())
+                .append("applicantTeam", getApplicantTeam())
+                .append("description", getDescription())
+                .append("unsafeStatus", getUnsafeStatus())
+                .append("unsafeAction", getUnsafeAction())
+                .append("applyDate", getApplyDate())
+                .append("handler", getHandler())
+                .append("taskId", getTaskId())
+                .append("taskName", getTaskName())
+                .append("estimateFinishDate", getEstimateFinishDate())
+                .append("actualFinishDate", getActualFinishDate())
+                .append("isRecorded", getIsRecorded())
+                .append("recordNo", getRecordNo())
+                .append("reaction", getReaction())
+                .append("needVe", getNeedVe())
+                .append("veItems", getVeItems())
+                .append("veResult", getVeResult())
+                .append("remarks", getRemarks())
+                .append("veItemOther", getVeItemOther())
+                .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/production/mapper/TSaiApplyMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.production.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.production.controller.vo.SaiApplyQueryVO;
 import com.ruoyi.project.production.domain.TSaiApply;
 
 /**
@@ -27,7 +28,7 @@ public interface TSaiApplyMapper
      * @return SAI开项管理集合
      */
     @DataScope(deptAlias = "d")
-    public List<TSaiApply> selectTSaiApplyList(TSaiApply tSaiApply);
+    public List<TSaiApply> selectTSaiApplyList(SaiApplyQueryVO tSaiApply);
 
     /**
      * 新增SAI开项管理

master/src/main/java/com/ruoyi/project/production/service/ITSaiApplyService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.production.service;
 
 import java.util.List;
+
+import com.ruoyi.project.production.controller.vo.SaiApplyQueryVO;
 import com.ruoyi.project.production.domain.TSaiApply;
 
 /**
@@ -25,7 +27,7 @@ public interface ITSaiApplyService
      * @param tSaiApply SAI开项管理
      * @return SAI开项管理集合
      */
-    public List<TSaiApply> selectTSaiApplyList(TSaiApply tSaiApply);
+    public List<TSaiApply> selectTSaiApplyList(SaiApplyQueryVO tSaiApply);
 
     /**
      * 新增SAI开项管理

master/src/main/java/com/ruoyi/project/production/service/impl/TSaiApplyServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.project.production.controller.vo.SaiApplyQueryVO;
 import com.ruoyi.project.system.domain.*;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
 import com.ruoyi.project.system.mapper.SysRoleMapper;
@@ -69,7 +70,7 @@ public class TSaiApplyServiceImpl implements ITSaiApplyService
      * @return SAI开项管理
      */
     @Override
-    public List<TSaiApply> selectTSaiApplyList(TSaiApply tSaiApply)
+    public List<TSaiApply> selectTSaiApplyList(SaiApplyQueryVO tSaiApply)
     {
         List<TSaiApply> tSaiApplies = tSaiApplyMapper.selectTSaiApplyList(tSaiApply);
         List<SysDictData> staffUnitDict = iSysDictTypeService.selectDictDataByType("STAFF_UNIT");

master/src/main/resources/mybatis/production/TSaiApplyMapper.xml

@@ -54,9 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
-    <select id="selectTSaiApplyList" parameterType="TSaiApply" resultMap="TSaiApplyResult">
+    <select id="selectTSaiApplyList"
+            parameterType="com.ruoyi.project.production.controller.vo.SaiApplyQueryVO"
+            resultMap="TSaiApplyResult">
         <include refid="selectTSaiApplyVo"/>
-        <where>  
+        <where>
+            <if test="applyDateStart != null ">and apply_date <![CDATA[>=]]> #{applyDateStart}</if>
+            <if test="applyDateEnd != null">and apply_date <![CDATA[<=]]>#{applyDateEnd}</if>
+            <if test="estimateFinishDateStart != null ">and estimate_finish_date <![CDATA[>=]]> #{estimateFinishDateStart}</if>
+            <if test="estimateFinishDateEnd != null">and estimate_finish_date <![CDATA[<=]]>#{estimateFinishDateEnd}</if>
             <if test="saiApplyId != null "> and sai_apply_id = #{saiApplyId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
@@ -91,8 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarksExecute != null  and remarksExecute != ''"> and remarks_execute = #{remarksExecute}</if>
             and d.del_flag = 0
         </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
         order by APPLY_DATE desc
     </select>
     

ui/src/views/production/apply/all/index.vue

@@ -72,22 +72,26 @@
       </el-form-item>
       <el-form-item label="登记时间" prop="applyDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择登记时间">
+          v-model="applyDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="预计完成时间" prop="estimateFinishDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.estimateFinishDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择预计完成时间">
+          v-model="estimateFinishDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -653,6 +657,8 @@ export default {
       }
     };
     return {
+      applyDateRange: [],
+      estimateFinishDateRange: [],
       // SAI类别列表
       saiCategoryOptions: [],
       fileList: [],
@@ -777,6 +783,10 @@ export default {
         veItems: null,
         veResult: null,
         veItemOther: null,
+        applyDateStart: null,
+        applyDateEnd: null,
+        estimateFinishDateStart: null,
+        estimateFinishDateEnd: null,
       },
       // 表单参数
       form: {},
@@ -1278,12 +1288,30 @@ export default {
         veItems: null,
         veResult: null,
         veItemOther: null,
+        applyDateStart: null,
+        applyDateEnd: null,
+        estimateFinishDateStart: null,
+        estimateFinishDateEnd: null,
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      if (this.applyDateRange != null) {
+        this.queryParams.applyDateStart = this.applyDateRange[0];
+        this.queryParams.applyDateEnd = this.applyDateRange[1];
+      } else {
+        this.queryParams.applyDateStart = null;
+        this.queryParams.applyDateEnd = null;
+      }
+      if (this.estimateFinishDateRange != null) {
+        this.queryParams.estimateFinishDateStart = this.estimateFinishDateRange[0];
+        this.queryParams.estimateFinishDateEnd = this.estimateFinishDateRange[1];
+      } else {
+        this.queryParams.estimateFinishDateStart = null;
+        this.queryParams.estimateFinishDateEnd = null;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

ui/src/views/production/apply/mine/index.vue

@@ -72,22 +72,26 @@
       </el-form-item>
       <el-form-item label="登记时间" prop="applyDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择登记时间">
+          v-model="applyDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="预计完成时间" prop="estimateFinishDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.estimateFinishDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择预计完成时间">
+          v-model="estimateFinishDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -653,6 +657,8 @@
         }
       };
       return {
+        applyDateRange: [],
+        estimateFinishDateRange: [],
         // SAI类别列表
         saiCategoryOptions: [],
         fileList: [],
@@ -777,6 +783,10 @@
           veItems: null,
           veResult: null,
           veItemOther: null,
+          applyDateStart: null,
+          applyDateEnd: null,
+          estimateFinishDateStart: null,
+          estimateFinishDateEnd: null,
         },
         // 表单参数
         form: {},
@@ -1294,12 +1304,30 @@
           veItems: null,
           veResult: null,
           veItemOther: null,
+          applyDateStart: null,
+          applyDateEnd: null,
+          estimateFinishDateStart: null,
+          estimateFinishDateEnd: null,
         };
         this.resetForm("form");
       },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
+        if (this.applyDateRange != null) {
+          this.queryParams.applyDateStart = this.applyDateRange[0];
+          this.queryParams.applyDateEnd = this.applyDateRange[1];
+        } else {
+          this.queryParams.applyDateStart = null;
+          this.queryParams.applyDateEnd = null;
+        }
+        if (this.estimateFinishDateRange != null) {
+          this.queryParams.estimateFinishDateStart = this.estimateFinishDateRange[0];
+          this.queryParams.estimateFinishDateEnd = this.estimateFinishDateRange[1];
+        } else {
+          this.queryParams.estimateFinishDateStart = null;
+          this.queryParams.estimateFinishDateEnd = null;
+        }
         this.getList();
       },
       /** 重置按钮操作 */

ui/src/views/production/apply/pending/index.vue

@@ -72,22 +72,26 @@
       </el-form-item>
       <el-form-item label="登记时间" prop="applyDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择登记时间">
+          v-model="applyDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="预计完成时间" prop="estimateFinishDate">
         <el-date-picker
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.estimateFinishDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择预计完成时间">
+          v-model="estimateFinishDateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          :range-separator="$t('至')"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -653,6 +657,8 @@
         }
       };
       return {
+        applyDateRange: [],
+        estimateFinishDateRange: [],
         // SAI类别列表
         saiCategoryOptions: [],
         fileList: [],
@@ -777,6 +783,10 @@
           veItems: null,
           veResult: null,
           veItemOther: null,
+          applyDateStart: null,
+          applyDateEnd: null,
+          estimateFinishDateStart: null,
+          estimateFinishDateEnd: null,
         },
         // 表单参数
         form: {},
@@ -1291,12 +1301,30 @@
           veItems: null,
           veResult: null,
           veItemOther: null,
+          applyDateStart: null,
+          applyDateEnd: null,
+          estimateFinishDateStart: null,
+          estimateFinishDateEnd: null,
         };
         this.resetForm("form");
       },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
+        if (this.applyDateRange != null) {
+          this.queryParams.applyDateStart = this.applyDateRange[0];
+          this.queryParams.applyDateEnd = this.applyDateRange[1];
+        } else {
+          this.queryParams.applyDateStart = null;
+          this.queryParams.applyDateEnd = null;
+        }
+        if (this.estimateFinishDateRange != null) {
+          this.queryParams.estimateFinishDateStart = this.estimateFinishDateRange[0];
+          this.queryParams.estimateFinishDateEnd = this.estimateFinishDateRange[1];
+        } else {
+          this.queryParams.estimateFinishDateStart = null;
+          this.queryParams.estimateFinishDateEnd = null;
+        }
         this.getList();
       },
       /** 重置按钮操作 */