设备、车辆管理；岗位工资表

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.CmcBudgetCar;
+import com.ruoyi.oa.service.ICmcBudgetCarService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc车辆预算Controller
+ * 
+ * @author cmc
+ * @date 2024-03-22
+ */
+@RestController
+@RequestMapping("/oa/budgetCar")
+public class CmcBudgetCarController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetCarService cmcBudgetCarService;
+
+    /**
+     * 查询cmc车辆预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetCar cmcBudgetCar)
+    {
+        startPage();
+        List<CmcBudgetCar> list = cmcBudgetCarService.selectCmcBudgetCarList(cmcBudgetCar);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc车辆预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:export')")
+    @Log(title = "cmc车辆预算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetCar cmcBudgetCar)
+    {
+        List<CmcBudgetCar> list = cmcBudgetCarService.selectCmcBudgetCarList(cmcBudgetCar);
+        ExcelUtil<CmcBudgetCar> util = new ExcelUtil<CmcBudgetCar>(CmcBudgetCar.class);
+        util.exportExcel(response, list, "cmc车辆预算数据");
+    }
+
+    /**
+     * 获取cmc车辆预算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:query')")
+    @GetMapping(value = "/{budgetCarId}")
+    public AjaxResult getInfo(@PathVariable("budgetCarId") String budgetCarId)
+    {
+        return success(cmcBudgetCarService.selectCmcBudgetCarByBudgetCarId(budgetCarId));
+    }
+
+    /**
+     * 新增cmc车辆预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:add')")
+    @Log(title = "cmc车辆预算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar)
+    {
+        return toAjax(cmcBudgetCarService.insertCmcBudgetCar(cmcBudgetCar));
+    }
+
+    /**
+     * 修改cmc车辆预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:edit')")
+    @Log(title = "cmc车辆预算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetCar cmcBudgetCar)
+    {
+        return toAjax(cmcBudgetCarService.updateCmcBudgetCar(cmcBudgetCar));
+    }
+
+    /**
+     * 删除cmc车辆预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetCar:remove')")
+    @Log(title = "cmc车辆预算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{budgetCarIds}")
+    public AjaxResult remove(@PathVariable String[] budgetCarIds)
+    {
+        return toAjax(cmcBudgetCarService.deleteCmcBudgetCarByBudgetCarIds(budgetCarIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.CmcBudgetDevice;
+import com.ruoyi.oa.service.ICmcBudgetDeviceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc设备预算Controller
+ * 
+ * @author cmc
+ * @date 2024-03-22
+ */
+@RestController
+@RequestMapping("/oa/budgetDevice")
+public class CmcBudgetDeviceController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetDeviceService cmcBudgetDeviceService;
+
+    /**
+     * 查询cmc设备预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetDevice cmcBudgetDevice)
+    {
+        startPage();
+        List<CmcBudgetDevice> list = cmcBudgetDeviceService.selectCmcBudgetDeviceList(cmcBudgetDevice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc设备预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:export')")
+    @Log(title = "cmc设备预算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetDevice cmcBudgetDevice)
+    {
+        List<CmcBudgetDevice> list = cmcBudgetDeviceService.selectCmcBudgetDeviceList(cmcBudgetDevice);
+        ExcelUtil<CmcBudgetDevice> util = new ExcelUtil<CmcBudgetDevice>(CmcBudgetDevice.class);
+        util.exportExcel(response, list, "cmc设备预算数据");
+    }
+
+    /**
+     * 获取cmc设备预算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:query')")
+    @GetMapping(value = "/{budgetDeviceId}")
+    public AjaxResult getInfo(@PathVariable("budgetDeviceId") String budgetDeviceId)
+    {
+        return success(cmcBudgetDeviceService.selectCmcBudgetDeviceByBudgetDeviceId(budgetDeviceId));
+    }
+
+    /**
+     * 新增cmc设备预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:add')")
+    @Log(title = "cmc设备预算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice)
+    {
+        return toAjax(cmcBudgetDeviceService.insertCmcBudgetDevice(cmcBudgetDevice));
+    }
+
+    /**
+     * 修改cmc设备预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:edit')")
+    @Log(title = "cmc设备预算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetDevice cmcBudgetDevice)
+    {
+        return toAjax(cmcBudgetDeviceService.updateCmcBudgetDevice(cmcBudgetDevice));
+    }
+
+    /**
+     * 删除cmc设备预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:remove')")
+    @Log(title = "cmc设备预算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{budgetDeviceIds}")
+    public AjaxResult remove(@PathVariable String[] budgetDeviceIds)
+    {
+        return toAjax(cmcBudgetDeviceService.deleteCmcBudgetDeviceByBudgetDeviceIds(budgetDeviceIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.CmcBudgetSettle;
+import com.ruoyi.oa.service.ICmcBudgetSettleService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc预结算Controller
+ * 
+ * @author cmc
+ * @date 2024-03-22
+ */
+@RestController
+@RequestMapping("/oa/budgetSettle")
+public class CmcBudgetSettleController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetSettleService cmcBudgetSettleService;
+
+    /**
+     * 查询cmc预结算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetSettle cmcBudgetSettle)
+    {
+        startPage();
+        List<CmcBudgetSettle> list = cmcBudgetSettleService.selectCmcBudgetSettleList(cmcBudgetSettle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc预结算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:export')")
+    @Log(title = "cmc预结算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetSettle cmcBudgetSettle)
+    {
+        List<CmcBudgetSettle> list = cmcBudgetSettleService.selectCmcBudgetSettleList(cmcBudgetSettle);
+        ExcelUtil<CmcBudgetSettle> util = new ExcelUtil<CmcBudgetSettle>(CmcBudgetSettle.class);
+        util.exportExcel(response, list, "cmc预结算数据");
+    }
+
+    /**
+     * 获取cmc预结算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:query')")
+    @GetMapping(value = "/{budgetSettleId}")
+    public AjaxResult getInfo(@PathVariable("budgetSettleId") String budgetSettleId)
+    {
+        return success(cmcBudgetSettleService.selectCmcBudgetSettleByBudgetSettleId(budgetSettleId));
+    }
+
+    /**
+     * 新增cmc预结算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:add')")
+    @Log(title = "cmc预结算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle)
+    {
+        return toAjax(cmcBudgetSettleService.insertCmcBudgetSettle(cmcBudgetSettle));
+    }
+
+    /**
+     * 修改cmc预结算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:edit')")
+    @Log(title = "cmc预结算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetSettle cmcBudgetSettle)
+    {
+        return toAjax(cmcBudgetSettleService.updateCmcBudgetSettle(cmcBudgetSettle));
+    }
+
+    /**
+     * 删除cmc预结算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:remove')")
+    @Log(title = "cmc预结算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{budgetSettleIds}")
+    public AjaxResult remove(@PathVariable String[] budgetSettleIds)
+    {
+        return toAjax(cmcBudgetSettleService.deleteCmcBudgetSettleByBudgetSettleIds(budgetSettleIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.CmcBudgetStaff;
+import com.ruoyi.oa.service.ICmcBudgetStaffService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc人员预算Controller
+ * 
+ * @author cmc
+ * @date 2024-03-22
+ */
+@RestController
+@RequestMapping("/oa/budgetStaff")
+public class CmcBudgetStaffController extends BaseController
+{
+    @Autowired
+    private ICmcBudgetStaffService cmcBudgetStaffService;
+
+    /**
+     * 查询cmc人员预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBudgetStaff cmcBudgetStaff)
+    {
+        startPage();
+        List<CmcBudgetStaff> list = cmcBudgetStaffService.selectCmcBudgetStaffList(cmcBudgetStaff);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc人员预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:export')")
+    @Log(title = "cmc人员预算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBudgetStaff cmcBudgetStaff)
+    {
+        List<CmcBudgetStaff> list = cmcBudgetStaffService.selectCmcBudgetStaffList(cmcBudgetStaff);
+        ExcelUtil<CmcBudgetStaff> util = new ExcelUtil<CmcBudgetStaff>(CmcBudgetStaff.class);
+        util.exportExcel(response, list, "cmc人员预算数据");
+    }
+
+    /**
+     * 获取cmc人员预算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:query')")
+    @GetMapping(value = "/{budgetStaffId}")
+    public AjaxResult getInfo(@PathVariable("budgetStaffId") String budgetStaffId)
+    {
+        return success(cmcBudgetStaffService.selectCmcBudgetStaffByBudgetStaffId(budgetStaffId));
+    }
+
+    /**
+     * 新增cmc人员预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:add')")
+    @Log(title = "cmc人员预算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff)
+    {
+        return toAjax(cmcBudgetStaffService.insertCmcBudgetStaff(cmcBudgetStaff));
+    }
+
+    /**
+     * 修改cmc人员预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:edit')")
+    @Log(title = "cmc人员预算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBudgetStaff cmcBudgetStaff)
+    {
+        return toAjax(cmcBudgetStaffService.updateCmcBudgetStaff(cmcBudgetStaff));
+    }
+
+    /**
+     * 删除cmc人员预算
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:remove')")
+    @Log(title = "cmc人员预算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{budgetStaffIds}")
+    public AjaxResult remove(@PathVariable String[] budgetStaffIds)
+    {
+        return toAjax(cmcBudgetStaffService.deleteCmcBudgetStaffByBudgetStaffIds(budgetStaffIds));
+    }
+}

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

@@ -71,30 +71,7 @@ public class CmcCarApprovalController extends BaseController
     @GetMapping(value = "/{carApplyId}")
     public AjaxResult getInfo(@PathVariable("carApplyId") String carApplyId)
     {
-        JSONObject formData = new JSONObject();
-        CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId);
-        if (cmcCarApproval != null) {
-            formData.put("user", userService.selectUserById(cmcCarApproval.getApplier()).getNickName());
-            formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcCarApproval.getApplier()).getDeptId()).getDeptName());
-            formData.put("applyDate", cmcCarApproval.getApplyDate());
-            formData.put("beginDate", cmcCarApproval.getBeginDate());
-            formData.put("endDate", cmcCarApproval.getEndDate());
-            formData.put("days", cmcCarApproval.getDays());
-            formData.put("passengers", cmcCarApproval.getPassengers());
-            formData.put("projectNumber", cmcCarApproval.getProjectId());
-            formData.put("applyReason", cmcCarApproval.getApplyReason());
-            formData.put("deptUser", cmcCarApproval.getDeptUserId());
-            formData.put("deptComment", cmcCarApproval.getDeptComment());
-            formData.put("managerUser", cmcCarApproval.getManagerUserId());
-            formData.put("managerComment", cmcCarApproval.getManagerComment());
-            formData.put("unionUser", cmcCarApproval.getUnionUserId());
-            formData.put("unionComment", cmcCarApproval.getUnionComment());
-            formData.put("dispatcher", cmcCarApproval.getDispatcher());
-            formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
-            formData.put("cars", cmcCarApproval.getCars());
-            formData.put("drivers", cmcCarApproval.getDrivers());
-        }
-        return success(formData);
+        return success(cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId));
     }
 
     /**
@@ -118,8 +95,9 @@ public class CmcCarApprovalController extends BaseController
         CmcCarApproval cmcCarApproval = new CmcCarApproval();
         cmcCarApproval.setCarApplyId(formDataJson.getString("formId"));
         cmcCarApproval.setApplier(getLoginUser().getUserId());
+        cmcCarApproval.setUseDept(getLoginUser().getDeptId());
         cmcCarApproval.setApplyDate(DateUtils.getNowDate());
-        cmcCarApproval.setProjectId(formDataJson.getString("projectNumber"));
+        cmcCarApproval.setProjectId(formDataJson.getString("projectId"));
         cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
         cmcCarApproval.setBeginDate(formDataJson.getDate("beginDate"));

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

@@ -8,8 +8,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcDeviceService;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -37,12 +35,6 @@ public class CmcDeviceApprovalController extends BaseController
     @Autowired
     private ICmcDeviceService cmcDeviceService;
 
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
     /**
      * 查询cmc设备审批列表
      */
@@ -72,26 +64,7 @@ public class CmcDeviceApprovalController extends BaseController
     @GetMapping(value = "/{deviceApplyId}")
     public AjaxResult getInfo(@PathVariable("deviceApplyId") String deviceApplyId)
     {
-        JSONObject formData = new JSONObject();
-        CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId);
-        if (cmcDeviceApproval != null) {
-            formData.put("user", userService.selectUserById(cmcDeviceApproval.getApplier()).getNickName());
-            formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcDeviceApproval.getApplier()).getDeptId()).getDeptName());
-            formData.put("applyDate", cmcDeviceApproval.getApplyDate());
-            formData.put("beginDate", cmcDeviceApproval.getBeginDate());
-            formData.put("endDate", cmcDeviceApproval.getEndDate());
-            formData.put("days", cmcDeviceApproval.getDays());
-            formData.put("projectNumber", cmcDeviceApproval.getProjectId());
-            formData.put("applyReason", cmcDeviceApproval.getApplyReason());
-            formData.put("deptUser", cmcDeviceApproval.getDeptUserId());
-            formData.put("deptComment", cmcDeviceApproval.getDeptComment());
-            formData.put("managerUser", cmcDeviceApproval.getManagerUserId());
-            formData.put("managerComment", cmcDeviceApproval.getManagerComment());
-            formData.put("dispatcher", cmcDeviceApproval.getDispatcher());
-            formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
-            formData.put("devices", cmcDeviceApproval.getDevices());
-        }
-        return success(formData);
+        return success(cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId));
     }
 
     /**
@@ -115,9 +88,9 @@ public class CmcDeviceApprovalController extends BaseController
         CmcDeviceApproval cmcDeviceApproval = new CmcDeviceApproval();
         cmcDeviceApproval.setDeviceApplyId(formDataJson.getString("formId"));
         cmcDeviceApproval.setApplier(getLoginUser().getUserId());
-        cmcDeviceApproval.setDept(getLoginUser().getDeptId());
+        cmcDeviceApproval.setUseDept(getLoginUser().getDeptId());
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
-        cmcDeviceApproval.setProjectId(formDataJson.getString("projectNumber"));
+        cmcDeviceApproval.setProjectId(formDataJson.getString("projectId"));
         cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("beginDate"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endDate"));

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.common.core.domain.entity.CmcPostSalary;
+import com.ruoyi.oa.service.ICmcPostSalaryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc岗位工资Controller
+ * 
+ * @author cmc
+ * @date 2024-03-25
+ */
+@RestController
+@RequestMapping("/oa/salary")
+public class CmcPostSalaryController extends BaseController
+{
+    @Autowired
+    private ICmcPostSalaryService cmcPostSalaryService;
+
+    /**
+     * 查询cmc岗位工资列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcPostSalary cmcPostSalary)
+    {
+        startPage();
+        List<CmcPostSalary> list = cmcPostSalaryService.selectCmcPostSalaryList(cmcPostSalary);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc岗位工资列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:export')")
+    @Log(title = "cmc岗位工资", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcPostSalary cmcPostSalary)
+    {
+        List<CmcPostSalary> list = cmcPostSalaryService.selectCmcPostSalaryList(cmcPostSalary);
+        ExcelUtil<CmcPostSalary> util = new ExcelUtil<CmcPostSalary>(CmcPostSalary.class);
+        util.exportExcel(response, list, "cmc岗位工资数据");
+    }
+
+    /**
+     * 获取cmc岗位工资详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:query')")
+    @GetMapping(value = "/{salaryId}")
+    public AjaxResult getInfo(@PathVariable("salaryId") Integer salaryId)
+    {
+        return success(cmcPostSalaryService.selectCmcPostSalaryBySalaryId(salaryId));
+    }
+
+    /**
+     * 新增cmc岗位工资
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:add')")
+    @Log(title = "cmc岗位工资", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcPostSalary cmcPostSalary)
+    {
+        return toAjax(cmcPostSalaryService.insertCmcPostSalary(cmcPostSalary));
+    }
+
+    /**
+     * 修改cmc岗位工资
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:edit')")
+    @Log(title = "cmc岗位工资", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcPostSalary cmcPostSalary)
+    {
+        return toAjax(cmcPostSalaryService.updateCmcPostSalary(cmcPostSalary));
+    }
+
+    /**
+     * 删除cmc岗位工资
+     */
+    @PreAuthorize("@ss.hasPermi('oa:salary:remove')")
+    @Log(title = "cmc岗位工资", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{salaryIds}")
+    public AjaxResult remove(@PathVariable Integer[] salaryIds)
+    {
+        return toAjax(cmcPostSalaryService.deleteCmcPostSalaryBySalaryIds(salaryIds));
+    }
+}

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/CmcPostSalary.java

@@ -0,0 +1,80 @@
+package com.ruoyi.common.core.domain.entity;
+
+import java.math.BigDecimal;
+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岗位工资对象 cmc_post_salary
+ *
+ * @author cmc
+ * @date 2024-03-25
+ */
+public class CmcPostSalary extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 成本id */
+    private Integer salaryId;
+
+    /** 岗级 */
+    @Excel(name = "岗级")
+    private String postLevel;
+
+    /** 薪档 */
+    @Excel(name = "薪档")
+    private String salaryLevel;
+
+    /** 月薪 */
+    @Excel(name = "月薪")
+    private BigDecimal salary;
+
+    public void setSalaryId(Integer salaryId)
+    {
+        this.salaryId = salaryId;
+    }
+
+    public Integer getSalaryId()
+    {
+        return salaryId;
+    }
+    public void setPostLevel(String postLevel)
+    {
+        this.postLevel = postLevel;
+    }
+
+    public String getPostLevel()
+    {
+        return postLevel;
+    }
+    public void setSalaryLevel(String salaryLevel)
+    {
+        this.salaryLevel = salaryLevel;
+    }
+
+    public String getSalaryLevel()
+    {
+        return salaryLevel;
+    }
+    public void setSalary(BigDecimal salary)
+    {
+        this.salary = salary;
+    }
+
+    public BigDecimal getSalary()
+    {
+        return salary;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("salaryId", getSalaryId())
+                .append("postLevel", getPostLevel())
+                .append("salaryLevel", getSalaryLevel())
+                .append("salary", getSalary())
+                .toString();
+    }
+}

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -117,6 +118,8 @@ public class SysUser extends BaseEntity
     })
     private SysDept dept;
 
+    private CmcPostSalary salary;
+
     /** 角色对象 */
     private List<SysRole> roles;
 
@@ -392,6 +395,16 @@ public class SysUser extends BaseEntity
         this.dept = dept;
     }
 
+    public CmcPostSalary getSalary()
+    {
+        return salary;
+    }
+
+    public void setSalary(CmcPostSalary salary)
+    {
+        this.salary = salary;
+    }
+
     public List<SysRole> getRoles()
     {
         return roles;

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

@@ -3,6 +3,8 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -25,6 +27,14 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
+    private SysUser user;
+
+    /** 使用部门 */
+    @Excel(name = "使用部门")
+    private Long useDept;
+
+    private SysDept dept;
+
     /** 车辆id */
     @Excel(name = "车辆id")
     private String cars;
@@ -37,6 +47,8 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "项目编号")
     private String projectId;
 
+    private CmcProject project;
+
     /** 用车事由 */
     @Excel(name = "用车事由")
     private String applyReason;
@@ -126,6 +138,33 @@ public class CmcCarApproval extends BaseEntity
     {
         return applier;
     }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    public void setUseDept(Long useDept)
+    {
+        this.useDept = useDept;
+    }
+
+    public Long getUseDept()
+    {
+        return useDept;
+    }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setCars(String cars)
     {
         this.cars = cars;
@@ -153,6 +192,15 @@ public class CmcCarApproval extends BaseEntity
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setApplyReason(String applyReason)
     {
         this.applyReason = applyReason;

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -79,13 +80,13 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "保修期", readConverterExp = "月=")
     private Integer warranty;
 
-    /** 管理部门 */
-    @Excel(name = "管理部门")
+    /** 管理部门id */
+    @Excel(name = "管理部门id")
     private Long manageDept;
 
     /** 管理部门 */
     @Excel(name = "管理部门")
-    private String manageDeptName;
+    private SysDept dept;
 
     public void setDeviceId(Integer deviceId)
     {
@@ -231,14 +232,14 @@ public class CmcDevice extends BaseEntity
     {
         return manageDept;
     }
-    public void setManageDeptName(String manageDeptName)
+    public void setDept(SysDept dept)
     {
-        this.manageDeptName = manageDeptName;
+        this.dept = dept;
     }
 
-    public String getManageDeptName()
+    public SysDept getDept()
     {
-        return manageDeptName;
+        return dept;
     }
 
     @Override

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

@@ -3,6 +3,9 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysDeployForm;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -25,9 +28,13 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
+    private SysUser user;
+
     /** 使用部门 */
     @Excel(name = "使用部门")
-    private Long dept;
+    private Long useDept;
+
+    private SysDept dept;
 
     /** 设备id */
     @Excel(name = "设备id")
@@ -37,13 +44,7 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "项目id")
     private String projectId;
 
-    /** 项目编号 */
-    @Excel(name = "项目编号")
-    private String projectNumber;
-
-    /** 项目名称 */
-    @Excel(name = "项目名称")
-    private String projectName;
+    private CmcProject project;
 
     /** 申领事由 */
     @Excel(name = "申领事由")
@@ -118,21 +119,40 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return deviceApplyId;
     }
-    public void setApplier(Long applier) 
+    public void setApplier(Long applier)
     {
         this.applier = applier;
     }
 
-    public Long getApplier() 
+    public Long getApplier()
     {
         return applier;
     }
-    public void setDept(Long dept)
+
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    public void setUseDept(Long useDept)
+    {
+        this.useDept = useDept;
+    }
+
+    public Long getUseDept()
+    {
+        return useDept;
+    }
+    public void setDept(SysDept dept)
     {
         this.dept = dept;
     }
 
-    public Long getDept()
+    public SysDept getDept()
     {
         return dept;
     }
@@ -154,23 +174,14 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return projectId;
     }
-    public void setProjectNumber(String projectNumber)
-    {
-        this.projectNumber = projectNumber;
-    }
-
-    public String getProjectNumber()
-    {
-        return projectNumber;
-    }
-    public void setProjectName(String projectName)
+    public void setProject(CmcProject project)
     {
-        this.projectName = projectName;
+        this.project = project;
     }
 
-    public String getProjectName()
+    public CmcProject getProject()
     {
-        return projectName;
+        return project;
     }
     public void setApplyReason(String applyReason) 
     {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.CmcPostSalary;
+
+/**
+ * cmc岗位工资Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-25
+ */
+public interface CmcPostSalaryMapper 
+{
+    /**
+     * 查询cmc岗位工资
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return cmc岗位工资
+     */
+    public CmcPostSalary selectCmcPostSalaryBySalaryId(Integer salaryId);
+
+    /**
+     * 查询cmc岗位工资列表
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return cmc岗位工资集合
+     */
+    public List<CmcPostSalary> selectCmcPostSalaryList(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 新增cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    public int insertCmcPostSalary(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 修改cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    public int updateCmcPostSalary(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 删除cmc岗位工资
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return 结果
+     */
+    public int deleteCmcPostSalaryBySalaryId(Integer salaryId);
+
+    /**
+     * 批量删除cmc岗位工资
+     * 
+     * @param salaryIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcPostSalaryBySalaryIds(Integer[] salaryIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.CmcPostSalary;
+
+/**
+ * cmc岗位工资Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-25
+ */
+public interface ICmcPostSalaryService 
+{
+    /**
+     * 查询cmc岗位工资
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return cmc岗位工资
+     */
+    public CmcPostSalary selectCmcPostSalaryBySalaryId(Integer salaryId);
+
+    /**
+     * 查询cmc岗位工资列表
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return cmc岗位工资集合
+     */
+    public List<CmcPostSalary> selectCmcPostSalaryList(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 新增cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    public int insertCmcPostSalary(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 修改cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    public int updateCmcPostSalary(CmcPostSalary cmcPostSalary);
+
+    /**
+     * 批量删除cmc岗位工资
+     * 
+     * @param salaryIds 需要删除的cmc岗位工资主键集合
+     * @return 结果
+     */
+    public int deleteCmcPostSalaryBySalaryIds(Integer[] salaryIds);
+
+    /**
+     * 删除cmc岗位工资信息
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return 结果
+     */
+    public int deleteCmcPostSalaryBySalaryId(Integer salaryId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcPostSalaryServiceImpl.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.CmcPostSalaryMapper;
+import com.ruoyi.common.core.domain.entity.CmcPostSalary;
+import com.ruoyi.oa.service.ICmcPostSalaryService;
+
+/**
+ * cmc岗位工资Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-25
+ */
+@Service
+public class CmcPostSalaryServiceImpl implements ICmcPostSalaryService 
+{
+    @Autowired
+    private CmcPostSalaryMapper cmcPostSalaryMapper;
+
+    /**
+     * 查询cmc岗位工资
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return cmc岗位工资
+     */
+    @Override
+    public CmcPostSalary selectCmcPostSalaryBySalaryId(Integer salaryId)
+    {
+        return cmcPostSalaryMapper.selectCmcPostSalaryBySalaryId(salaryId);
+    }
+
+    /**
+     * 查询cmc岗位工资列表
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return cmc岗位工资
+     */
+    @Override
+    public List<CmcPostSalary> selectCmcPostSalaryList(CmcPostSalary cmcPostSalary)
+    {
+        return cmcPostSalaryMapper.selectCmcPostSalaryList(cmcPostSalary);
+    }
+
+    /**
+     * 新增cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    @Override
+    public int insertCmcPostSalary(CmcPostSalary cmcPostSalary)
+    {
+        return cmcPostSalaryMapper.insertCmcPostSalary(cmcPostSalary);
+    }
+
+    /**
+     * 修改cmc岗位工资
+     * 
+     * @param cmcPostSalary cmc岗位工资
+     * @return 结果
+     */
+    @Override
+    public int updateCmcPostSalary(CmcPostSalary cmcPostSalary)
+    {
+        return cmcPostSalaryMapper.updateCmcPostSalary(cmcPostSalary);
+    }
+
+    /**
+     * 批量删除cmc岗位工资
+     * 
+     * @param salaryIds 需要删除的cmc岗位工资主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPostSalaryBySalaryIds(Integer[] salaryIds)
+    {
+        return cmcPostSalaryMapper.deleteCmcPostSalaryBySalaryIds(salaryIds);
+    }
+
+    /**
+     * 删除cmc岗位工资信息
+     * 
+     * @param salaryId cmc岗位工资主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPostSalaryBySalaryId(Integer salaryId)
+    {
+        return cmcPostSalaryMapper.deleteCmcPostSalaryBySalaryId(salaryId);
+    }
+}

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

@@ -7,6 +7,7 @@
     <resultMap type="CmcCarApproval" id="CmcCarApprovalResult">
         <result property="carApplyId"    column="car_apply_id"    />
         <result property="applier"    column="applier"    />
+        <result property="useDept"    column="use_dept"    />
         <result property="cars"    column="cars"    />
         <result property="drivers"    column="drivers"    />
         <result property="projectId"    column="project_id"    />
@@ -27,36 +28,59 @@
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select car_apply_id, applier, cars, drivers, project_id, apply_reason, passengers, apply_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, union_user_id, union_comment, dispatcher, dispatch_comment, estimate_cost from cmc_car_approval
+        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.union_user_id, ca.union_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
+            left join sys_user as u on u.user_id = ca.applier
+            left join sys_dept as d on d.dept_id = ca.use_dept
+            left join cmc_project as p on ca.project_id = p.project_id
     </sql>
 
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
         <include refid="selectCmcCarApprovalVo"/>
         <where>
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="cars != null  and cars != ''"> and cars = #{cars}</if>
-            <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="passengers != null "> and passengers = #{passengers}</if>
-            <if test="applyDate != null "> and apply_date = #{beginDate}</if>
-            <if test="beginDate != null "> and begin_date = #{beginDate}</if>
-            <if test="beginHalfday != null  and beginHalfday != ''"> and begin_halfday = #{beginHalfday}</if>
-            <if test="endDate != null "> and end_date = #{endDate}</if>
-            <if test="endHalfday != null  and endHalfday != ''"> and end_halfday = #{endHalfday}</if>
-            <if test="days != null "> and days = #{days}</if>
-            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
-            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="unionUserId != null "> and union_user_id = #{unionUserId}</if>
-            <if test="unionComment != null  and unionComment != ''"> and union_comment = #{unionComment}</if>
-            <if test="dispatcher != null "> and dispatcher = #{dispatcher}</if>
-            <if test="dispatchComment != null  and dispatchComment != ''"> and dispatch_comment = #{dispatchComment}</if>
-            <if test="estimateCost != null "> and estimate_cost = #{estimateCost}</if>
+            <if test="applier != null "> and ca.ca.applier = #{applier}</if>
+            <if test="useDept != null "> and da.use_dept = #{useDept}</if>
+            <if test="cars != null  and cars != ''"> and ca.cars = #{cars}</if>
+            <if test="drivers != null  and drivers != ''"> and ca.drivers = #{drivers}</if>
+            <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
+            <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
+            <if test="passengers != null "> and ca.passengers = #{passengers}</if>
+            <if test="applyDate != null "> and ca.apply_date = #{beginDate}</if>
+            <if test="beginDate != null "> and ca.begin_date = #{beginDate}</if>
+            <if test="beginHalfday != null  and beginHalfday != ''"> and ca.begin_halfday = #{beginHalfday}</if>
+            <if test="endDate != null "> and ca.end_date = #{endDate}</if>
+            <if test="endHalfday != null  and endHalfday != ''"> and ca.end_halfday = #{endHalfday}</if>
+            <if test="days != null "> and ca.days = #{days}</if>
+            <if test="deptUserId != null "> and ca.dept_user_id = #{deptUserId}</if>
+            <if test="deptComment != null  and deptComment != ''"> and ca.dept_comment = #{deptComment}</if>
+            <if test="managerUserId != null "> and ca.manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and ca.manager_comment = #{managerComment}</if>
+            <if test="unionUserId != null "> and ca.union_user_id = #{unionUserId}</if>
+            <if test="unionComment != null  and unionComment != ''"> and ca.union_comment = #{unionComment}</if>
+            <if test="dispatcher != null "> and ca.dispatcher = #{dispatcher}</if>
+            <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
+            <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
         </where>
     </select>
 
@@ -70,6 +94,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="carApplyId != null">car_apply_id,</if>
             <if test="applier != null">applier,</if>
+            <if test="useDept != null">use_dept,</if>
             <if test="cars != null">cars,</if>
             <if test="drivers != null">drivers,</if>
             <if test="projectId != null">project_id,</if>
@@ -94,6 +119,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="carApplyId != null">#{carApplyId},</if>
             <if test="applier != null">#{applier},</if>
+            <if test="useDept != null">#{useDept},</if>
             <if test="cars != null">#{cars},</if>
             <if test="drivers != null">#{drivers},</if>
             <if test="projectId != null">#{projectId},</if>
@@ -121,6 +147,7 @@
         update cmc_car_approval
         <trim prefix="SET" suffixOverrides=",">
             <if test="applier != null">applier = #{applier},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
             <if test="cars != null">cars = #{cars},</if>
             <if test="drivers != null">drivers = #{drivers},</if>
             <if test="projectId != null">project_id = #{projectId},</if>

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

@@ -7,11 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceApproval" id="CmcDeviceApprovalResult">
         <result property="deviceApplyId"    column="device_apply_id"    />
         <result property="applier"    column="applier"    />
-        <result property="dept"    column="dept"    />
+        <result property="useDept"    column="use_dept"    />
         <result property="devices"    column="devices"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectNumber"    column="project_number"    />
-        <result property="projectName"    column="project_name"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
         <result property="returnDate"    column="return_date"    />
@@ -27,18 +25,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select da.device_apply_id, da.applier, da.dept, da.devices, da.project_id, p.project_number, p.project_name, da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, da.dept_comment, da.manager_user_id, da.manager_comment, da.dispatcher, da.dispatch_comment, da.estimate_cost from cmc_device_approval as da left join cmc_project as p
+        select da.device_apply_id, da.applier, u.nick_name, da.use_dept, d.dept_name, da.devices, da.project_id, p.project_number, p.project_name, da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, da.dept_comment, da.manager_user_id, da.manager_comment, da.dispatcher, da.dispatch_comment, da.estimate_cost from cmc_device_approval as da
+            left join sys_user as u on u.user_id = da.applier
+            left join sys_dept as d on d.dept_id = da.use_dept
+            left join cmc_project as p on da.project_id = p.project_id
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
-        on da.project_id = p.project_id
         <where>  
             <if test="applier != null "> and da.applier = #{applier}</if>
-            <if test="dept != null "> and da.dept = #{dept}</if>
+            <if test="useDept != null "> and da.use_dept = #{useDept}</if>
             <if test="devices != null  and devices != ''"> and da.devices = #{devices}</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
@@ -61,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
-        on da.project_id = p.project_id
         where da.device_apply_id = #{deviceApplyId}
     </select>
         
@@ -70,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">device_apply_id,</if>
             <if test="applier != null">applier,</if>
-            <if test="dept != null">dept,</if>
+            <if test="useDept != null">use_dept,</if>
             <if test="devices != null">devices,</if>
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
@@ -92,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
             <if test="applier != null">#{applier},</if>
-            <if test="dept != null">#{dept},</if>
+            <if test="useDept != null">#{useDept},</if>
             <if test="devices != null">#{devices},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
@@ -117,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_approval
         <trim prefix="SET" suffixOverrides=",">
             <if test="applier != null">applier = #{applier},</if>
-            <if test="dept != null">dept = #{dept},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
             <if test="devices != null">devices = #{devices},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>

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

@@ -22,7 +22,12 @@
         <result property="checkTime"    column="check_time"    />
         <result property="warranty"    column="warranty"    />
         <result property="manageDept"    column="manage_dept"    />
-        <result property="manageDeptName"    column="dept_name"    />
+        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
+    </resultMap>
+
+    <resultMap id="deptResult" type="SysDept">
+        <id     property="deptId"    column="dept_id"     />
+        <result property="deptName"  column="dept_name"   />
     </resultMap>
 
     <sql id="selectCmcDeviceVo">

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

@@ -0,0 +1,66 @@
+<?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.CmcPostSalaryMapper">
+
+    <resultMap type="CmcPostSalary" id="CmcPostSalaryResult">
+        <result property="salaryId"    column="salary_id"    />
+        <result property="postLevel"    column="post_level"    />
+        <result property="salaryLevel"    column="salary_level"    />
+        <result property="salary"    column="salary"    />
+    </resultMap>
+
+    <sql id="selectCmcPostSalaryVo">
+        select salary_id, post_level, salary_level, salary from cmc_post_salary
+    </sql>
+
+    <select id="selectCmcPostSalaryList" parameterType="CmcPostSalary" resultMap="CmcPostSalaryResult">
+        <include refid="selectCmcPostSalaryVo"/>
+        <where>
+            <if test="postLevel != null  and postLevel != ''"> and post_level = #{postLevel}</if>
+            <if test="salaryLevel != null  and salaryLevel != ''"> and salary_level = #{salaryLevel}</if>
+            <if test="salary != null "> and salary = #{salary}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcPostSalaryBySalaryId" parameterType="Integer" resultMap="CmcPostSalaryResult">
+        <include refid="selectCmcPostSalaryVo"/>
+        where salary_id = #{salaryId}
+    </select>
+
+    <insert id="insertCmcPostSalary" parameterType="CmcPostSalary" useGeneratedKeys="true" keyProperty="salaryId">
+        insert into cmc_post_salary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="postLevel != null">post_level,</if>
+            <if test="salaryLevel != null">salary_level,</if>
+            <if test="salary != null">salary,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="postLevel != null">#{postLevel},</if>
+            <if test="salaryLevel != null">#{salaryLevel},</if>
+            <if test="salary != null">#{salary},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmcPostSalary" parameterType="CmcPostSalary">
+        update cmc_post_salary
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="postLevel != null">post_level = #{postLevel},</if>
+            <if test="salaryLevel != null">salary_level = #{salaryLevel},</if>
+            <if test="salary != null">salary = #{salary},</if>
+        </trim>
+        where salary_id = #{salaryId}
+    </update>
+
+    <delete id="deleteCmcPostSalaryBySalaryId" parameterType="Integer">
+        delete from cmc_post_salary where salary_id = #{salaryId}
+    </delete>
+
+    <delete id="deleteCmcPostSalaryBySalaryIds" parameterType="String">
+        delete from cmc_post_salary where salary_id in
+        <foreach item="salaryId" collection="array" open="(" separator="," close=")">
+            #{salaryId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -34,9 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="birthday"       column="birthday"       />
         <result property="age"       column="age"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
+        <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -55,20 +56,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
+    <resultMap id="CmcPostSalaryResult" type="CmcPostSalary">
+		<result property="salaryId"    column="salary_id"    />
+		<result property="postLevel"    column="post_level"    />
+		<result property="salaryLevel"    column="salary_level"    />
+		<result property="salary"    column="salary"    />
+    </resultMap>
+
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level, u.entry_date, u.birthday, u.age,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, ps.salary
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
+		    left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level, u.entry_date, u.birthday, u.age, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level, u.entry_date, u.birthday, u.age, d.dept_name, d.leader, ps.salary from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}

oa-back/sql/sql.sql

@@ -358,7 +358,7 @@ create table sys_menu (
 insert into sys_menu values('1', 	'系统管理', '0', '1', 'system',		null, '', 1, 0, 'M', '0', '0', '', 'system',	'admin', sysdate(), '', null, '系统管理目录');
 insert into sys_menu values('2', 	'系统监控', '0', '2', 'monitor',	null, '', 1, 0, 'M', '0', '0', '', 'monitor',	'admin', sysdate(), '', null, '系统监控目录');
 insert into sys_menu values('3', 	'系统工具', '0', '3', 'tool',		null, '', 1, 0, 'M', '0', '0', '', 'tool',		'admin', sysdate(), '', null, '系统工具目录');
-insert into sys_menu values('4', 	'人事管理', '0', '4', 'staff',		'oa/staff/index', 			'', 1, 0, 'C', '0', '0', 'system:user:list','user',		'admin', sysdate(), '', null, '人事管理菜单');
+insert into sys_menu values('4', 	'人事管理', '0', '4', 'staff',		null, '', 1, 0, 'M', '0', '0', '', 'user',		'admin', sysdate(), '', null, '人事管理菜单');
 insert into sys_menu values('5', 	'车辆管理', '0', '5', 'car',		'oa/car/index', 			'', 1, 0, 'C', '0', '0', 'oa:car:list', 	'car',		'admin', sysdate(), '', null, '车辆管理菜单');
 insert into sys_menu values('6', 	'设备管理', '0', '6', 'device',		'oa/device/index', 			'', 1, 0, 'C', '0', '0', 'oa:device:list', 	'component','admin', sysdate(), '', null, '设备管理菜单');
 insert into sys_menu values('7', 	'投标管理', '0', '7', 'tender',		'oa/tender/index', 			'', 1, 0, 'C', '0', '0', 'oa:tender:list', 	'guide',	'admin', sysdate(), '', null, '投标管理菜单');
@@ -385,6 +385,8 @@ insert into sys_menu values('114',  '缓存列表', '2',   '6', 'cacheList',  'm
 insert into sys_menu values('115',  '表单构建', '3',   '1', 'build',      'tool/build/index',         '', 1, 0, 'C', '0', '0', 'tool:build:list',         'build',         'admin', sysdate(), '', null, '表单构建菜单');
 insert into sys_menu values('116',  '代码生成', '3',   '2', 'gen',        'tool/gen/index',           '', 1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          'admin', sysdate(), '', null, '代码生成菜单');
 insert into sys_menu values('117',  '系统接口', '3',   '3', 'swagger',    'tool/swagger/index',       '', 1, 0, 'C', '0', '0', 'tool:swagger:list',       'swagger',       'admin', sysdate(), '', null, '系统接口菜单');
+insert into sys_menu values('118',  '人员信息', '4',   '1', 'user',      'oa/staff/index',       	  '', 1, 0, 'C', '0', '0', 'system:user:list',        'peoples',       'admin', sysdate(), '', null, '人员信息菜单');
+insert into sys_menu values('119',  '岗位工资', '4',   '2', 'salary',     'oa/staff/salary',       	  '', 1, 0, 'C', '0', '0', 'oa:salary:list',       	  'cost',          'admin', sysdate(), '', null, '岗位工资菜单');
 -- 三级菜单
 insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          'admin', sysdate(), '', null, '操作日志菜单');
 insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
@@ -493,6 +495,12 @@ insert into sys_menu values('1083', '项目新增', '9', '2', '#', '', '', 1, 0,
 insert into sys_menu values('1084', '项目修改', '9', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1085', '项目删除', '9', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1086', '项目导出', '9', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
+-- 项目管理按钮
+insert into sys_menu values('1087', '工资查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1088', '工资新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1089', '工资修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1090', '工资删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1091', '工资导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:export',          	'#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -1569,6 +1577,7 @@ drop table if exists `cmc_car_approval`;
 create table `cmc_car_approval`  (
   `car_apply_id`		char(19)		not null		comment '用车申请id',
   `applier`				bigint			default null	comment '申请人',
+  `use_dept`			bigint			default null	comment '使用部门',
   `cars`				varchar(10)		default null	comment '车辆id',
   `drivers`				varchar(20)		default null	comment '驾驶员id',
   `project_id`			char(19)		default null	comment '项目id',
@@ -2227,7 +2236,7 @@ drop table if exists `cmc_device_approval`;
 create table `cmc_device_approval`  (
   `device_apply_id`		char(19)		not null		comment '设备申请id',
   `applier`				bigint			default null	comment '申请人',
-  `dept`				bigint			default null	comment '使用部门',
+  `use_dept`			bigint			default null	comment '使用部门',
   `devices`				varchar(50)		default null	comment '设备id',
   `project_id`			char(19)		default null	comment '项目id',
   `apply_reason`		varchar(255)	default null 	comment '申领事由',
@@ -2905,77 +2914,78 @@ create table `cmc_user_history`  (
 -- ----------------------------
 
 -- ----------------------------
-drop table if exists `cmc_user_cost`;
-create table `cmc_user_cost`  (
-  `cost_id`			int				not null	auto_increment	comment '成本id',
-  `name`			varchar(10)		default null				comment '项名',
-  `month_cost`		decimal(10, 2)	default null				comment '月成本',
-  primary key (`cost_id`)
-) engine = innodb comment = 'cmc用户成本表';
-
-insert into `cmc_user_cost` values (1, '一岗一档', 300.00);
-insert into `cmc_user_cost` values (2, '一岗二档', 340.00);
-insert into `cmc_user_cost` values (3, '一岗三档', 380.00);
-insert into `cmc_user_cost` values (4, '一岗四档', 420.00);
-insert into `cmc_user_cost` values (5, '二岗一档', 440.00);
-insert into `cmc_user_cost` values (6, '二岗二档', 500.00);
-insert into `cmc_user_cost` values (7, '二岗三档', 560.00);
-insert into `cmc_user_cost` values (8, '二岗四档', 620.00);
-insert into `cmc_user_cost` values (9, '二岗五档', 680.00);
-insert into `cmc_user_cost` values (10, '二岗六档', 740.00);
-insert into `cmc_user_cost` values (11, '三岗一档', 560.00);
-insert into `cmc_user_cost` values (12, '三岗二档', 640.00);
-insert into `cmc_user_cost` values (13, '三岗三档', 720.00);
-insert into `cmc_user_cost` values (14, '三岗四档', 800.00);
-insert into `cmc_user_cost` values (15, '三岗五档', 880.00);
-insert into `cmc_user_cost` values (16, '三岗六档', 960.00);
-insert into `cmc_user_cost` values (17, '三岗七档', 1040.00);
-insert into `cmc_user_cost` values (18, '三岗八档', 1120.00);
-insert into `cmc_user_cost` values (19, '四岗一档', 880.00);
-insert into `cmc_user_cost` values (20, '四岗二档', 1020.00);
-insert into `cmc_user_cost` values (21, '四岗三档', 1160.00);
-insert into `cmc_user_cost` values (22, '四岗四档', 1300.00);
-insert into `cmc_user_cost` values (23, '四岗五档', 1440.00);
-insert into `cmc_user_cost` values (24, '四岗六档', 1580.00);
-insert into `cmc_user_cost` values (25, '四岗七档', 1720.00);
-insert into `cmc_user_cost` values (26, '四岗八档', 1860.00);
-insert into `cmc_user_cost` values (27, '五岗一档', 1700.00);
-insert into `cmc_user_cost` values (28, '五岗二档', 1860.00);
-insert into `cmc_user_cost` values (29, '五岗三档', 2020.00);
-insert into `cmc_user_cost` values (30, '五岗四档', 2180.00);
-insert into `cmc_user_cost` values (31, '五岗五档', 2340.00);
-insert into `cmc_user_cost` values (32, '五岗六档', 2500.00);
-insert into `cmc_user_cost` values (33, '五岗七档', 2660.00);
-insert into `cmc_user_cost` values (34, '五岗八档', 2820.00);
-insert into `cmc_user_cost` values (35, '六岗一档', 2640.00);
-insert into `cmc_user_cost` values (36, '六岗二档', 2820.00);
-insert into `cmc_user_cost` values (37, '六岗三档', 3000.00);
-insert into `cmc_user_cost` values (38, '六岗四档', 3180.00);
-insert into `cmc_user_cost` values (39, '六岗五档', 3360.00);
-insert into `cmc_user_cost` values (40, '六岗六档', 3540.00);
-insert into `cmc_user_cost` values (41, '六岗七档', 3720.00);
-insert into `cmc_user_cost` values (42, '六岗八档', 3900.00);
-insert into `cmc_user_cost` values (43, '七岗一档', 3700.00);
-insert into `cmc_user_cost` values (44, '七岗二档', 3900.00);
-insert into `cmc_user_cost` values (45, '七岗三档', 4100.00);
-insert into `cmc_user_cost` values (46, '七岗四档', 4300.00);
-insert into `cmc_user_cost` values (47, '七岗五档', 4500.00);
-insert into `cmc_user_cost` values (48, '七岗六档', 4700.00);
-insert into `cmc_user_cost` values (49, '七岗七档', 4900.00);
-insert into `cmc_user_cost` values (50, '七岗八档', 5100.00);
-insert into `cmc_user_cost` values (51, '八岗一档', 4880.00);
-insert into `cmc_user_cost` values (52, '八岗二档', 5100.00);
-insert into `cmc_user_cost` values (53, '八岗三档', 5320.00);
-insert into `cmc_user_cost` values (54, '八岗四档', 5540.00);
-insert into `cmc_user_cost` values (55, '八岗五档', 5760.00);
-insert into `cmc_user_cost` values (56, '八岗六档', 5980.00);
-insert into `cmc_user_cost` values (57, '八岗七档', 6200.00);
-insert into `cmc_user_cost` values (58, '八岗八档', 6420.00);
+-- 31、cmc岗位工资表
+-- ----------------------------
+drop table if exists `cmc_post_salary`;
+create table `cmc_post_salary`  (
+  `salary_id`		int				not null	auto_increment	comment '成本id',
+  `post_level`		char(1)			default null				comment '岗级',
+  `salary_level`	char(1)			default null				comment '薪档',
+  `salary`			decimal(10, 2)	default null				comment '月薪',
+  primary key (`salary_id`)
+) engine = innodb comment = 'cmc岗位工资表';
+
+-- ----------------------------
+-- 初始化-岗位工资表数据
+-- ----------------------------
+insert into `cmc_post_salary` values (1, '0', '0', 300.00);
+insert into `cmc_post_salary` values (2, '0', '1', 340.00);
+insert into `cmc_post_salary` values (3, '0', '2', 380.00);
+insert into `cmc_post_salary` values (4, '0', '3', 420.00);
+insert into `cmc_post_salary` values (5, '1', '0', 440.00);
+insert into `cmc_post_salary` values (6, '1', '1', 500.00);
+insert into `cmc_post_salary` values (7, '1', '2', 560.00);
+insert into `cmc_post_salary` values (8, '1', '3', 620.00);
+insert into `cmc_post_salary` values (9, '1', '4', 680.00);
+insert into `cmc_post_salary` values (10, '1', '5', 740.00);
+insert into `cmc_post_salary` values (11, '2', '0', 560.00);
+insert into `cmc_post_salary` values (12, '2', '1', 640.00);
+insert into `cmc_post_salary` values (13, '2', '2', 720.00);
+insert into `cmc_post_salary` values (14, '2', '3', 800.00);
+insert into `cmc_post_salary` values (15, '2', '4', 880.00);
+insert into `cmc_post_salary` values (16, '2', '5', 960.00);
+insert into `cmc_post_salary` values (17, '2', '6', 1040.00);
+insert into `cmc_post_salary` values (18, '2', '7', 1120.00);
+insert into `cmc_post_salary` values (19, '3', '0', 880.00);
+insert into `cmc_post_salary` values (20, '3', '1', 1020.00);
+insert into `cmc_post_salary` values (21, '3', '2', 1160.00);
+insert into `cmc_post_salary` values (22, '3', '3', 1300.00);
+insert into `cmc_post_salary` values (23, '3', '4', 1440.00);
+insert into `cmc_post_salary` values (24, '3', '5', 1580.00);
+insert into `cmc_post_salary` values (25, '3', '6', 1720.00);
+insert into `cmc_post_salary` values (26, '3', '7', 1860.00);
+insert into `cmc_post_salary` values (27, '4', '0', 1700.00);
+insert into `cmc_post_salary` values (28, '4', '1', 1860.00);
+insert into `cmc_post_salary` values (29, '4', '2', 2020.00);
+insert into `cmc_post_salary` values (30, '4', '3', 2180.00);
+insert into `cmc_post_salary` values (31, '4', '4', 2340.00);
+insert into `cmc_post_salary` values (32, '4', '5', 2500.00);
+insert into `cmc_post_salary` values (33, '4', '6', 2660.00);
+insert into `cmc_post_salary` values (34, '4', '7', 2820.00);
+insert into `cmc_post_salary` values (35, '5', '0', 2640.00);
+insert into `cmc_post_salary` values (36, '5', '1', 2820.00);
+insert into `cmc_post_salary` values (37, '5', '2', 3000.00);
+insert into `cmc_post_salary` values (38, '5', '3', 3180.00);
+insert into `cmc_post_salary` values (39, '5', '4', 3360.00);
+insert into `cmc_post_salary` values (40, '5', '5', 3540.00);
+insert into `cmc_post_salary` values (41, '5', '6', 3720.00);
+insert into `cmc_post_salary` values (42, '5', '7', 3900.00);
+insert into `cmc_post_salary` values (43, '6', '0', 3700.00);
+insert into `cmc_post_salary` values (44, '6', '1', 3900.00);
+insert into `cmc_post_salary` values (45, '6', '2', 4100.00);
+insert into `cmc_post_salary` values (46, '6', '3', 4300.00);
+insert into `cmc_post_salary` values (47, '6', '4', 4500.00);
+insert into `cmc_post_salary` values (48, '6', '5', 4700.00);
+insert into `cmc_post_salary` values (49, '6', '6', 4900.00);
+insert into `cmc_post_salary` values (50, '6', '7', 5100.00);
+insert into `cmc_post_salary` values (51, '7', '0', 4880.00);
+insert into `cmc_post_salary` values (52, '7', '1', 5100.00);
+insert into `cmc_post_salary` values (53, '7', '2', 5320.00);
+insert into `cmc_post_salary` values (54, '7', '3', 5540.00);
+insert into `cmc_post_salary` values (55, '7', '4', 5760.00);
+insert into `cmc_post_salary` values (56, '7', '5', 5980.00);
+insert into `cmc_post_salary` values (57, '7', '6', 6200.00);
+insert into `cmc_post_salary` values (58, '7', '7', 6420.00);
 
 -- ----------------------------
 -- 31、cmc投标管理表

oa-ui/src/api/oa/staff/salary.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc岗位工资列表
+export function listSalary(query) {
+  return request({
+    url: '/oa/salary/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc岗位工资详细
+export function getSalary(salaryId) {
+  return request({
+    url: '/oa/salary/' + salaryId,
+    method: 'get'
+  })
+}
+
+// 新增cmc岗位工资
+export function addSalary(data) {
+  return request({
+    url: '/oa/salary',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc岗位工资
+export function updateSalary(data) {
+  return request({
+    url: '/oa/salary',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc岗位工资
+export function delSalary(salaryId) {
+  return request({
+    url: '/oa/salary/' + salaryId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/carForm.vue

@@ -1,14 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-14 09:33:02
--->
-<!--
- * @Author: wrh
- * @Date: 2024-02-29 17:24:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-07 13:43:50
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-25 17:24:13
 -->
 
 <template>
@@ -22,15 +16,15 @@
               <!-- 申请人填写 -->
               <el-row :gutter="20">
                 <el-col :span="6" :xs="24">
-                  <el-form-item label="申请人：" prop="user">
+                  <el-form-item label="申请人：" prop="user.nickName">
                     <!-- <el-input v-model="form.user"></el-input> -->
-                    {{ form.user }}
+                    {{ form.user.nickName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
-                  <el-form-item label="所在部门：" prop="deptName">
+                  <el-form-item label="所在部门：" prop="dept.deptName">
                     <!-- <el-input v-model="form.deptName"></el-input> -->
-                    {{ form.deptName }}
+                    {{ form.dept.deptName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -41,8 +35,8 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label="项目编号：" prop="projectNumber" v-if="taskForm.procDefName == '用车审批'">
-                <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject"
+              <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '用车审批'">
+                <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
                   :disabled="taskName != '用车申请'" clearable>
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                     :value="item.projectId">
@@ -50,16 +44,16 @@
                 </el-select>
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="乘车人数：" prop="passengers">
@@ -99,19 +93,22 @@
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"
+                v-if="taskForm.procDefName == '用车审批'">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <!-- 工会审核意见 -->
-              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="taskForm.procDefName == '用车审批（工会）'">
+              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px"
+                v-if="taskForm.procDefName == '用车审批（工会）'">
                 <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
                   :disabled="taskName != '工会审核'">
                 </el-input>
               </el-form-item>
               <!-- 安排用车意见 -->
-              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
+              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px"
+                v-if="taskForm.procDefName == '用车审批'">
                 <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment"
                   :disabled="taskName != '安排用车'">
                 </el-input>
@@ -181,6 +178,8 @@ export default {
     }
   },
   created() {
+    this.form.user.nickName = this.$store.getters.name;
+    this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getCarList();
     this.getDriverList();
@@ -193,9 +192,13 @@ export default {
       form: {
         days: '',
         drivers: [],
-        user: '',
+        user: {
+          nickName: '',
+        },
+        dept: {
+          deptName: '',
+        },
         applyDate: undefined,
-        deptName: '',
         applier: '',
         cars: []
       },
@@ -232,11 +235,12 @@ export default {
     // 初始化表单
     initForm() {
       getCarApproval(this.taskForm.formId).then(res => {
+        console.log(res.data)
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
-          this.form.user = this.$store.getters.name;
+          this.form.user.nickName = this.$store.getters.name;
           this.form.applier = this.$store.getters.userId;
-          this.form.deptName = this.$store.getters.deptName;
+          this.form.dept.deptName = this.$store.getters.deptName;
           this.form.applyDate = new Date();
         }
         else {
@@ -263,6 +267,10 @@ export default {
             data.cars = arr;
           }
           this.form = data;
+          getProject(data.projectId).then(response => {
+            this.chooseProject = response.data;
+            this.isSelect = true
+          })
         }
       })
     },
@@ -326,7 +334,7 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核' || this.taskName == '工会审核') {
-        this.$set(this.taskForm.variables, "approvalList", [8,16]);
+        this.$set(this.taskForm.variables, "approvalList", [8, 16]);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
@@ -415,11 +423,11 @@ export default {
   width: 100px;
   background: #E1F3D8;
 }
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   color: #121212 !important;
 }
 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
-}
-</style>
+}</style>

oa-ui/src/views/flowable/form/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-20 17:05:27
+ * @LastEditTime: 2024-03-25 16:49:48
 -->
 
 <template>
@@ -16,15 +16,15 @@
               <!-- 申请人填写 -->
               <el-row :gutter="20">
                 <el-col :span="6" :xs="24">
-                  <el-form-item label="申请人：" prop="user">
+                  <el-form-item label="申请人：" prop="user.nickName">
                     <!-- <el-input v-model="form.user"></el-input> -->
-                    {{ form.user }}
+                    {{ form.user.nickName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
-                  <el-form-item label="所在部门：" prop="deptName">
+                  <el-form-item label="所在部门：" prop="dept.deptName">
                     <!-- <el-input v-model="form.deptName"></el-input> -->
-                    {{ form.deptName }}
+                    {{ form.dept.deptName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -35,8 +35,8 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label="项目编号：" prop="projectNumber">
-                <el-select v-model="form.projectNumber" filterable allow-create placeholder="请选择"
+              <el-form-item label="项目编号：" prop="projectId">
+                <el-select v-model="form.projectId" filterable allow-create placeholder="请选择"
                   @change="handleSelectProject" clearable :disabled="taskName != '设备申请'">
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                     :value="item.projectId">
@@ -166,8 +166,8 @@ export default {
     }
   },
   created() {
-    this.form.user = this.$store.getters.name;
-    this.form.deptName = this.$store.getters.deptName;
+    this.form.user.nickName = this.$store.getters.name;
+    this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getDeviceList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -177,6 +177,12 @@ export default {
   data() {
     return {
       form: {
+        user: {
+          nickName: '',
+        },
+        dept: {
+          deptName: '',
+        },
         applyDate: new Date(),
         days: ""
       },
@@ -185,7 +191,7 @@ export default {
       flowData: {},
       isSelect: false,
       rules: {
-        projectNumber: [
+        projectId: [
           { required: true, message: '请选择项目编号', trigger: 'change' },
         ],
         passengers: [
@@ -214,18 +220,18 @@ export default {
     // 初始化表单
     initForm() {
       getDeviceApproval(this.taskForm.formId).then(res => {
-        debugger
+        console.log(res.data)
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
-          this.form.user = this.$store.getters.name;
+          this.form.user.nickName = this.$store.getters.name;
           this.form.applier = this.$store.getters.userId;
-          this.form.deptName = this.$store.getters.deptName;
+          this.form.dept.deptName = this.$store.getters.deptName;
           this.form.applyDate = new Date();
         } else {
           this.formTotal = 1;
           let data = res.data;
           this.form = data;
-          getProject(data.projectNumber).then(response => {
+          getProject(data.projectId).then(response => {
             this.chooseProject = response.data;
             this.isSelect = true
           })

oa-ui/src/views/oa/device/expense.vue → oa-ui/src/views/oa/device/approval.vue

@@ -1,397 +1,425 @@
-<template>
-  <div class="app-container">
-    <div class="header">
-      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
-      <h1>{{ '【' + deviceInfo.name + '】' }}设备明细</h1>
-    </div>
-    <el-divider></el-divider>
-    <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="key" class="el-input__icon input-icon" />
-          出厂编号
-        </template>
-        {{ deviceInfo.code }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="dict" class="el-input__icon input-icon" />
-          设备名称
-        </template>
-        {{ deviceInfo.name }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="bug" class="el-input__icon input-icon" />
-          设备类别
-        </template>
-        {{ deviceInfo.type }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
-          购买价格
-        </template>
-        {{ deviceInfo.cost }} 元
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          购置时间
-        </template>
-        {{ parseTime(deviceInfo.acquisitionTime, '{y}-{m}-{d}') }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
-          设备品牌
-        </template>
-        {{ deviceInfo.brand }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          预计使用年限
-        </template>
-        {{ deviceInfo.expectLife }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
-          单日成本
-        </template>
-        {{ deviceInfo.dayCost }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="place" class="el-input__icon input-icon" />
-          存放地点
-        </template>
-        {{ deviceInfo.place }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          校验周期（年）
-        </template>
-        {{ deviceInfo.checkTerm }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          保修期（月）
-        </template>
-        {{ deviceInfo.warranty }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          校验日期
-        </template>
-        {{ parseTime(deviceInfo.checkTime, '{y}-{m}-{d}') }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
-          管理部门
-        </template>
-        {{ deviceInfo.manageDeptName }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
-          备注
-        </template>
-        {{ deviceInfo.remark }}
-      </el-descriptions-item>
-    </el-descriptions>
-    <!-- 费用明细 -->
-    <el-divider></el-divider>
-
-    <el-deviced>
-      <div slot="header" class="clearfix">
-        <h3>设备使用记录</h3>
-      </div>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-            @click="handleUpdate">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-            @click="handleDelete">删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-        </el-col>
-      </el-row>
-      <!-- 设备使用记录 -->
-      <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column type="index" width="55" align="center" label="序号" />
-        <el-table-column label="项目编号" align="center" prop="projectNumber">
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" prop="projectName">
-          <template slot-scope="scope">
-            {{ scope.row.projectName }}
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" align="center" prop="beginDate">
-          <template slot-scope="scope">
-            {{ scope.row.beginDate }}
-          </template>
-        </el-table-column>
-        <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.returnDate }}
-          </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:deviceApproval:edit']">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['oa:deviceApproval: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-deviced>
-    <!-- 添加明细 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="费用类型" prop="expenseType">
-          <el-select v-model="form.expenseType" placeholder="请选择" clearable>
-            <el-option label="保险费" value="0"></el-option>
-            <el-option label="维修/保养费" value="1"></el-option>
-            <el-option label="轮胎费" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" style="width:150px" /> <el-tag>元</el-tag>
-        </el-form-item>
-        <el-form-item label="发生日期" prop="occurDate">
-          <el-date-picker clearable v-model="form.occurDate" 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 { getDevice } from '@/api/oa/device/device.js'
-import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
-export default {
-  data() {
-    let validateApproval = (rule, value, callback) => {
-      setTimeout(() => {
-        if (!value) {
-          return callback(new Error('请输入金额'));
-        }
-        if (!this.isNumber(Number(value))) {
-          callback(new Error('请输入数字值'));
-        } else {
-          callback();
-        }
-      }, 100)
-    }
-    return {
-      column: 4,
-      deviceInfo: {},
-      expenseList: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      total: 0,
-      multiple: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      title: '',
-      open: false,
-      form: {},
-      rules: {
-        expenseType: [
-          { required: true, message: '请选择费用类型', trigger: 'change' }
-        ],
-        expense: [
-          { validator: validateApproval, required: true, trigger: 'blur' },
-        ],
-        occurDate: [
-          { required: true, message: '请选择发生日期', trigger: 'change' },
-        ],
-      },
-      loading: false
-    }
-  },
-  created() {
-    if (this.$route.query) {
-      getDevice(this.$route.query.deviceId).then(res => {
-        console.log(res);
-        this.deviceInfo = res.data;
-      })
-      this.getList();
-    }
-    if (this.$store.state.app.device == 'desktop') {
-
-    } else {
-      this.column = 1
-    }
-  },
-  methods: {
-    getList() {
-      this.queryParams.devices = this.$route.query.deviceId
-      listDeviceApproval(this.queryParams).then(res => {
-        console.log(res);
-        this.expenseList = res.rows;
-        this.total = res.total;
-      })
-    },
-    goBack() {
-      let obj = { path: "/device/expense" }
-      this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/device' });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceApprovalId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加车辆明细";
-    },
-    handleUpdate(row) {
-      this.reset();
-      const deviceApprovalId = row.deviceApprovalId || this.ids
-      getDeviceApproval(deviceApprovalId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改车辆明细";
-      });
-    },
-    handleDelete(row) {
-      debugger
-      const deviceApprovalIds = row.deviceApprovalId || this.ids;
-      this.$modal.confirm('是否确认删除车辆费用编号为"' + deviceApprovalIds + '"的数据项？').then(function () {
-        return delDeviceApproval(deviceApprovalIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    handleExport() {
-      this.download('oa/deviceApproval/export', {
-        ...this.queryParams
-      }, `deviceApproval_${new Date().getTime()}.xlsx`)
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deviceApprovalId: null,
-        deviceId: null,
-        expenseType: null,
-        expense: null,
-        occurDate: null
-      };
-      this.resetForm("expenseForm");
-    },
-    submitForm() {
-      this.$refs["expenseForm"].validate(valid => {
-        if (valid) {
-          this.form.deviceId = this.$route.query.deviceId
-          if (this.form.deviceApprovalId != null) {
-            updateDeviceApproval(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDeviceApproval(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    isNumber(value) {
-      return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
-    },
-    expenseTypeText(row) {
-      if (row == '0') {
-        return '保险费'
-      }
-      if (row == '1') {
-        return '维修/保养费'
-      }
-      if (row == '2') {
-        return '轮胎费'
-      }
-    },
-    typeStyle(row) {
-      if (row == '0') {
-        return 'primary'
-      }
-      if (row == '1') {
-        return 'warning'
-      }
-      if (row == '2') {
-        return 'success'
-      }
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.header {
-  position: relative;
-  text-align: center;
-
-  .back {
-    position: absolute;
-    left: 12px;
-    top: -10px;
-  }
-}
-
-.descriptions {
-  padding: 20px 50px;
-}
-
-
-::v-deep .el-descriptions-item__label.is-bordered-label {
-  color: #121212;
-  background: rgba($color: #46a6ff, $alpha: 0.1);
-  width: 200px;
-}
-
-::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
-  border: 1px solid #2d3f62;
-}
+<template>
+  <div class="app-container">
+    <div class="header">
+      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
+      <h1>{{ '【' + deviceInfo.name + '】' }}设备明细</h1>
+    </div>
+    <el-divider></el-divider>
+    <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="key" class="el-input__icon input-icon" />
+          出厂编号
+        </template>
+        {{ deviceInfo.code }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="dict" class="el-input__icon input-icon" />
+          设备名称
+        </template>
+        {{ deviceInfo.name }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="bug" class="el-input__icon input-icon" />
+          设备类别
+        </template>
+        {{ deviceInfo.type }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          购买价格
+        </template>
+        {{ deviceInfo.cost }} 元
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          购置时间
+        </template>
+        {{ parseTime(deviceInfo.acquisitionTime, '{y}-{m}-{d}') }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
+          设备品牌
+        </template>
+        {{ deviceInfo.brand }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          预计使用年限
+        </template>
+        {{ deviceInfo.expectLife }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          单日成本
+        </template>
+        {{ deviceInfo.dayCost }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="place" class="el-input__icon input-icon" />
+          存放地点
+        </template>
+        {{ deviceInfo.place }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          校验周期（年）
+        </template>
+        {{ deviceInfo.checkTerm }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          保修期（月）
+        </template>
+        {{ deviceInfo.warranty }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          校验日期
+        </template>
+        {{ parseTime(deviceInfo.checkTime, '{y}-{m}-{d}') }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
+          管理部门
+        </template>
+        {{ deviceInfo.manageDeptName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
+          备注
+        </template>
+        {{ deviceInfo.remark }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <!-- 费用明细 -->
+    <el-divider></el-divider>
+
+    <el-deviced>
+      <div slot="header" class="clearfix">
+        <h3>设备使用记录</h3>
+      </div>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+            @click="handleUpdate">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+            @click="handleDelete">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+        </el-col>
+      </el-row>
+      <!-- 设备使用记录 -->
+      <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" width="55" align="center" label="序号" />
+        <el-table-column label="申请人" align="center" prop="user.nickName">
+          <template slot-scope="scope">
+            {{ scope.row.user ? scope.row.user.nickName : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="使用部门" align="center" prop="dept.deptName">
+          <template slot-scope="scope">
+            {{ scope.row.dept ? scope.row.dept.deptName : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" align="center" prop="project.projectNumber">
+          <template slot-scope="scope">
+            {{ scope.row.project ? scope.row.project.projectNumber : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center" prop="project.projectName">
+          <template slot-scope="scope">
+            {{ scope.row.project ? scope.row.project.projectName : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" align="center" prop="beginDate">
+          <template slot-scope="scope">
+            {{ scope.row.beginDate }}
+          </template>
+        </el-table-column>
+        <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
+          <template slot-scope="scope">
+            {{ scope.row.returnDate }}
+          </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:deviceApproval:edit']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['oa:deviceApproval: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-deviced>
+    <!-- 添加明细 -->
+    <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="申请人" prop="applier">
+          <el-input v-model="form.applier" placeholder="请输入申请人" />
+        </el-form-item>
+        <el-form-item label="使用部门" prop="useDept">
+          <el-input v-model="form.useDept" placeholder="请输入使用部门" />
+        </el-form-item>
+        <el-form-item label="设备id" prop="devices">
+          <el-input v-model="form.devices" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="申领事由" prop="applyReason">
+          <el-input v-model="form.applyReason" placeholder="请输入申领事由" />
+        </el-form-item>
+        <el-form-item label="开始日期" prop="beginDate">
+          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期" prop="endDate">
+          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="天数" prop="days">
+          <el-input v-model="form.days" placeholder="请输入天数" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applyDate">
+          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="归还日期" prop="returnDate">
+          <el-date-picker clearable v-model="form.returnDate" 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 { getDevice } from '@/api/oa/device/device.js'
+import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
+export default {
+  data() {
+    let validateApproval = (rule, value, callback) => {
+      setTimeout(() => {
+        if (!value) {
+          return callback(new Error('请输入金额'));
+        }
+        if (!this.isNumber(Number(value))) {
+          callback(new Error('请输入数字值'));
+        } else {
+          callback();
+        }
+      }, 100)
+    }
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备审批表格数据
+      approvalList: [],
+      column: 4,
+      deviceInfo: {},
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      getDevice(this.$route.query.deviceId).then(res => {
+        console.log(res);
+        this.deviceInfo = res.data;
+      })
+      this.getList();
+    }
+    if (this.$store.state.app.device == 'desktop') {
+
+    } else {
+      this.column = 1
+    }
+  },
+  methods: {
+    getList() {
+      this.queryParams.devices = this.$route.query.deviceId
+      listDeviceApproval(this.queryParams).then(res => {
+        console.log(res);
+        this.approvalList = res.rows;
+        this.total = res.total;
+      })
+    },
+    goBack() {
+      let obj = { path: "/device/expense" }
+      this.$tab.closeOpenPage(obj);
+      this.$router.push({ path: '/device' });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.deviceApprovalId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备使用明细";
+    },
+    handleUpdate(row) {
+      this.reset();
+      const deviceApplyId = row.deviceApplyId || this.ids
+      getDeviceApproval(deviceApplyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备使用明细";
+      });
+    },
+    handleDelete(row) {
+      debugger
+      const deviceApprovalIds = row.deviceApprovalId || this.ids;
+      this.$modal.confirm('是否确认删除设备使用费用编号为"' + deviceApprovalIds + '"的数据项？').then(function () {
+        return delDeviceApproval(deviceApprovalIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    handleExport() {
+      this.download('oa/deviceApproval/export', {
+        ...this.queryParams
+      }, `deviceApproval_${new Date().getTime()}.xlsx`)
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceApplyId: null,
+        applier: null,
+        useDept: null,
+        devices: null,
+        projectId: null,
+        applyReason: null,
+        beginDate: null,
+        beginHalfday: null,
+        endDate: null,
+        endHalfday: null,
+        days: null,
+        deptUserId: null,
+        deptComment: null,
+        managerUserId: null,
+        managerComment: null,
+        dispatcher: null,
+        dispatchComment: null,
+        estimateCost: null,
+        applyDate: null,
+        returnDate: null
+      };
+      this.resetForm("form");
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.deviceId = this.$route.query.deviceId
+          if (this.form.deviceApprovalId != null) {
+            updateDeviceApproval(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceApproval(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isNumber(value) {
+      return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  position: relative;
+  text-align: center;
+
+  .back {
+    position: absolute;
+    left: 12px;
+    top: -10px;
+  }
+}
+
+.descriptions {
+  padding: 20px 50px;
+}
+
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #121212;
+  background: rgba($color: #46a6ff, $alpha: 0.1);
+  width: 200px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #2d3f62;
+}
 </style>

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

@@ -59,7 +59,7 @@
       <el-table-column label="校验周期（年）" align="center" prop="checkTerm" />
       <el-table-column label="保修期（月）" align="center" prop="warranty" />
       <el-table-column label="校验日期" align="center" prop="checkTime" />
-      <el-table-column label="管理部门" align="center" prop="manageDeptName" />
+      <el-table-column label="管理部门" align="center" prop="dept.deptName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
@@ -166,8 +166,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="管理部门" prop="manageDeptName">
-              <el-input v-model="form.manageDeptName" placeholder="请输入管理部门" />
+            <el-form-item label="管理部门" prop="dept.deptName">
+              <el-input v-model="form.deptName" placeholder="请输入管理部门" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -288,7 +288,7 @@ export default {
     handleAddDetail(row) {
       console.log(row);
       this.$router.push({
-        path: '/device/expense',
+        path: '/device/approval',
         query: {
           deviceId: row.deviceId,
         }

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

@@ -90,10 +90,10 @@
             <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="固定成本(天)" align="center" key="costDay" prop="costDay" v-if="columns[2].visible"
+        <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" v-if="columns[2].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
-
+            {{ scope.row.salary ? scope.row.salary.salary : "" }}
           </template>
         </el-table-column>
         <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
@@ -236,7 +236,6 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

oa-ui/src/views/oa/staff/salary.vue

@@ -0,0 +1,234 @@
+<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="岗级" prop="postLevel">
+        <el-input v-model="queryParams.postLevel" placeholder="请输入岗级" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="薪档" prop="salaryLevel">
+        <el-input v-model="queryParams.salaryLevel" placeholder="请输入薪档" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="月薪" prop="salary">
+        <el-input v-model="queryParams.salary" placeholder="请输入月薪" clearable @keyup.enter.native="handleQuery" />
+      </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:salary: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:salary: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:salary: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:salary:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="salaryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="成本id" align="center" prop="salaryId" />
+      <el-table-column label="岗级" align="center" prop="postLevel">
+        <template slot-scope="scope">
+          {{ formatLevel(scope.row.postLevel, dict.type.sys_user_postlevel) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="薪档" align="center" prop="salaryLevel">
+        <template slot-scope="scope">
+          {{ formatLevel(scope.row.salaryLevel, dict.type.sys_user_salarylevel) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="月薪" align="center" prop="salary" />
+      <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:salary:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:salary: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" />
+
+    <!-- 添加或修改cmc岗位工资对话框 -->
+    <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="岗级" prop="postLevel">
+          <el-input v-model="form.postLevel" placeholder="请输入岗级" />
+        </el-form-item>
+        <el-form-item label="薪档" prop="salaryLevel">
+          <el-input v-model="form.salaryLevel" placeholder="请输入薪档" />
+        </el-form-item>
+        <el-form-item label="月薪" prop="salary">
+          <el-input v-model="form.salary" placeholder="请输入月薪" />
+        </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 { listSalary, getSalary, delSalary, addSalary, updateSalary } from "@/api/oa/staff/salary";
+
+export default {
+  name: "Salary",
+  dicts: ['sys_user_postlevel', 'sys_user_salarylevel'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc岗位工资表格数据
+      salaryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        postLevel: null,
+        salaryLevel: null,
+        salary: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc岗位工资列表 */
+    getList() {
+      this.loading = true;
+      listSalary(this.queryParams).then(response => {
+        this.salaryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        salaryId: null,
+        postLevel: null,
+        salaryLevel: null,
+        salary: 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.salaryId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc岗位工资";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const salaryId = row.salaryId || this.ids
+      getSalary(salaryId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc岗位工资";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.salaryId != null) {
+            updateSalary(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSalary(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const salaryIds = row.salaryId || this.ids;
+      this.$modal.confirm('是否确认删除cmc岗位工资编号为"' + salaryIds + '"的数据项？').then(function () {
+        return delSalary(salaryIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/salary/export', {
+        ...this.queryParams
+      }, `salary_${new Date().getTime()}.xlsx`)
+    },
+    formatLevel(level, levelList) {
+      if (level) {
+        let levelLabel = levelList[level].label
+        return levelLabel
+      } else {
+        return ''
+      }
+    },
+  }
+};
+</script>