委外工作表、员工工资表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceWorkController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcOutsourceWork;
+import com.ruoyi.oa.service.ICmcOutsourceWorkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 委外工作Controller
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@RestController
+@RequestMapping("/oa/outsourceWork")
+public class CmcOutsourceWorkController extends BaseController
+{
+    @Autowired
+    private ICmcOutsourceWorkService cmcOutsourceWorkService;
+
+    /**
+     * 查询委外工作列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcOutsourceWork cmcOutsourceWork)
+    {
+        startPage();
+        List<CmcOutsourceWork> list = cmcOutsourceWorkService.selectCmcOutsourceWorkList(cmcOutsourceWork);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出委外工作列表
+     */
+    @Log(title = "委外工作", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcOutsourceWork cmcOutsourceWork)
+    {
+        List<CmcOutsourceWork> list = cmcOutsourceWorkService.selectCmcOutsourceWorkList(cmcOutsourceWork);
+        ExcelUtil<CmcOutsourceWork> util = new ExcelUtil<CmcOutsourceWork>(CmcOutsourceWork.class);
+        util.exportExcel(response, list, "委外工作数据");
+    }
+
+    /**
+     * 获取委外工作详细信息
+     */
+    @GetMapping(value = "/{workId}")
+    public AjaxResult getInfo(@PathVariable("workId") Integer workId)
+    {
+        return success(cmcOutsourceWorkService.selectCmcOutsourceWorkByWorkId(workId));
+    }
+
+    /**
+     * 新增委外工作
+     */
+    @Log(title = "委外工作", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcOutsourceWork cmcOutsourceWork)
+    {
+        return toAjax(cmcOutsourceWorkService.insertCmcOutsourceWork(cmcOutsourceWork));
+    }
+
+    /**
+     * 修改委外工作
+     */
+    @Log(title = "委外工作", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcOutsourceWork cmcOutsourceWork)
+    {
+        return toAjax(cmcOutsourceWorkService.updateCmcOutsourceWork(cmcOutsourceWork));
+    }
+
+    /**
+     * 删除委外工作
+     */
+    @Log(title = "委外工作", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{workIds}")
+    public AjaxResult remove(@PathVariable Integer[] workIds)
+    {
+        return toAjax(cmcOutsourceWorkService.deleteCmcOutsourceWorkByWorkIds(workIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -125,6 +125,12 @@ public class CmcProjectController extends BaseController
     public AjaxResult add(@RequestBody CmcProject cmcProject) throws IOException {
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
+        if (cmcProject.getUndertakingDept().contains(",")) {
+            cmcProject.setLeadDept(cmcProject.getUndertakingDept().substring(0,3));
+            cmcProject.setJoinDept(cmcProject.getUndertakingDept().substring(4));
+        }
+        else
+            cmcProject.setLeadDept(cmcProject.getUndertakingDept());
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcWageController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcWage;
+import com.ruoyi.oa.service.ICmcWageService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 员工工资Controller
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@RestController
+@RequestMapping("/oa/wage")
+public class CmcWageController extends BaseController
+{
+    @Autowired
+    private ICmcWageService cmcWageService;
+
+    /**
+     * 查询员工工资列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcWage cmcWage)
+    {
+        startPage();
+        List<CmcWage> list = cmcWageService.selectCmcWageList(cmcWage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出员工工资列表
+     */
+    @Log(title = "员工工资", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcWage cmcWage)
+    {
+        List<CmcWage> list = cmcWageService.selectCmcWageList(cmcWage);
+        ExcelUtil<CmcWage> util = new ExcelUtil<CmcWage>(CmcWage.class);
+        util.exportExcel(response, list, "员工工资数据");
+    }
+
+    /**
+     * 获取员工工资详细信息
+     */
+    @GetMapping(value = "/{wageId}")
+    public AjaxResult getInfo(@PathVariable("wageId") Integer wageId)
+    {
+        return success(cmcWageService.selectCmcWageByWageId(wageId));
+    }
+
+    /**
+     * 新增员工工资
+     */
+    @Log(title = "员工工资", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcWage cmcWage)
+    {
+        return toAjax(cmcWageService.insertCmcWage(cmcWage));
+    }
+
+    /**
+     * 修改员工工资
+     */
+    @Log(title = "员工工资", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcWage cmcWage)
+    {
+        return toAjax(cmcWageService.updateCmcWage(cmcWage));
+    }
+
+    /**
+     * 删除员工工资
+     */
+    @Log(title = "员工工资", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{wageIds}")
+    public AjaxResult remove(@PathVariable Integer[] wageIds)
+    {
+        return toAjax(cmcWageService.deleteCmcWageByWageIds(wageIds));
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -134,6 +134,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private ICmcTechnicalPlanService cmcTechnicalPlanService;
     @Resource
+    private ICmcProcureApprovalService cmcProcureApprovalService;
+    @Resource
+    private ICmcOutsourceService cmcOutsourceService;
+    @Resource
     private ICmcBudgetService cmcBudgetService;
     @Resource
     private FlowVarInstMapper flowVarInstMapper;
@@ -1650,5 +1654,15 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (cmcSubContract != null)
                 flowTaskDto.setTitle(cmcSubContractService.selectCmcSubContractBySubContractId(formId).getSubContractName());
         }
+        if (flowTaskDto.getProcDefName().equals("采购审批")) {
+            CmcProcureApproval cmcProcureApproval = cmcProcureApprovalService.selectCmcProcureApprovalByProcureApplyId(formId);
+            flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
+        }
+        if (flowTaskDto.getProcDefName().equals("项目委外")) {
+            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
+            projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
+            if (projectId == null)
+                flowTaskDto.setTitle(cmcOutsource.getApplyReason());
+        }
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java

@@ -49,6 +49,10 @@ public class CmcBudgetCar extends BaseEntity
     @Excel(name = "油耗")
     private BigDecimal mileage;
 
+    /** 过路费 */
+    @Excel(name = "过路费")
+    private BigDecimal toll;
+
     /** 使用成本 */
     @Excel(name = "使用成本")
     private BigDecimal expense;
@@ -143,6 +147,15 @@ public class CmcBudgetCar extends BaseEntity
     {
         return expense;
     }
+    public void setToll(BigDecimal toll)
+    {
+        this.toll = toll;
+    }
+
+    public BigDecimal getToll()
+    {
+        return toll;
+    }
 
     @Override
     public String toString() {
@@ -155,6 +168,7 @@ public class CmcBudgetCar extends BaseEntity
             .append("distance", getDistance())
             .append("mileage", getMileage())
             .append("expense", getExpense())
+            .append("toll", getToll())
             .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcOutsourceWork.java

@@ -0,0 +1,125 @@
+package com.ruoyi.oa.domain;
+
+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;
+
+/**
+ * 委外工作对象 cmc_outsource_work
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public class CmcOutsourceWork extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 委外工作id */
+    private Integer workId;
+
+    /** 项目委外id */
+    @Excel(name = "项目委外id")
+    private String outsourceId;
+
+    /** 工作内容 */
+    @Excel(name = "工作内容")
+    private String content;
+
+    /** 等级或比例尺 */
+    @Excel(name = "等级或比例尺")
+    private String scale;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 工作量 */
+    @Excel(name = "工作量")
+    private String workload;
+
+    /** 要求完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deadline;
+
+    public void setWorkId(Integer workId) 
+    {
+        this.workId = workId;
+    }
+
+    public Integer getWorkId() 
+    {
+        return workId;
+    }
+    public void setOutsourceId(String outsourceId) 
+    {
+        this.outsourceId = outsourceId;
+    }
+
+    public String getOutsourceId() 
+    {
+        return outsourceId;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setScale(String scale) 
+    {
+        this.scale = scale;
+    }
+
+    public String getScale() 
+    {
+        return scale;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setWorkload(String workload) 
+    {
+        this.workload = workload;
+    }
+
+    public String getWorkload() 
+    {
+        return workload;
+    }
+    public void setDeadline(Date deadline) 
+    {
+        this.deadline = deadline;
+    }
+
+    public Date getDeadline() 
+    {
+        return deadline;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("workId", getWorkId())
+            .append("outsourceId", getOutsourceId())
+            .append("content", getContent())
+            .append("scale", getScale())
+            .append("unit", getUnit())
+            .append("workload", getWorkload())
+            .append("deadline", getDeadline())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcWage.java

@@ -0,0 +1,350 @@
+package com.ruoyi.oa.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;
+
+/**
+ * 员工工资对象 cmc_wage
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public class CmcWage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工资id */
+    private Integer wageId;
+
+    /** 员工id */
+    @Excel(name = "员工id")
+    private Long userId;
+
+    /** 基础工资 */
+    @Excel(name = "基础工资")
+    private BigDecimal baseSalary;
+
+    /** 工龄工资 */
+    @Excel(name = "工龄工资")
+    private BigDecimal yearSalary;
+
+    /** 岗位工资 */
+    @Excel(name = "岗位工资")
+    private BigDecimal postSalary;
+
+    /** 绩效工资 */
+    @Excel(name = "绩效工资")
+    private BigDecimal performanceSalary;
+
+    /** 注册测绘师（岩土工程师）补贴 */
+    @Excel(name = "注册测绘师（岩土工程师）补贴")
+    private BigDecimal certificatesSubsidy;
+
+    /** 过节补贴 */
+    @Excel(name = "过节补贴")
+    private BigDecimal festivalSubsidy;
+
+    /** 稳岗补贴 */
+    @Excel(name = "稳岗补贴")
+    private BigDecimal postStableSubsidy;
+
+    /** 高温补贴 */
+    @Excel(name = "高温补贴")
+    private BigDecimal highTemperatureSubsidy;
+
+    /** 考勤扣款 */
+    @Excel(name = "考勤扣款")
+    private BigDecimal attendanceDeduct;
+
+    /** 应发小计 */
+    @Excel(name = "应发小计")
+    private BigDecimal payableWage;
+
+    /** 公积金 */
+    @Excel(name = "公积金")
+    private BigDecimal houseFund;
+
+    /** 养老保险 */
+    @Excel(name = "养老保险")
+    private BigDecimal endowmentInsurance;
+
+    /** 失业保险 */
+    @Excel(name = "失业保险")
+    private BigDecimal unemploymentInsurance;
+
+    /** 医疗保险 */
+    @Excel(name = "医疗保险")
+    private BigDecimal medicalInsurance;
+
+    /** 水韵物管费 */
+    @Excel(name = "水韵物管费")
+    private BigDecimal propertyFee;
+
+    /** 扣款小计 */
+    @Excel(name = "扣款小计")
+    private BigDecimal deductTotal;
+
+    /** 社保单位部分 */
+    @Excel(name = "社保单位部分")
+    private BigDecimal socialSecurityUnit;
+
+    /** 个税 */
+    @Excel(name = "个税")
+    private BigDecimal individualIncomeTax;
+
+    /** 实发工资 */
+    @Excel(name = "实发工资")
+    private BigDecimal paidWage;
+
+    /** 发放日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发放日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payDay;
+
+    /** 发放月份 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发放月份", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payMonth;
+
+    public void setWageId(Integer wageId) 
+    {
+        this.wageId = wageId;
+    }
+
+    public Integer getWageId() 
+    {
+        return wageId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setBaseSalary(BigDecimal baseSalary) 
+    {
+        this.baseSalary = baseSalary;
+    }
+
+    public BigDecimal getBaseSalary() 
+    {
+        return baseSalary;
+    }
+    public void setYearSalary(BigDecimal yearSalary) 
+    {
+        this.yearSalary = yearSalary;
+    }
+
+    public BigDecimal getYearSalary() 
+    {
+        return yearSalary;
+    }
+    public void setPostSalary(BigDecimal postSalary) 
+    {
+        this.postSalary = postSalary;
+    }
+
+    public BigDecimal getPostSalary() 
+    {
+        return postSalary;
+    }
+    public void setPerformanceSalary(BigDecimal performanceSalary) 
+    {
+        this.performanceSalary = performanceSalary;
+    }
+
+    public BigDecimal getPerformanceSalary() 
+    {
+        return performanceSalary;
+    }
+    public void setCertificatesSubsidy(BigDecimal certificatesSubsidy) 
+    {
+        this.certificatesSubsidy = certificatesSubsidy;
+    }
+
+    public BigDecimal getCertificatesSubsidy() 
+    {
+        return certificatesSubsidy;
+    }
+    public void setFestivalSubsidy(BigDecimal festivalSubsidy) 
+    {
+        this.festivalSubsidy = festivalSubsidy;
+    }
+
+    public BigDecimal getFestivalSubsidy() 
+    {
+        return festivalSubsidy;
+    }
+    public void setPostStableSubsidy(BigDecimal postStableSubsidy) 
+    {
+        this.postStableSubsidy = postStableSubsidy;
+    }
+
+    public BigDecimal getPostStableSubsidy() 
+    {
+        return postStableSubsidy;
+    }
+    public void setHighTemperatureSubsidy(BigDecimal highTemperatureSubsidy) 
+    {
+        this.highTemperatureSubsidy = highTemperatureSubsidy;
+    }
+
+    public BigDecimal getHighTemperatureSubsidy() 
+    {
+        return highTemperatureSubsidy;
+    }
+    public void setAttendanceDeduct(BigDecimal attendanceDeduct) 
+    {
+        this.attendanceDeduct = attendanceDeduct;
+    }
+
+    public BigDecimal getAttendanceDeduct() 
+    {
+        return attendanceDeduct;
+    }
+    public void setPayableWage(BigDecimal payableWage) 
+    {
+        this.payableWage = payableWage;
+    }
+
+    public BigDecimal getPayableWage() 
+    {
+        return payableWage;
+    }
+    public void setHouseFund(BigDecimal houseFund) 
+    {
+        this.houseFund = houseFund;
+    }
+
+    public BigDecimal getHouseFund() 
+    {
+        return houseFund;
+    }
+    public void setEndowmentInsurance(BigDecimal endowmentInsurance) 
+    {
+        this.endowmentInsurance = endowmentInsurance;
+    }
+
+    public BigDecimal getEndowmentInsurance() 
+    {
+        return endowmentInsurance;
+    }
+    public void setUnemploymentInsurance(BigDecimal unemploymentInsurance) 
+    {
+        this.unemploymentInsurance = unemploymentInsurance;
+    }
+
+    public BigDecimal getUnemploymentInsurance() 
+    {
+        return unemploymentInsurance;
+    }
+    public void setMedicalInsurance(BigDecimal medicalInsurance) 
+    {
+        this.medicalInsurance = medicalInsurance;
+    }
+
+    public BigDecimal getMedicalInsurance() 
+    {
+        return medicalInsurance;
+    }
+    public void setPropertyFee(BigDecimal propertyFee) 
+    {
+        this.propertyFee = propertyFee;
+    }
+
+    public BigDecimal getPropertyFee() 
+    {
+        return propertyFee;
+    }
+    public void setDeductTotal(BigDecimal deductTotal) 
+    {
+        this.deductTotal = deductTotal;
+    }
+
+    public BigDecimal getDeductTotal() 
+    {
+        return deductTotal;
+    }
+    public void setSocialSecurityUnit(BigDecimal socialSecurityUnit) 
+    {
+        this.socialSecurityUnit = socialSecurityUnit;
+    }
+
+    public BigDecimal getSocialSecurityUnit() 
+    {
+        return socialSecurityUnit;
+    }
+    public void setIndividualIncomeTax(BigDecimal individualIncomeTax) 
+    {
+        this.individualIncomeTax = individualIncomeTax;
+    }
+
+    public BigDecimal getIndividualIncomeTax() 
+    {
+        return individualIncomeTax;
+    }
+    public void setPaidWage(BigDecimal paidWage) 
+    {
+        this.paidWage = paidWage;
+    }
+
+    public BigDecimal getPaidWage() 
+    {
+        return paidWage;
+    }
+    public void setPayDay(Date payDay) 
+    {
+        this.payDay = payDay;
+    }
+
+    public Date getPayDay() 
+    {
+        return payDay;
+    }
+    public void setPayMonth(Date payMonth) 
+    {
+        this.payMonth = payMonth;
+    }
+
+    public Date getPayMonth() 
+    {
+        return payMonth;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("wageId", getWageId())
+            .append("userId", getUserId())
+            .append("baseSalary", getBaseSalary())
+            .append("yearSalary", getYearSalary())
+            .append("postSalary", getPostSalary())
+            .append("performanceSalary", getPerformanceSalary())
+            .append("certificatesSubsidy", getCertificatesSubsidy())
+            .append("festivalSubsidy", getFestivalSubsidy())
+            .append("postStableSubsidy", getPostStableSubsidy())
+            .append("highTemperatureSubsidy", getHighTemperatureSubsidy())
+            .append("attendanceDeduct", getAttendanceDeduct())
+            .append("payableWage", getPayableWage())
+            .append("houseFund", getHouseFund())
+            .append("endowmentInsurance", getEndowmentInsurance())
+            .append("unemploymentInsurance", getUnemploymentInsurance())
+            .append("medicalInsurance", getMedicalInsurance())
+            .append("propertyFee", getPropertyFee())
+            .append("deductTotal", getDeductTotal())
+            .append("socialSecurityUnit", getSocialSecurityUnit())
+            .append("individualIncomeTax", getIndividualIncomeTax())
+            .append("paidWage", getPaidWage())
+            .append("payDay", getPayDay())
+            .append("payMonth", getPayMonth())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcOutsourceWorkMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcOutsourceWork;
+
+/**
+ * 委外工作Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface CmcOutsourceWorkMapper 
+{
+    /**
+     * 查询委外工作
+     * 
+     * @param workId 委外工作主键
+     * @return 委外工作
+     */
+    public CmcOutsourceWork selectCmcOutsourceWorkByWorkId(Integer workId);
+
+    /**
+     * 查询委外工作列表
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 委外工作集合
+     */
+    public List<CmcOutsourceWork> selectCmcOutsourceWorkList(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 新增委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    public int insertCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 修改委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    public int updateCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 删除委外工作
+     * 
+     * @param workId 委外工作主键
+     * @return 结果
+     */
+    public int deleteCmcOutsourceWorkByWorkId(Integer workId);
+
+    /**
+     * 批量删除委外工作
+     * 
+     * @param workIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcOutsourceWorkByWorkIds(Integer[] workIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcWageMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcWage;
+
+/**
+ * 员工工资Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface CmcWageMapper 
+{
+    /**
+     * 查询员工工资
+     * 
+     * @param wageId 员工工资主键
+     * @return 员工工资
+     */
+    public CmcWage selectCmcWageByWageId(Integer wageId);
+
+    /**
+     * 查询员工工资列表
+     * 
+     * @param cmcWage 员工工资
+     * @return 员工工资集合
+     */
+    public List<CmcWage> selectCmcWageList(CmcWage cmcWage);
+
+    /**
+     * 新增员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    public int insertCmcWage(CmcWage cmcWage);
+
+    /**
+     * 修改员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    public int updateCmcWage(CmcWage cmcWage);
+
+    /**
+     * 删除员工工资
+     * 
+     * @param wageId 员工工资主键
+     * @return 结果
+     */
+    public int deleteCmcWageByWageId(Integer wageId);
+
+    /**
+     * 批量删除员工工资
+     * 
+     * @param wageIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcWageByWageIds(Integer[] wageIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcOutsourceWorkService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcOutsourceWork;
+
+/**
+ * 委外工作Service接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface ICmcOutsourceWorkService 
+{
+    /**
+     * 查询委外工作
+     * 
+     * @param workId 委外工作主键
+     * @return 委外工作
+     */
+    public CmcOutsourceWork selectCmcOutsourceWorkByWorkId(Integer workId);
+
+    /**
+     * 查询委外工作列表
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 委外工作集合
+     */
+    public List<CmcOutsourceWork> selectCmcOutsourceWorkList(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 新增委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    public int insertCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 修改委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    public int updateCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork);
+
+    /**
+     * 批量删除委外工作
+     * 
+     * @param workIds 需要删除的委外工作主键集合
+     * @return 结果
+     */
+    public int deleteCmcOutsourceWorkByWorkIds(Integer[] workIds);
+
+    /**
+     * 删除委外工作信息
+     * 
+     * @param workId 委外工作主键
+     * @return 结果
+     */
+    public int deleteCmcOutsourceWorkByWorkId(Integer workId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcWageService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcWage;
+
+/**
+ * 员工工资Service接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface ICmcWageService 
+{
+    /**
+     * 查询员工工资
+     * 
+     * @param wageId 员工工资主键
+     * @return 员工工资
+     */
+    public CmcWage selectCmcWageByWageId(Integer wageId);
+
+    /**
+     * 查询员工工资列表
+     * 
+     * @param cmcWage 员工工资
+     * @return 员工工资集合
+     */
+    public List<CmcWage> selectCmcWageList(CmcWage cmcWage);
+
+    /**
+     * 新增员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    public int insertCmcWage(CmcWage cmcWage);
+
+    /**
+     * 修改员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    public int updateCmcWage(CmcWage cmcWage);
+
+    /**
+     * 批量删除员工工资
+     * 
+     * @param wageIds 需要删除的员工工资主键集合
+     * @return 结果
+     */
+    public int deleteCmcWageByWageIds(Integer[] wageIds);
+
+    /**
+     * 删除员工工资信息
+     * 
+     * @param wageId 员工工资主键
+     * @return 结果
+     */
+    public int deleteCmcWageByWageId(Integer wageId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcOutsourceWorkServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcOutsourceWorkMapper;
+import com.ruoyi.oa.domain.CmcOutsourceWork;
+import com.ruoyi.oa.service.ICmcOutsourceWorkService;
+
+/**
+ * 委外工作Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@Service
+public class CmcOutsourceWorkServiceImpl implements ICmcOutsourceWorkService 
+{
+    @Autowired
+    private CmcOutsourceWorkMapper cmcOutsourceWorkMapper;
+
+    /**
+     * 查询委外工作
+     * 
+     * @param workId 委外工作主键
+     * @return 委外工作
+     */
+    @Override
+    public CmcOutsourceWork selectCmcOutsourceWorkByWorkId(Integer workId)
+    {
+        return cmcOutsourceWorkMapper.selectCmcOutsourceWorkByWorkId(workId);
+    }
+
+    /**
+     * 查询委外工作列表
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 委外工作
+     */
+    @Override
+    public List<CmcOutsourceWork> selectCmcOutsourceWorkList(CmcOutsourceWork cmcOutsourceWork)
+    {
+        return cmcOutsourceWorkMapper.selectCmcOutsourceWorkList(cmcOutsourceWork);
+    }
+
+    /**
+     * 新增委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    @Override
+    public int insertCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork)
+    {
+        return cmcOutsourceWorkMapper.insertCmcOutsourceWork(cmcOutsourceWork);
+    }
+
+    /**
+     * 修改委外工作
+     * 
+     * @param cmcOutsourceWork 委外工作
+     * @return 结果
+     */
+    @Override
+    public int updateCmcOutsourceWork(CmcOutsourceWork cmcOutsourceWork)
+    {
+        return cmcOutsourceWorkMapper.updateCmcOutsourceWork(cmcOutsourceWork);
+    }
+
+    /**
+     * 批量删除委外工作
+     * 
+     * @param workIds 需要删除的委外工作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcOutsourceWorkByWorkIds(Integer[] workIds)
+    {
+        return cmcOutsourceWorkMapper.deleteCmcOutsourceWorkByWorkIds(workIds);
+    }
+
+    /**
+     * 删除委外工作信息
+     * 
+     * @param workId 委外工作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcOutsourceWorkByWorkId(Integer workId)
+    {
+        return cmcOutsourceWorkMapper.deleteCmcOutsourceWorkByWorkId(workId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcWageServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcWageMapper;
+import com.ruoyi.oa.domain.CmcWage;
+import com.ruoyi.oa.service.ICmcWageService;
+
+/**
+ * 员工工资Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@Service
+public class CmcWageServiceImpl implements ICmcWageService 
+{
+    @Autowired
+    private CmcWageMapper cmcWageMapper;
+
+    /**
+     * 查询员工工资
+     * 
+     * @param wageId 员工工资主键
+     * @return 员工工资
+     */
+    @Override
+    public CmcWage selectCmcWageByWageId(Integer wageId)
+    {
+        return cmcWageMapper.selectCmcWageByWageId(wageId);
+    }
+
+    /**
+     * 查询员工工资列表
+     * 
+     * @param cmcWage 员工工资
+     * @return 员工工资
+     */
+    @Override
+    public List<CmcWage> selectCmcWageList(CmcWage cmcWage)
+    {
+        return cmcWageMapper.selectCmcWageList(cmcWage);
+    }
+
+    /**
+     * 新增员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    @Override
+    public int insertCmcWage(CmcWage cmcWage)
+    {
+        return cmcWageMapper.insertCmcWage(cmcWage);
+    }
+
+    /**
+     * 修改员工工资
+     * 
+     * @param cmcWage 员工工资
+     * @return 结果
+     */
+    @Override
+    public int updateCmcWage(CmcWage cmcWage)
+    {
+        return cmcWageMapper.updateCmcWage(cmcWage);
+    }
+
+    /**
+     * 批量删除员工工资
+     * 
+     * @param wageIds 需要删除的员工工资主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcWageByWageIds(Integer[] wageIds)
+    {
+        return cmcWageMapper.deleteCmcWageByWageIds(wageIds);
+    }
+
+    /**
+     * 删除员工工资信息
+     * 
+     * @param wageId 员工工资主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcWageByWageId(Integer wageId)
+    {
+        return cmcWageMapper.deleteCmcWageByWageId(wageId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetCarMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distance"    column="distance"    />
         <result property="mileage"    column="mileage"    />
         <result property="expense"    column="expense"    />
+        <result property="toll"    column="toll"    />
         <result property="remark"    column="remark"    />
         <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
         <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll,, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
         left join sys_user as u on c.driver = u.user_id
     </sql>
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="depreciation != null "> and bc.depreciation = #{depreciation}</if>
             <if test="distance != null "> and bc.distance = #{distance}</if>
             <if test="mileage != null "> and bc.mileage = #{mileage}</if>
+            <if test="toll != null "> and bc.toll = #{toll}</if>
             <if test="expense != null "> and bc.expense = #{expense}</if>
         </where>
     </select>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="distance != null">distance,</if>
             <if test="mileage != null">mileage,</if>
             <if test="expense != null">expense,</if>
+            <if test="toll != null">toll,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="distance != null">#{distance},</if>
             <if test="mileage != null">#{mileage},</if>
             <if test="expense != null">#{expense},</if>
+            <if test="toll != null">#{toll},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -90,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="depreciation != null">depreciation = #{depreciation},</if>
             <if test="distance != null">distance = #{distance},</if>
             <if test="mileage != null">mileage = #{mileage},</if>
+            <if test="toll != null">toll = #{toll},</if>
             <if test="expense != null">expense = #{expense},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcOutsourceWorkMapper.xml

@@ -0,0 +1,87 @@
+<?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.oa.mapper.CmcOutsourceWorkMapper">
+    
+    <resultMap type="CmcOutsourceWork" id="CmcOutsourceWorkResult">
+        <result property="workId"    column="work_id"    />
+        <result property="outsourceId"    column="outsource_id"    />
+        <result property="content"    column="content"    />
+        <result property="scale"    column="scale"    />
+        <result property="unit"    column="unit"    />
+        <result property="workload"    column="workload"    />
+        <result property="deadline"    column="deadline"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcOutsourceWorkVo">
+        select work_id, outsource_id, content, scale, unit, workload, deadline, remark from cmc_outsource_work
+    </sql>
+
+    <select id="selectCmcOutsourceWorkList" parameterType="CmcOutsourceWork" resultMap="CmcOutsourceWorkResult">
+        <include refid="selectCmcOutsourceWorkVo"/>
+        <where>  
+            <if test="outsourceId != null  and outsourceId != ''"> and outsource_id = #{outsourceId}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="scale != null  and scale != ''"> and scale = #{scale}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
+            <if test="deadline != null "> and deadline = #{deadline}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcOutsourceWorkByWorkId" parameterType="Integer" resultMap="CmcOutsourceWorkResult">
+        <include refid="selectCmcOutsourceWorkVo"/>
+        where work_id = #{workId}
+    </select>
+        
+    <insert id="insertCmcOutsourceWork" parameterType="CmcOutsourceWork">
+        insert into cmc_outsource_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
+            <if test="outsourceId != null">outsource_id,</if>
+            <if test="content != null">content,</if>
+            <if test="scale != null">scale,</if>
+            <if test="unit != null">unit,</if>
+            <if test="workload != null">workload,</if>
+            <if test="deadline != null">deadline,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
+            <if test="outsourceId != null">#{outsourceId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="scale != null">#{scale},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="deadline != null">#{deadline},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcOutsourceWork" parameterType="CmcOutsourceWork">
+        update cmc_outsource_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outsourceId != null">outsource_id = #{outsourceId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="scale != null">scale = #{scale},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="deadline != null">deadline = #{deadline},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where work_id = #{workId}
+    </update>
+
+    <delete id="deleteCmcOutsourceWorkByWorkId" parameterType="Integer">
+        delete from cmc_outsource_work where work_id = #{workId}
+    </delete>
+
+    <delete id="deleteCmcOutsourceWorkByWorkIds" parameterType="String">
+        delete from cmc_outsource_work where work_id in 
+        <foreach item="workId" collection="array" open="(" separator="," close=")">
+            #{workId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcWageMapper.xml

@@ -0,0 +1,163 @@
+<?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.oa.mapper.CmcWageMapper">
+    
+    <resultMap type="CmcWage" id="CmcWageResult">
+        <result property="wageId"    column="wage_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="baseSalary"    column="base_salary"    />
+        <result property="yearSalary"    column="year_salary"    />
+        <result property="postSalary"    column="post_salary"    />
+        <result property="performanceSalary"    column="performance_salary"    />
+        <result property="certificatesSubsidy"    column="certificates_subsidy"    />
+        <result property="festivalSubsidy"    column="festival_subsidy"    />
+        <result property="postStableSubsidy"    column="post_stable_subsidy"    />
+        <result property="highTemperatureSubsidy"    column="high_temperature_subsidy"    />
+        <result property="attendanceDeduct"    column="attendance_deduct"    />
+        <result property="payableWage"    column="payable_wage"    />
+        <result property="houseFund"    column="house_fund"    />
+        <result property="endowmentInsurance"    column="endowment_insurance"    />
+        <result property="unemploymentInsurance"    column="unemployment_insurance"    />
+        <result property="medicalInsurance"    column="medical_insurance"    />
+        <result property="propertyFee"    column="property_fee"    />
+        <result property="deductTotal"    column="deduct_total"    />
+        <result property="socialSecurityUnit"    column="social_security_unit"    />
+        <result property="individualIncomeTax"    column="individual_income_tax"    />
+        <result property="paidWage"    column="paid_wage"    />
+        <result property="payDay"    column="pay_day"    />
+        <result property="payMonth"    column="pay_month"    />
+    </resultMap>
+
+    <sql id="selectCmcWageVo">
+        select wage_id, user_id, base_salary, year_salary, post_salary, performance_salary, certificates_subsidy, festival_subsidy, post_stable_subsidy, high_temperature_subsidy, attendance_deduct, payable_wage, house_fund, endowment_insurance, unemployment_insurance, medical_insurance, property_fee, deduct_total, social_security_unit, individual_income_tax, paid_wage, pay_day, pay_month from cmc_wage
+    </sql>
+
+    <select id="selectCmcWageList" parameterType="CmcWage" resultMap="CmcWageResult">
+        <include refid="selectCmcWageVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="baseSalary != null "> and base_salary = #{baseSalary}</if>
+            <if test="yearSalary != null "> and year_salary = #{yearSalary}</if>
+            <if test="postSalary != null "> and post_salary = #{postSalary}</if>
+            <if test="performanceSalary != null "> and performance_salary = #{performanceSalary}</if>
+            <if test="certificatesSubsidy != null "> and certificates_subsidy = #{certificatesSubsidy}</if>
+            <if test="festivalSubsidy != null "> and festival_subsidy = #{festivalSubsidy}</if>
+            <if test="postStableSubsidy != null "> and post_stable_subsidy = #{postStableSubsidy}</if>
+            <if test="highTemperatureSubsidy != null "> and high_temperature_subsidy = #{highTemperatureSubsidy}</if>
+            <if test="attendanceDeduct != null "> and attendance_deduct = #{attendanceDeduct}</if>
+            <if test="payableWage != null "> and payable_wage = #{payableWage}</if>
+            <if test="houseFund != null "> and house_fund = #{houseFund}</if>
+            <if test="endowmentInsurance != null "> and endowment_insurance = #{endowmentInsurance}</if>
+            <if test="unemploymentInsurance != null "> and unemployment_insurance = #{unemploymentInsurance}</if>
+            <if test="medicalInsurance != null "> and medical_insurance = #{medicalInsurance}</if>
+            <if test="propertyFee != null "> and property_fee = #{propertyFee}</if>
+            <if test="deductTotal != null "> and deduct_total = #{deductTotal}</if>
+            <if test="socialSecurityUnit != null "> and social_security_unit = #{socialSecurityUnit}</if>
+            <if test="individualIncomeTax != null "> and individual_income_tax = #{individualIncomeTax}</if>
+            <if test="paidWage != null "> and paid_wage = #{paidWage}</if>
+            <if test="payDay != null "> and pay_day = #{payDay}</if>
+            <if test="payMonth != null "> and pay_month = #{payMonth}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcWageByWageId" parameterType="Integer" resultMap="CmcWageResult">
+        <include refid="selectCmcWageVo"/>
+        where wage_id = #{wageId}
+    </select>
+        
+    <insert id="insertCmcWage" parameterType="CmcWage">
+        insert into cmc_wage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="wageId != null">wage_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="baseSalary != null">base_salary,</if>
+            <if test="yearSalary != null">year_salary,</if>
+            <if test="postSalary != null">post_salary,</if>
+            <if test="performanceSalary != null">performance_salary,</if>
+            <if test="certificatesSubsidy != null">certificates_subsidy,</if>
+            <if test="festivalSubsidy != null">festival_subsidy,</if>
+            <if test="postStableSubsidy != null">post_stable_subsidy,</if>
+            <if test="highTemperatureSubsidy != null">high_temperature_subsidy,</if>
+            <if test="attendanceDeduct != null">attendance_deduct,</if>
+            <if test="payableWage != null">payable_wage,</if>
+            <if test="houseFund != null">house_fund,</if>
+            <if test="endowmentInsurance != null">endowment_insurance,</if>
+            <if test="unemploymentInsurance != null">unemployment_insurance,</if>
+            <if test="medicalInsurance != null">medical_insurance,</if>
+            <if test="propertyFee != null">property_fee,</if>
+            <if test="deductTotal != null">deduct_total,</if>
+            <if test="socialSecurityUnit != null">social_security_unit,</if>
+            <if test="individualIncomeTax != null">individual_income_tax,</if>
+            <if test="paidWage != null">paid_wage,</if>
+            <if test="payDay != null">pay_day,</if>
+            <if test="payMonth != null">pay_month,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="wageId != null">#{wageId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="baseSalary != null">#{baseSalary},</if>
+            <if test="yearSalary != null">#{yearSalary},</if>
+            <if test="postSalary != null">#{postSalary},</if>
+            <if test="performanceSalary != null">#{performanceSalary},</if>
+            <if test="certificatesSubsidy != null">#{certificatesSubsidy},</if>
+            <if test="festivalSubsidy != null">#{festivalSubsidy},</if>
+            <if test="postStableSubsidy != null">#{postStableSubsidy},</if>
+            <if test="highTemperatureSubsidy != null">#{highTemperatureSubsidy},</if>
+            <if test="attendanceDeduct != null">#{attendanceDeduct},</if>
+            <if test="payableWage != null">#{payableWage},</if>
+            <if test="houseFund != null">#{houseFund},</if>
+            <if test="endowmentInsurance != null">#{endowmentInsurance},</if>
+            <if test="unemploymentInsurance != null">#{unemploymentInsurance},</if>
+            <if test="medicalInsurance != null">#{medicalInsurance},</if>
+            <if test="propertyFee != null">#{propertyFee},</if>
+            <if test="deductTotal != null">#{deductTotal},</if>
+            <if test="socialSecurityUnit != null">#{socialSecurityUnit},</if>
+            <if test="individualIncomeTax != null">#{individualIncomeTax},</if>
+            <if test="paidWage != null">#{paidWage},</if>
+            <if test="payDay != null">#{payDay},</if>
+            <if test="payMonth != null">#{payMonth},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcWage" parameterType="CmcWage">
+        update cmc_wage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="baseSalary != null">base_salary = #{baseSalary},</if>
+            <if test="yearSalary != null">year_salary = #{yearSalary},</if>
+            <if test="postSalary != null">post_salary = #{postSalary},</if>
+            <if test="performanceSalary != null">performance_salary = #{performanceSalary},</if>
+            <if test="certificatesSubsidy != null">certificates_subsidy = #{certificatesSubsidy},</if>
+            <if test="festivalSubsidy != null">festival_subsidy = #{festivalSubsidy},</if>
+            <if test="postStableSubsidy != null">post_stable_subsidy = #{postStableSubsidy},</if>
+            <if test="highTemperatureSubsidy != null">high_temperature_subsidy = #{highTemperatureSubsidy},</if>
+            <if test="attendanceDeduct != null">attendance_deduct = #{attendanceDeduct},</if>
+            <if test="payableWage != null">payable_wage = #{payableWage},</if>
+            <if test="houseFund != null">house_fund = #{houseFund},</if>
+            <if test="endowmentInsurance != null">endowment_insurance = #{endowmentInsurance},</if>
+            <if test="unemploymentInsurance != null">unemployment_insurance = #{unemploymentInsurance},</if>
+            <if test="medicalInsurance != null">medical_insurance = #{medicalInsurance},</if>
+            <if test="propertyFee != null">property_fee = #{propertyFee},</if>
+            <if test="deductTotal != null">deduct_total = #{deductTotal},</if>
+            <if test="socialSecurityUnit != null">social_security_unit = #{socialSecurityUnit},</if>
+            <if test="individualIncomeTax != null">individual_income_tax = #{individualIncomeTax},</if>
+            <if test="paidWage != null">paid_wage = #{paidWage},</if>
+            <if test="payDay != null">pay_day = #{payDay},</if>
+            <if test="payMonth != null">pay_month = #{payMonth},</if>
+        </trim>
+        where wage_id = #{wageId}
+    </update>
+
+    <delete id="deleteCmcWageByWageId" parameterType="Integer">
+        delete from cmc_wage where wage_id = #{wageId}
+    </delete>
+
+    <delete id="deleteCmcWageByWageIds" parameterType="String">
+        delete from cmc_wage where wage_id in 
+        <foreach item="wageId" collection="array" open="(" separator="," close=")">
+            #{wageId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui/src/api/oa/outsource/outsourceWork.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询委外工作列表
+export function listOutsourceWork(query) {
+  return request({
+    url: '/oa/outsourceWork/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询委外工作详细
+export function getOutsourceWork(workId) {
+  return request({
+    url: '/oa/outsourceWork/' + workId,
+    method: 'get'
+  })
+}
+
+// 新增委外工作
+export function addOutsourceWork(data) {
+  return request({
+    url: '/oa/outsourceWork',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改委外工作
+export function updateOutsourceWork(data) {
+  return request({
+    url: '/oa/outsourceWork',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除委外工作
+export function delOutsourceWork(workId) {
+  return request({
+    url: '/oa/outsourceWork/' + workId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/wage/wage.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询员工工资列表
+export function listWage(query) {
+  return request({
+    url: '/oa/wage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工工资详细
+export function getWage(wageId) {
+  return request({
+    url: '/oa/wage/' + wageId,
+    method: 'get'
+  })
+}
+
+// 新增员工工资
+export function addWage(data) {
+  return request({
+    url: '/oa/wage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工工资
+export function updateWage(data) {
+  return request({
+    url: '/oa/wage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工工资
+export function delWage(wageId) {
+  return request({
+    url: '/oa/wage/' + wageId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/wage/index.vue

@@ -0,0 +1,557 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="员工id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入员工id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="基础工资" prop="baseSalary">
+        <el-input
+          v-model="queryParams.baseSalary"
+          placeholder="请输入基础工资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工龄工资" prop="yearSalary">
+        <el-input
+          v-model="queryParams.yearSalary"
+          placeholder="请输入工龄工资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="岗位工资" prop="postSalary">
+        <el-input
+          v-model="queryParams.postSalary"
+          placeholder="请输入岗位工资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="绩效工资" prop="performanceSalary">
+        <el-input
+          v-model="queryParams.performanceSalary"
+          placeholder="请输入绩效工资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="注册测绘师" prop="certificatesSubsidy">
+        <el-input
+          v-model="queryParams.certificatesSubsidy"
+          placeholder="请输入注册测绘师"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="过节补贴" prop="festivalSubsidy">
+        <el-input
+          v-model="queryParams.festivalSubsidy"
+          placeholder="请输入过节补贴"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="稳岗补贴" prop="postStableSubsidy">
+        <el-input
+          v-model="queryParams.postStableSubsidy"
+          placeholder="请输入稳岗补贴"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="高温补贴" prop="highTemperatureSubsidy">
+        <el-input
+          v-model="queryParams.highTemperatureSubsidy"
+          placeholder="请输入高温补贴"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="考勤扣款" prop="attendanceDeduct">
+        <el-input
+          v-model="queryParams.attendanceDeduct"
+          placeholder="请输入考勤扣款"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应发小计" prop="payableWage">
+        <el-input
+          v-model="queryParams.payableWage"
+          placeholder="请输入应发小计"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公积金" prop="houseFund">
+        <el-input
+          v-model="queryParams.houseFund"
+          placeholder="请输入公积金"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="养老保险" prop="endowmentInsurance">
+        <el-input
+          v-model="queryParams.endowmentInsurance"
+          placeholder="请输入养老保险"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="失业保险" prop="unemploymentInsurance">
+        <el-input
+          v-model="queryParams.unemploymentInsurance"
+          placeholder="请输入失业保险"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="医疗保险" prop="medicalInsurance">
+        <el-input
+          v-model="queryParams.medicalInsurance"
+          placeholder="请输入医疗保险"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="水韵物管费" prop="propertyFee">
+        <el-input
+          v-model="queryParams.propertyFee"
+          placeholder="请输入水韵物管费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="扣款小计" prop="deductTotal">
+        <el-input
+          v-model="queryParams.deductTotal"
+          placeholder="请输入扣款小计"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="社保单位部分" prop="socialSecurityUnit">
+        <el-input
+          v-model="queryParams.socialSecurityUnit"
+          placeholder="请输入社保单位部分"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="个税" prop="individualIncomeTax">
+        <el-input
+          v-model="queryParams.individualIncomeTax"
+          placeholder="请输入个税"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实发工资" prop="paidWage">
+        <el-input
+          v-model="queryParams.paidWage"
+          placeholder="请输入实发工资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发放日期" prop="payDay">
+        <el-date-picker clearable
+          v-model="queryParams.payDay"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发放日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="发放月份" prop="payMonth">
+        <el-date-picker clearable
+          v-model="queryParams.payMonth"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发放月份">
+        </el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:wage:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:wage:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:wage:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:wage:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="wageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工资id" align="center" prop="wageId" />
+      <el-table-column label="员工id" align="center" prop="userId" />
+      <el-table-column label="基础工资" align="center" prop="baseSalary" />
+      <el-table-column label="工龄工资" align="center" prop="yearSalary" />
+      <el-table-column label="岗位工资" align="center" prop="postSalary" />
+      <el-table-column label="绩效工资" align="center" prop="performanceSalary" />
+      <el-table-column label="注册测绘师" align="center" prop="certificatesSubsidy" />
+      <el-table-column label="过节补贴" align="center" prop="festivalSubsidy" />
+      <el-table-column label="稳岗补贴" align="center" prop="postStableSubsidy" />
+      <el-table-column label="高温补贴" align="center" prop="highTemperatureSubsidy" />
+      <el-table-column label="考勤扣款" align="center" prop="attendanceDeduct" />
+      <el-table-column label="应发小计" align="center" prop="payableWage" />
+      <el-table-column label="公积金" align="center" prop="houseFund" />
+      <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
+      <el-table-column label="失业保险" align="center" prop="unemploymentInsurance" />
+      <el-table-column label="医疗保险" align="center" prop="medicalInsurance" />
+      <el-table-column label="水韵物管费" align="center" prop="propertyFee" />
+      <el-table-column label="扣款小计" align="center" prop="deductTotal" />
+      <el-table-column label="社保单位部分" align="center" prop="socialSecurityUnit" />
+      <el-table-column label="个税" align="center" prop="individualIncomeTax" />
+      <el-table-column label="实发工资" align="center" prop="paidWage" />
+      <el-table-column label="发放日期" align="center" prop="payDay" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.payDay, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发放月份" align="center" prop="payMonth" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.payMonth, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:wage:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:wage:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改员工工资对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="员工id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入员工id" />
+        </el-form-item>
+        <el-form-item label="基础工资" prop="baseSalary">
+          <el-input v-model="form.baseSalary" placeholder="请输入基础工资" />
+        </el-form-item>
+        <el-form-item label="工龄工资" prop="yearSalary">
+          <el-input v-model="form.yearSalary" placeholder="请输入工龄工资" />
+        </el-form-item>
+        <el-form-item label="岗位工资" prop="postSalary">
+          <el-input v-model="form.postSalary" placeholder="请输入岗位工资" />
+        </el-form-item>
+        <el-form-item label="绩效工资" prop="performanceSalary">
+          <el-input v-model="form.performanceSalary" placeholder="请输入绩效工资" />
+        </el-form-item>
+        <el-form-item label="注册测绘师" prop="certificatesSubsidy">
+          <el-input v-model="form.certificatesSubsidy" placeholder="请输入注册测绘师" />
+        </el-form-item>
+        <el-form-item label="过节补贴" prop="festivalSubsidy">
+          <el-input v-model="form.festivalSubsidy" placeholder="请输入过节补贴" />
+        </el-form-item>
+        <el-form-item label="稳岗补贴" prop="postStableSubsidy">
+          <el-input v-model="form.postStableSubsidy" placeholder="请输入稳岗补贴" />
+        </el-form-item>
+        <el-form-item label="高温补贴" prop="highTemperatureSubsidy">
+          <el-input v-model="form.highTemperatureSubsidy" placeholder="请输入高温补贴" />
+        </el-form-item>
+        <el-form-item label="考勤扣款" prop="attendanceDeduct">
+          <el-input v-model="form.attendanceDeduct" placeholder="请输入考勤扣款" />
+        </el-form-item>
+        <el-form-item label="应发小计" prop="payableWage">
+          <el-input v-model="form.payableWage" placeholder="请输入应发小计" />
+        </el-form-item>
+        <el-form-item label="公积金" prop="houseFund">
+          <el-input v-model="form.houseFund" placeholder="请输入公积金" />
+        </el-form-item>
+        <el-form-item label="养老保险" prop="endowmentInsurance">
+          <el-input v-model="form.endowmentInsurance" placeholder="请输入养老保险" />
+        </el-form-item>
+        <el-form-item label="失业保险" prop="unemploymentInsurance">
+          <el-input v-model="form.unemploymentInsurance" placeholder="请输入失业保险" />
+        </el-form-item>
+        <el-form-item label="医疗保险" prop="medicalInsurance">
+          <el-input v-model="form.medicalInsurance" placeholder="请输入医疗保险" />
+        </el-form-item>
+        <el-form-item label="水韵物管费" prop="propertyFee">
+          <el-input v-model="form.propertyFee" placeholder="请输入水韵物管费" />
+        </el-form-item>
+        <el-form-item label="扣款小计" prop="deductTotal">
+          <el-input v-model="form.deductTotal" placeholder="请输入扣款小计" />
+        </el-form-item>
+        <el-form-item label="社保单位部分" prop="socialSecurityUnit">
+          <el-input v-model="form.socialSecurityUnit" placeholder="请输入社保单位部分" />
+        </el-form-item>
+        <el-form-item label="个税" prop="individualIncomeTax">
+          <el-input v-model="form.individualIncomeTax" placeholder="请输入个税" />
+        </el-form-item>
+        <el-form-item label="实发工资" prop="paidWage">
+          <el-input v-model="form.paidWage" placeholder="请输入实发工资" />
+        </el-form-item>
+        <el-form-item label="发放日期" prop="payDay">
+          <el-date-picker clearable
+            v-model="form.payDay"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择发放日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="发放月份" prop="payMonth">
+          <el-date-picker clearable
+            v-model="form.payMonth"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择发放月份">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWage, getWage, delWage, addWage, updateWage } from "@/api/oa/wage/wage";
+
+export default {
+  name: "Wage",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工工资表格数据
+      wageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        baseSalary: null,
+        yearSalary: null,
+        postSalary: null,
+        performanceSalary: null,
+        certificatesSubsidy: null,
+        festivalSubsidy: null,
+        postStableSubsidy: null,
+        highTemperatureSubsidy: null,
+        attendanceDeduct: null,
+        payableWage: null,
+        houseFund: null,
+        endowmentInsurance: null,
+        unemploymentInsurance: null,
+        medicalInsurance: null,
+        propertyFee: null,
+        deductTotal: null,
+        socialSecurityUnit: null,
+        individualIncomeTax: null,
+        paidWage: null,
+        payDay: null,
+        payMonth: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询员工工资列表 */
+    getList() {
+      this.loading = true;
+      listWage(this.queryParams).then(response => {
+        this.wageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        wageId: null,
+        userId: null,
+        baseSalary: null,
+        yearSalary: null,
+        postSalary: null,
+        performanceSalary: null,
+        certificatesSubsidy: null,
+        festivalSubsidy: null,
+        postStableSubsidy: null,
+        highTemperatureSubsidy: null,
+        attendanceDeduct: null,
+        payableWage: null,
+        houseFund: null,
+        endowmentInsurance: null,
+        unemploymentInsurance: null,
+        medicalInsurance: null,
+        propertyFee: null,
+        deductTotal: null,
+        socialSecurityUnit: null,
+        individualIncomeTax: null,
+        paidWage: null,
+        payDay: null,
+        payMonth: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.wageId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加员工工资";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const wageId = row.wageId || this.ids
+      getWage(wageId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改员工工资";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.wageId != null) {
+            updateWage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const wageIds = row.wageId || this.ids;
+      this.$modal.confirm('是否确认删除员工工资编号为"' + wageIds + '"的数据项？').then(function() {
+        return delWage(wageIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/wage/export', {
+        ...this.queryParams
+      }, `wage_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>