diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java
new file mode 100644
index 00000000..8cf29911
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java
@@ -0,0 +1,151 @@
+package com.ruoyi.sales.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sales.domain.SalesEstimate;
+import com.ruoyi.sales.service.ISalesEstimateService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 销售估价Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+@Controller
+@RequestMapping("/sales/salesEstimate")
+public class SalesEstimateController extends BaseController
+{
+    private String prefix = "sales/salesEstimate";
+
+    @Autowired
+    private ISalesEstimateService salesEstimateService;
+
+    @RequiresPermissions("sales:salesEstimate:view")
+    @GetMapping()
+    public String salesEstimate()
+    {
+        return prefix + "/salesEstimate";
+    }
+
+    /**
+     * 查询销售估价列表
+     */
+    @RequiresPermissions("sales:salesEstimate:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SalesEstimate salesEstimate)
+    {
+        startPage();
+        List<SalesEstimate> list = salesEstimateService.selectSalesEstimateList(salesEstimate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出销售估价列表
+     */
+    @RequiresPermissions("sales:salesEstimate:export")
+    @Log(title = "销售估价", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SalesEstimate salesEstimate)
+    {
+        List<SalesEstimate> list = salesEstimateService.selectSalesEstimateList(salesEstimate);
+        ExcelUtil<SalesEstimate> util = new ExcelUtil<SalesEstimate>(SalesEstimate.class);
+        return util.exportExcel(list, "销售估价数据");
+    }
+
+    /**
+     * 新增销售估价
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存销售估价
+     */
+    @RequiresPermissions("sales:salesEstimate:add")
+    @Log(title = "销售估价", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SalesEstimate salesEstimate)
+    {
+        return toAjax(salesEstimateService.insertSalesEstimate(salesEstimate));
+    }
+
+    /**
+     * 修改销售估价
+     */
+    @GetMapping("/edit/{aftersalesEstimateId}")
+    public String edit(@PathVariable("aftersalesEstimateId") Long aftersalesEstimateId, ModelMap mmap)
+    {
+        SalesEstimate salesEstimate = salesEstimateService.selectSalesEstimateById(aftersalesEstimateId);
+        mmap.put("salesEstimate", salesEstimate);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存销售估价
+     */
+    @RequiresPermissions("sales:salesEstimate:edit")
+    @Log(title = "销售估价", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SalesEstimate salesEstimate)
+    {
+        return toAjax(salesEstimateService.updateSalesEstimate(salesEstimate));
+    }
+
+    /**
+     * 删除销售估价
+     */
+    @RequiresPermissions("sales:salesEstimate:remove")
+    @Log(title = "销售估价", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(salesEstimateService.deleteSalesEstimateByIds(ids));
+    }
+
+    /**
+     * 作废销售估价
+     */
+    @RequiresPermissions("sales:salesEstimate:cancel")
+    @Log(title = "销售估价", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(salesEstimateService.cancelSalesEstimateById(id));
+    }
+
+    /**
+     * 恢复销售估价
+     */
+    @RequiresPermissions("sales:salesEstimate:restore")
+    @Log(title = "销售估价", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(salesEstimateService.restoreSalesEstimateById(id));
+    }
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimate.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimate.java
new file mode 100644
index 00000000..7e18937a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimate.java
@@ -0,0 +1,330 @@
+package com.ruoyi.sales.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 销售估价对象 sales_estimate
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public class SalesEstimate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 销售估价ID */
+    private Long aftersalesEstimateId;
+
+    /** 估价单号 */
+    @Excel(name = "估价单号")
+    private String aftersalesEstimateCode;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 估价状态 */
+    @Excel(name = "估价状态")
+    private String estimateStatus;
+
+    /** 客户代码 */
+    @Excel(name = "客户代码")
+    private String enterpriseCode;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String enterpriseName;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料合计 */
+    @Excel(name = "物料合计")
+    private String materialSum;
+
+    /** 数量合计 */
+    @Excel(name = "数量合计")
+    private String quantitySum;
+
+    /** 估价币种 */
+    @Excel(name = "估价币种")
+    private String estimateCurrencies;
+
+    /** 不含税总价（RMB） */
+    @Excel(name = "不含税总价", readConverterExp = "R=MB")
+    private BigDecimal allPriceExcludingTaxRmb;
+
+    /** 含税总价（RMB） */
+    @Excel(name = "含税总价", readConverterExp = "R=MB")
+    private BigDecimal allPriceIncludesTax;
+
+    /** 不含税总价（美元） */
+    @Excel(name = "不含税总价", readConverterExp = "美=元")
+    private BigDecimal allPriceExcludingTaxDollar;
+
+    /** 流程实例ID */
+    private String instanceId;
+
+    /** 流程实例类型 */
+    private String instanceType;
+
+    /** 流程提交实例ID */
+    private String submitInstanceId;
+
+    /** 申请标题 */
+    private String applyTitle;
+
+    /** 申请时间 */
+    private Date applyTime;
+
+    /** 申请人 */
+    private String applyUser;
+
+    /** 流程作废实例ID */
+    private String cancelInstanceId;
+
+    /** 流程恢复实例ID */
+    private String restoreInstanceId;
+
+    public void setAftersalesEstimateId(Long aftersalesEstimateId) 
+    {
+        this.aftersalesEstimateId = aftersalesEstimateId;
+    }
+
+    public Long getAftersalesEstimateId() 
+    {
+        return aftersalesEstimateId;
+    }
+    public void setAftersalesEstimateCode(String aftersalesEstimateCode) 
+    {
+        this.aftersalesEstimateCode = aftersalesEstimateCode;
+    }
+
+    public String getAftersalesEstimateCode() 
+    {
+        return aftersalesEstimateCode;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setEstimateStatus(String estimateStatus) 
+    {
+        this.estimateStatus = estimateStatus;
+    }
+
+    public String getEstimateStatus() 
+    {
+        return estimateStatus;
+    }
+    public void setEnterpriseCode(String enterpriseCode) 
+    {
+        this.enterpriseCode = enterpriseCode;
+    }
+
+    public String getEnterpriseCode() 
+    {
+        return enterpriseCode;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setMaterialSum(String materialSum) 
+    {
+        this.materialSum = materialSum;
+    }
+
+    public String getMaterialSum() 
+    {
+        return materialSum;
+    }
+    public void setQuantitySum(String quantitySum) 
+    {
+        this.quantitySum = quantitySum;
+    }
+
+    public String getQuantitySum() 
+    {
+        return quantitySum;
+    }
+    public void setEstimateCurrencies(String estimateCurrencies) 
+    {
+        this.estimateCurrencies = estimateCurrencies;
+    }
+
+    public String getEstimateCurrencies() 
+    {
+        return estimateCurrencies;
+    }
+    public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) 
+    {
+        this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb;
+    }
+
+    public BigDecimal getAllPriceExcludingTaxRmb() 
+    {
+        return allPriceExcludingTaxRmb;
+    }
+    public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) 
+    {
+        this.allPriceIncludesTax = allPriceIncludesTax;
+    }
+
+    public BigDecimal getAllPriceIncludesTax() 
+    {
+        return allPriceIncludesTax;
+    }
+    public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) 
+    {
+        this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar;
+    }
+
+    public BigDecimal getAllPriceExcludingTaxDollar() 
+    {
+        return allPriceExcludingTaxDollar;
+    }
+    public void setInstanceId(String instanceId) 
+    {
+        this.instanceId = instanceId;
+    }
+
+    public String getInstanceId() 
+    {
+        return instanceId;
+    }
+    public void setInstanceType(String instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public String getInstanceType() 
+    {
+        return instanceType;
+    }
+    public void setSubmitInstanceId(String submitInstanceId) 
+    {
+        this.submitInstanceId = submitInstanceId;
+    }
+
+    public String getSubmitInstanceId() 
+    {
+        return submitInstanceId;
+    }
+    public void setApplyTitle(String applyTitle) 
+    {
+        this.applyTitle = applyTitle;
+    }
+
+    public String getApplyTitle() 
+    {
+        return applyTitle;
+    }
+    public void setApplyTime(Date applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setApplyUser(String applyUser) 
+    {
+        this.applyUser = applyUser;
+    }
+
+    public String getApplyUser() 
+    {
+        return applyUser;
+    }
+    public void setCancelInstanceId(String cancelInstanceId) 
+    {
+        this.cancelInstanceId = cancelInstanceId;
+    }
+
+    public String getCancelInstanceId() 
+    {
+        return cancelInstanceId;
+    }
+    public void setRestoreInstanceId(String restoreInstanceId) 
+    {
+        this.restoreInstanceId = restoreInstanceId;
+    }
+
+    public String getRestoreInstanceId() 
+    {
+        return restoreInstanceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("aftersalesEstimateId", getAftersalesEstimateId())
+            .append("aftersalesEstimateCode", getAftersalesEstimateCode())
+            .append("userId", getUserId())
+            .append("estimateStatus", getEstimateStatus())
+            .append("enterpriseCode", getEnterpriseCode())
+            .append("enterpriseName", getEnterpriseName())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("materialSum", getMaterialSum())
+            .append("quantitySum", getQuantitySum())
+            .append("estimateCurrencies", getEstimateCurrencies())
+            .append("allPriceExcludingTaxRmb", getAllPriceExcludingTaxRmb())
+            .append("allPriceIncludesTax", getAllPriceIncludesTax())
+            .append("allPriceExcludingTaxDollar", getAllPriceExcludingTaxDollar())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("instanceId", getInstanceId())
+            .append("instanceType", getInstanceType())
+            .append("submitInstanceId", getSubmitInstanceId())
+            .append("applyTitle", getApplyTitle())
+            .append("applyTime", getApplyTime())
+            .append("applyUser", getApplyUser())
+            .append("cancelInstanceId", getCancelInstanceId())
+            .append("restoreInstanceId", getRestoreInstanceId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateMapper.java
new file mode 100644
index 00000000..94a5e044
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateMapper.java
@@ -0,0 +1,77 @@
+package com.ruoyi.sales.mapper;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesEstimate;
+
+/**
+ * 销售估价Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public interface SalesEstimateMapper 
+{
+    /**
+     * 查询销售估价
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 销售估价
+     */
+    public SalesEstimate selectSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 查询销售估价列表
+     * 
+     * @param salesEstimate 销售估价
+     * @return 销售估价集合
+     */
+    public List<SalesEstimate> selectSalesEstimateList(SalesEstimate salesEstimate);
+
+    /**
+     * 新增销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    public int insertSalesEstimate(SalesEstimate salesEstimate);
+
+    /**
+     * 修改销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    public int updateSalesEstimate(SalesEstimate salesEstimate);
+
+    /**
+     * 删除销售估价
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    public int deleteSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 批量删除销售估价
+     * 
+     * @param aftersalesEstimateIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesEstimateByIds(String[] aftersalesEstimateIds);
+
+    /**
+     * 作废销售估价
+     *
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    public int cancelSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 恢复销售估价
+     *
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    public int restoreSalesEstimateById(Long aftersalesEstimateId);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java
new file mode 100644
index 00000000..fe70cbc7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java
@@ -0,0 +1,75 @@
+package com.ruoyi.sales.service;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesEstimate;
+
+/**
+ * 销售估价Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public interface ISalesEstimateService 
+{
+    /**
+     * 查询销售估价
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 销售估价
+     */
+    public SalesEstimate selectSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 查询销售估价列表
+     * 
+     * @param salesEstimate 销售估价
+     * @return 销售估价集合
+     */
+    public List<SalesEstimate> selectSalesEstimateList(SalesEstimate salesEstimate);
+
+    /**
+     * 新增销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    public int insertSalesEstimate(SalesEstimate salesEstimate);
+
+    /**
+     * 修改销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    public int updateSalesEstimate(SalesEstimate salesEstimate);
+
+    /**
+     * 批量删除销售估价
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesEstimateByIds(String ids);
+
+    /**
+     * 删除销售估价信息
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    public int deleteSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 作废销售估价
+     * @param aftersalesEstimateId 销售估价ID
+     * @return
+     */
+    int cancelSalesEstimateById(Long aftersalesEstimateId);
+
+    /**
+     * 恢复销售估价
+     * @param aftersalesEstimateId 销售估价ID
+     * @return
+     */
+    int restoreSalesEstimateById(Long aftersalesEstimateId);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
new file mode 100644
index 00000000..b9daa339
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
@@ -0,0 +1,126 @@
+package com.ruoyi.sales.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.sales.mapper.SalesEstimateMapper;
+import com.ruoyi.sales.domain.SalesEstimate;
+import com.ruoyi.sales.service.ISalesEstimateService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 销售估价Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+@Service
+public class SalesEstimateServiceImpl implements ISalesEstimateService 
+{
+    @Autowired
+    private SalesEstimateMapper salesEstimateMapper;
+
+    /**
+     * 查询销售估价
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 销售估价
+     */
+    @Override
+    public SalesEstimate selectSalesEstimateById(Long aftersalesEstimateId)
+    {
+        return salesEstimateMapper.selectSalesEstimateById(aftersalesEstimateId);
+    }
+
+    /**
+     * 查询销售估价列表
+     * 
+     * @param salesEstimate 销售估价
+     * @return 销售估价
+     */
+    @Override
+    public List<SalesEstimate> selectSalesEstimateList(SalesEstimate salesEstimate)
+    {
+        return salesEstimateMapper.selectSalesEstimateList(salesEstimate);
+    }
+
+    /**
+     * 新增销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    @Override
+    public int insertSalesEstimate(SalesEstimate salesEstimate)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        salesEstimate.setCreateBy(loginName);
+        salesEstimate.setCreateTime(DateUtils.getNowDate());
+        return salesEstimateMapper.insertSalesEstimate(salesEstimate);
+    }
+
+    /**
+     * 修改销售估价
+     * 
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    @Override
+    public int updateSalesEstimate(SalesEstimate salesEstimate)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        salesEstimate.setUpdateBy(loginName);
+        salesEstimate.setUpdateTime(DateUtils.getNowDate());
+        return salesEstimateMapper.updateSalesEstimate(salesEstimate);
+    }
+
+    /**
+     * 删除销售估价对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesEstimateByIds(String ids)
+    {
+        return salesEstimateMapper.deleteSalesEstimateByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除销售估价信息
+     * 
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesEstimateById(Long aftersalesEstimateId)
+    {
+        return salesEstimateMapper.deleteSalesEstimateById(aftersalesEstimateId);
+    }
+
+    /**
+     * 作废销售估价
+     *
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    @Override
+    public int cancelSalesEstimateById(Long aftersalesEstimateId)
+    {
+        return salesEstimateMapper.cancelSalesEstimateById(aftersalesEstimateId);
+    }
+
+    /**
+     * 恢复销售估价信息
+     *
+     * @param aftersalesEstimateId 销售估价ID
+     * @return 结果
+     */
+    @Override
+    public int restoreSalesEstimateById(Long aftersalesEstimateId)
+    {
+        return salesEstimateMapper.restoreSalesEstimateById(aftersalesEstimateId);
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateMapper.xml
new file mode 100644
index 00000000..e9d2266d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateMapper.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sales.mapper.SalesEstimateMapper">
+    
+    <resultMap type="SalesEstimate" id="SalesEstimateResult">
+        <result property="aftersalesEstimateId"    column="aftersales_estimate_id"    />
+        <result property="aftersalesEstimateCode"    column="aftersales_estimate_code"    />
+        <result property="userId"    column="user_id"    />
+        <result property="estimateStatus"    column="estimate_status"    />
+        <result property="enterpriseCode"    column="enterprise_code"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialSum"    column="material_sum"    />
+        <result property="quantitySum"    column="quantity_sum"    />
+        <result property="estimateCurrencies"    column="estimate_currencies"    />
+        <result property="allPriceExcludingTaxRmb"    column="all_price_excluding_tax_rmb"    />
+        <result property="allPriceIncludesTax"    column="all_price_includes_tax"    />
+        <result property="allPriceExcludingTaxDollar"    column="all_price_excluding_tax_dollar"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="instanceType"    column="instance_type"    />
+        <result property="submitInstanceId"    column="submit_instance_id"    />
+        <result property="applyTitle"    column="apply_title"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="applyUser"    column="apply_user"    />
+        <result property="cancelInstanceId"    column="cancel_instance_id"    />
+        <result property="restoreInstanceId"    column="restore_instance_id"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSalesEstimateVo">
+        select aftersales_estimate_id, aftersales_estimate_code, user_id, estimate_status, enterprise_code, enterprise_name, material_no, material_name, material_sum, quantity_sum, estimate_currencies, all_price_excluding_tax_rmb, all_price_includes_tax, all_price_excluding_tax_dollar, create_by, create_time, update_by, update_time, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id, remark from sales_estimate
+    </sql>
+
+    <select id="selectSalesEstimateList" parameterType="SalesEstimate" resultMap="SalesEstimateResult">
+        <include refid="selectSalesEstimateVo"/>
+        <where>  
+            <if test="aftersalesEstimateCode != null  and aftersalesEstimateCode != ''"> and aftersales_estimate_code = #{aftersalesEstimateCode}</if>
+            <if test="estimateStatus != null  and estimateStatus != ''"> and estimate_status = #{estimateStatus}</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no = #{materialNo}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSalesEstimateById" parameterType="Long" resultMap="SalesEstimateResult">
+        <include refid="selectSalesEstimateVo"/>
+        where aftersales_estimate_id = #{aftersalesEstimateId}
+    </select>
+        
+    <insert id="insertSalesEstimate" parameterType="SalesEstimate" useGeneratedKeys="true" keyProperty="aftersalesEstimateId">
+        insert into sales_estimate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="aftersalesEstimateCode != null">aftersales_estimate_code,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="estimateStatus != null">estimate_status,</if>
+            <if test="enterpriseCode != null">enterprise_code,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="quantitySum != null">quantity_sum,</if>
+            <if test="estimateCurrencies != null">estimate_currencies,</if>
+            <if test="allPriceExcludingTaxRmb != null">all_price_excluding_tax_rmb,</if>
+            <if test="allPriceIncludesTax != null">all_price_includes_tax,</if>
+            <if test="allPriceExcludingTaxDollar != null">all_price_excluding_tax_dollar,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="instanceId != null">instance_id,</if>
+            <if test="instanceType != null">instance_type,</if>
+            <if test="submitInstanceId != null">submit_instance_id,</if>
+            <if test="applyTitle != null">apply_title,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="applyUser != null">apply_user,</if>
+            <if test="cancelInstanceId != null">cancel_instance_id,</if>
+            <if test="restoreInstanceId != null">restore_instance_id,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="aftersalesEstimateCode != null">#{aftersalesEstimateCode},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="estimateStatus != null">#{estimateStatus},</if>
+            <if test="enterpriseCode != null">#{enterpriseCode},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="quantitySum != null">#{quantitySum},</if>
+            <if test="estimateCurrencies != null">#{estimateCurrencies},</if>
+            <if test="allPriceExcludingTaxRmb != null">#{allPriceExcludingTaxRmb},</if>
+            <if test="allPriceIncludesTax != null">#{allPriceIncludesTax},</if>
+            <if test="allPriceExcludingTaxDollar != null">#{allPriceExcludingTaxDollar},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="instanceType != null">#{instanceType},</if>
+            <if test="submitInstanceId != null">#{submitInstanceId},</if>
+            <if test="applyTitle != null">#{applyTitle},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="applyUser != null">#{applyUser},</if>
+            <if test="cancelInstanceId != null">#{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">#{restoreInstanceId},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSalesEstimate" parameterType="SalesEstimate">
+        update sales_estimate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="aftersalesEstimateCode != null">aftersales_estimate_code = #{aftersalesEstimateCode},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="estimateStatus != null">estimate_status = #{estimateStatus},</if>
+            <if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="quantitySum != null">quantity_sum = #{quantitySum},</if>
+            <if test="estimateCurrencies != null">estimate_currencies = #{estimateCurrencies},</if>
+            <if test="allPriceExcludingTaxRmb != null">all_price_excluding_tax_rmb = #{allPriceExcludingTaxRmb},</if>
+            <if test="allPriceIncludesTax != null">all_price_includes_tax = #{allPriceIncludesTax},</if>
+            <if test="allPriceExcludingTaxDollar != null">all_price_excluding_tax_dollar = #{allPriceExcludingTaxDollar},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="instanceType != null">instance_type = #{instanceType},</if>
+            <if test="submitInstanceId != null">submit_instance_id = #{submitInstanceId},</if>
+            <if test="applyTitle != null">apply_title = #{applyTitle},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="applyUser != null">apply_user = #{applyUser},</if>
+            <if test="cancelInstanceId != null">cancel_instance_id = #{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">restore_instance_id = #{restoreInstanceId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where aftersales_estimate_id = #{aftersalesEstimateId}
+    </update>
+
+    <delete id="deleteSalesEstimateById" parameterType="Long">
+        delete from sales_estimate where aftersales_estimate_id = #{aftersalesEstimateId}
+    </delete>
+
+    <delete id="deleteSalesEstimateByIds" parameterType="String">
+        delete from sales_estimate where aftersales_estimate_id in 
+        <foreach item="aftersalesEstimateId" collection="array" open="(" separator="," close=")">
+            #{aftersalesEstimateId}
+        </foreach>
+    </delete>
+
+    <update id="cancelSalesEstimateById" parameterType="Long">
+        update sales_estimate set del_flag = '1' where aftersales_estimate_id = #{aftersalesEstimateId}
+    </update>
+
+    <update id="restoreSalesEstimateById" parameterType="Long">
+        update sales_estimate set del_flag = '0' where aftersales_estimate_id = #{aftersalesEstimateId}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/add.html
new file mode 100644
index 00000000..a87bc79d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/add.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增销售估价')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-salesEstimate-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价单号：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesEstimateCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户ID：</label>
+                <div class="col-sm-8">
+                    <input name="userId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价状态：</label>
+                <div class="col-sm-8">
+                    <select name="estimateStatus" class="form-control m-b" th:with="type=${@dict.getType('estimate_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户代码：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="quantitySum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价币种：</label>
+                <div class="col-sm-8">
+                    <input name="estimateCurrencies" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxRmb" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceIncludesTax" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxDollar" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="instanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例类型：</label>
+                <div class="col-sm-8">
+                    <select name="instanceType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程提交实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="submitInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请标题：</label>
+                <div class="col-sm-8">
+                    <input name="applyTitle" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="applyTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人：</label>
+                <div class="col-sm-8">
+                    <input name="applyUser" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程作废实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="cancelInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程恢复实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="restoreInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/salesEstimate"
+        $("#form-salesEstimate-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-salesEstimate-add').serialize());
+            }
+        }
+
+        $("input[name='applyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/edit.html b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/edit.html
new file mode 100644
index 00000000..6fe6a673
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/edit.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改销售估价')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-salesEstimate-edit" th:object="${salesEstimate}">
+            <input name="aftersalesEstimateId" th:field="*{aftersalesEstimateId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价单号：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesEstimateCode" th:field="*{aftersalesEstimateCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户ID：</label>
+                <div class="col-sm-8">
+                    <input name="userId" th:field="*{userId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价状态：</label>
+                <div class="col-sm-8">
+                    <select name="estimateStatus" class="form-control m-b" th:with="type=${@dict.getType('estimate_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{estimateStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户代码：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" th:field="*{materialSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="quantitySum" th:field="*{quantitySum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">估价币种：</label>
+                <div class="col-sm-8">
+                    <input name="estimateCurrencies" th:field="*{estimateCurrencies}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxRmb" th:field="*{allPriceExcludingTaxRmb}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceIncludesTax" th:field="*{allPriceIncludesTax}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxDollar" th:field="*{allPriceExcludingTaxDollar}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="instanceId" th:field="*{instanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例类型：</label>
+                <div class="col-sm-8">
+                    <select name="instanceType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程提交实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="submitInstanceId" th:field="*{submitInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请标题：</label>
+                <div class="col-sm-8">
+                    <input name="applyTitle" th:field="*{applyTitle}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="applyTime" th:value="${#dates.format(salesEstimate.applyTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人：</label>
+                <div class="col-sm-8">
+                    <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程作废实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="cancelInstanceId" th:field="*{cancelInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程恢复实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="restoreInstanceId" th:field="*{restoreInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/salesEstimate";
+        $("#form-salesEstimate-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-salesEstimate-edit').serialize());
+            }
+        }
+
+        $("input[name='applyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html
new file mode 100644
index 00000000..26d5cdab
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('销售估价列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>估价单号：</label>
+                                <input type="text" name="aftersalesEstimateCode"/>
+                            </li>
+                            <li>
+                                <label>估价状态：</label>
+                                <select name="estimateStatus" th:with="type=${@dict.getType('estimate_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>客户代码：</label>
+                                <input type="text" name="enterpriseCode"/>
+                            </li>
+                            <li>
+                                <label>客户名称：</label>
+                                <input type="text" name="enterpriseName"/>
+                            </li>
+                            <li>
+                                <label>料号：</label>
+                                <input type="text" name="materialNo"/>
+                            </li>
+                            <li>
+                                <label>物料名称：</label>
+                                <input type="text" name="materialName"/>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sales:salesEstimate:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="sales:salesEstimate:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sales:salesEstimate:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="sales:salesEstimate:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('sales:salesEstimate:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('sales:salesEstimate:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('sales:salesEstimate:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('sales:salesEstimate:restore')}]];
+        var estimateStatusDatas = [[${@dict.getType('estimate_status')}]];
+        var prefix = ctx + "sales/salesEstimate";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "销售估价",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '销售估价ID',
+                    field: 'aftersalesEstimateId',
+                    visible: false
+                },
+                {
+                    title: '估价单号',
+                    field: 'aftersalesEstimateCode',
+                },
+                {
+                    title: '估价状态',
+                    field: 'estimateStatus',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(estimateStatusDatas, value);
+                    }
+                },
+                {
+                    title: '客户代码',
+                    field: 'enterpriseCode',
+                },
+                {
+                    title: '客户名称',
+                    field: 'enterpriseName',
+                },
+                {
+                    title: '料号',
+                    field: 'materialNo',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料合计',
+                    field: 'materialSum',
+                },
+                {
+                    title: '数量合计',
+                    field: 'quantitySum',
+                },
+                {
+                    title: '估价币种',
+                    field: 'estimateCurrencies',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allPriceExcludingTaxRmb',
+                },
+                {
+                    title: '含税总价',
+                    field: 'allPriceIncludesTax',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allPriceExcludingTaxDollar',
+                },
+                {
+                    title: '录入时间',
+                    field: 'createTime',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file