权限菜单

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

@@ -109,6 +109,6 @@ public class CmcArchiveController extends BaseController
 	@DeleteMapping("/{archiveIds}")
     public AjaxResult remove(@PathVariable String[] archiveIds)
     {
-        return toAjax(cmcArchiveService.deleteCmcArchiveByArchiveIds(archiveIds));
+        return success(cmcArchiveService.deleteCmcArchiveByArchiveIds(archiveIds));
     }
 }

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

@@ -346,6 +346,6 @@ public class CmcAssessController extends BaseController
 	@DeleteMapping("/{assessIds}")
     public AjaxResult remove(@PathVariable String[] assessIds)
     {
-        return toAjax(cmcAssessService.deleteCmcAssessByAssessIds(assessIds));
+        return success(cmcAssessService.deleteCmcAssessByAssessIds(assessIds));
     }
 }

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

@@ -117,6 +117,6 @@ public class CmcBorrowController extends BaseController
 	@DeleteMapping("/{borrowIds}")
     public AjaxResult remove(@PathVariable String[] borrowIds)
     {
-        return toAjax(cmcBorrowService.deleteCmcBorrowByBorrowIds(borrowIds));
+        return success(cmcBorrowService.deleteCmcBorrowByBorrowIds(borrowIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcBorrowDetailController extends BaseController
 	@DeleteMapping("/{borrowIds}")
     public AjaxResult remove(@PathVariable String[] borrowIds)
     {
-        return toAjax(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowIds(borrowIds));
+        return success(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowIds(borrowIds));
     }
 }

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

@@ -95,6 +95,6 @@ public class CmcBrandController extends BaseController
 	@DeleteMapping("/{brandIds}")
     public AjaxResult remove(@PathVariable String[] brandIds)
     {
-        return toAjax(cmcBrandService.deleteCmcBrandByBrandIds(brandIds));
+        return success(cmcBrandService.deleteCmcBrandByBrandIds(brandIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcBrandPaymentController extends BaseController
 	@DeleteMapping("/{brandIds}")
     public AjaxResult remove(@PathVariable String[] brandIds)
     {
-        return toAjax(cmcBrandPaymentService.deleteCmcBrandPaymentByBrandIds(brandIds));
+        return success(cmcBrandPaymentService.deleteCmcBrandPaymentByBrandIds(brandIds));
     }
 }

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

@@ -86,7 +86,7 @@ public class CmcBrandProjectController extends BaseController
     {
         if (!cmcBrandProject.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
             CmcPartner cmcPartner = new CmcPartner();
-            cmcPartner.setPartnerId(new SnowFlake().generateId());
+            cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
             cmcPartner.setPartnerName(cmcBrandProject.getPartnerId());
             cmcPartner.setTelephone(cmcBrandProject.getTelephone());
             cmcPartner.setContactPerson(cmcBrandProject.getContactPerson());
@@ -95,7 +95,7 @@ public class CmcBrandProjectController extends BaseController
         }
         if (!cmcBrandProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
             CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
             cmcPartyA.setPartyAName(cmcBrandProject.getPartnerId());
             cmcPartyAService.insertCmcPartyA(cmcPartyA);
             cmcBrandProject.setPartyAId(cmcPartyA.getPartyAId());
@@ -121,6 +121,6 @@ public class CmcBrandProjectController extends BaseController
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return toAjax(cmcBrandProjectService.deleteCmcBrandProjectByProjectIds(projectIds));
+        return success(cmcBrandProjectService.deleteCmcBrandProjectByProjectIds(projectIds));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcBrandProjectProgressController extends BaseController
 	@DeleteMapping("/{progressIds}")
     public AjaxResult remove(@PathVariable Long[] progressIds)
     {
-        return toAjax(cmcBrandProjectProgressService.deleteCmcBrandProjectProgressByProgressIds(progressIds));
+        return success(cmcBrandProjectProgressService.deleteCmcBrandProjectProgressByProgressIds(progressIds));
     }
 }

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

@@ -95,6 +95,6 @@ public class CmcBudgetCarController extends BaseController
 	@DeleteMapping("/{budgetCarIds}")
     public AjaxResult remove(@PathVariable String[] budgetCarIds)
     {
-        return toAjax(cmcBudgetCarService.deleteCmcBudgetCarByBudgetIds(budgetCarIds));
+        return success(cmcBudgetCarService.deleteCmcBudgetCarByBudgetIds(budgetCarIds));
     }
 }

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

@@ -89,6 +89,6 @@ public class CmcBudgetController extends BaseController
 	@DeleteMapping("/{budgetIds}")
     public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetService.deleteCmcBudgetByBudgetIds(budgetIds));
+        return success(cmcBudgetService.deleteCmcBudgetByBudgetIds(budgetIds));
     }
 }

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

@@ -95,6 +95,6 @@ public class CmcBudgetDeviceController extends BaseController
 	@DeleteMapping("/{budgetIds}")
     public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetDeviceService.deleteCmcBudgetDeviceByBudgetIds(budgetIds));
+        return success(cmcBudgetDeviceService.deleteCmcBudgetDeviceByBudgetIds(budgetIds));
     }
 }

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

@@ -95,6 +95,6 @@ public class CmcBudgetSettleController extends BaseController
 	@DeleteMapping("/{budgetIds}")
     public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetSettleService.deleteCmcBudgetSettleByBudgetIds(budgetIds));
+        return success(cmcBudgetSettleService.deleteCmcBudgetSettleByBudgetIds(budgetIds));
     }
 }

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

@@ -95,6 +95,6 @@ public class CmcBudgetStaffController extends BaseController
 	@DeleteMapping("/{budgetIds}")
     public AjaxResult remove(@PathVariable String[] budgetIds)
     {
-        return toAjax(cmcBudgetStaffService.deleteCmcBudgetStaffByBudgetIds(budgetIds));
+        return success(cmcBudgetStaffService.deleteCmcBudgetStaffByBudgetIds(budgetIds));
     }
 }

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

@@ -149,6 +149,6 @@ public class CmcCarApprovalController extends BaseController
 	@DeleteMapping("/{carApplyIds}")
     public AjaxResult remove(@PathVariable String[] carApplyIds)
     {
-        return toAjax(cmcCarApprovalService.deleteCmcCarApprovalByCarApplyIds(carApplyIds));
+        return success(cmcCarApprovalService.deleteCmcCarApprovalByCarApplyIds(carApplyIds));
     }
 }

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

@@ -114,6 +114,6 @@ public class CmcCarController extends BaseController
 	@DeleteMapping("/{carIds}")
     public AjaxResult remove(@PathVariable Long[] carIds)
     {
-        return toAjax(cmcCarService.deleteCmcCarByCarIds(carIds));
+        return success(cmcCarService.deleteCmcCarByCarIds(carIds));
     }
 }

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

@@ -1,100 +0,0 @@
-package com.ruoyi.web.controller.oa;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.utils.SnowFlake;
-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.CmcCarExpense;
-import com.ruoyi.oa.service.ICmcCarExpenseService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * cmc车辆费用Controller
- * 
- * @author cmc
- * @date 2024-03-12
- */
-@RestController
-@RequestMapping("/oa/carExpense")
-public class CmcCarExpenseController extends BaseController
-{
-    @Autowired
-    private ICmcCarExpenseService cmcCarExpenseService;
-
-    /**
-     * 查询cmc车辆费用列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(CmcCarExpense cmcCarExpense)
-    {
-        startPage();
-        List<CmcCarExpense> list = cmcCarExpenseService.selectCmcCarExpenseList(cmcCarExpense);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出cmc车辆费用列表
-     */
-    @Log(title = "cmc车辆费用", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcCarExpense cmcCarExpense)
-    {
-        List<CmcCarExpense> list = cmcCarExpenseService.selectCmcCarExpenseList(cmcCarExpense);
-        ExcelUtil<CmcCarExpense> util = new ExcelUtil<CmcCarExpense>(CmcCarExpense.class);
-        util.exportExcel(response, list, "cmc车辆费用数据");
-    }
-
-    /**
-     * 获取cmc车辆费用详细信息
-     */
-    @GetMapping(value = "/{carExpenseId}")
-    public AjaxResult getInfo(@PathVariable("carExpenseId") String carExpenseId)
-    {
-        return success(cmcCarExpenseService.selectCmcCarExpenseByCarExpenseId(carExpenseId));
-    }
-
-    /**
-     * 新增cmc车辆费用
-     */
-    @Log(title = "cmc车辆费用", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CmcCarExpense cmcCarExpense)
-    {
-        cmcCarExpense.setCarExpenseId(new SnowFlake().generateId());
-        return toAjax(cmcCarExpenseService.insertCmcCarExpense(cmcCarExpense));
-    }
-
-    /**
-     * 修改cmc车辆费用
-     */
-    @Log(title = "cmc车辆费用", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CmcCarExpense cmcCarExpense)
-    {
-        return toAjax(cmcCarExpenseService.updateCmcCarExpense(cmcCarExpense));
-    }
-
-    /**
-     * 删除cmc车辆费用
-     */
-    @Log(title = "cmc车辆费用", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{carExpenseIds}")
-    public AjaxResult remove(@PathVariable String[] carExpenseIds)
-    {
-        return toAjax(cmcCarExpenseService.deleteCmcCarExpenseByCarExpenseIds(carExpenseIds));
-    }
-}

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

@@ -98,6 +98,6 @@ public class CmcContractCommentController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractCommentService.deleteCmcContractCommentByContractIds(contractIds));
+        return success(cmcContractCommentService.deleteCmcContractCommentByContractIds(contractIds));
     }
 }

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

@@ -97,6 +97,6 @@ public class CmcContractController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractService.deleteCmcContractByContractIds(contractIds));
+        return success(cmcContractService.deleteCmcContractByContractIds(contractIds));
     }
 }

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

@@ -71,7 +71,6 @@ public class CmcContractMeetingController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcContractMeeting cmcContractMeeting = new CmcContractMeeting();
-        cmcContractMeeting.setMeetingId(new SnowFlake().generateId());
         cmcContractMeeting.setContractId(formDataJson.getString("contractId"));
         cmcContractMeeting.setMeetingTime(formDataJson.getDate("meetingTime"));
         cmcContractMeeting.setPlace(formDataJson.getString("place"));
@@ -105,6 +104,6 @@ public class CmcContractMeetingController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractMeetingService.deleteCmcContractMeetingByContractIds(contractIds));
+        return success(cmcContractMeetingService.deleteCmcContractMeetingByContractIds(contractIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcContractPaymentController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractPaymentService.deleteCmcContractPaymentByContractIds(contractIds));
+        return success(cmcContractPaymentService.deleteCmcContractPaymentByContractIds(contractIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcContractWorkController extends BaseController
 	@DeleteMapping("/{contractIds}")
     public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractWorkService.deleteCmcContractWorkByContractIds(contractIds));
+        return success(cmcContractWorkService.deleteCmcContractWorkByContractIds(contractIds));
     }
 }

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

@@ -103,6 +103,6 @@ public class CmcDepositController extends BaseController
 	@DeleteMapping("/{depositIds}")
     public AjaxResult remove(@PathVariable String[] depositIds)
     {
-        return toAjax(cmcDepositService.deleteCmcDepositByDepositIds(depositIds));
+        return success(cmcDepositService.deleteCmcDepositByDepositIds(depositIds));
     }
 }

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

@@ -184,6 +184,6 @@ public class CmcDeviceApprovalController extends BaseController
 	@DeleteMapping("/{deviceApplyIds}")
     public AjaxResult remove(@PathVariable String[] deviceApplyIds)
     {
-        return toAjax(cmcDeviceApprovalService.deleteCmcDeviceApprovalByDeviceApplyIds(deviceApplyIds));
+        return success(cmcDeviceApprovalService.deleteCmcDeviceApprovalByDeviceApplyIds(deviceApplyIds));
     }
 }

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

@@ -121,6 +121,6 @@ public class CmcDeviceController extends BaseController
 	@DeleteMapping("/{deviceIds}")
     public AjaxResult remove(@PathVariable Long[] deviceIds)
     {
-        return toAjax(cmcDeviceService.deleteCmcDeviceByDeviceIds(deviceIds));
+        return success(cmcDeviceService.deleteCmcDeviceByDeviceIds(deviceIds));
     }
 }

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

@@ -4,6 +4,10 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcCar;
+import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.oa.service.ICmcDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -62,7 +66,7 @@ public class CmcDeviceExpenseController extends BaseController
      * 获取cmc仪器费用详细信息
      */
     @GetMapping(value = "/{deviceExpenseId}")
-    public AjaxResult getInfo(@PathVariable("deviceExpenseId") String deviceExpenseId)
+    public AjaxResult getInfo(@PathVariable("deviceExpenseId") Integer deviceExpenseId)
     {
         return success(cmcDeviceExpenseService.selectCmcDeviceExpenseByDeviceExpenseId(deviceExpenseId));
     }
@@ -74,7 +78,12 @@ public class CmcDeviceExpenseController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceExpense cmcDeviceExpense)
     {
-        cmcDeviceExpense.setDeviceExpenseId(new SnowFlake().generateId());
+        if (cmcDeviceExpense.getDeviceId() != null && cmcDeviceExpense.getCarId() == null) {
+            cmcDeviceExpense.setCarId(0);
+        }
+        if (cmcDeviceExpense.getCarId() != null && cmcDeviceExpense.getDeviceId() == null) {
+            cmcDeviceExpense.setDeviceId(0);
+        }
         return toAjax(cmcDeviceExpenseService.insertCmcDeviceExpense(cmcDeviceExpense));
     }
 
@@ -93,8 +102,8 @@ public class CmcDeviceExpenseController extends BaseController
      */
     @Log(title = "cmc仪器费用", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceExpenseIds}")
-    public AjaxResult remove(@PathVariable String[] deviceExpenseIds)
+    public AjaxResult remove(@PathVariable Integer[] deviceExpenseIds)
     {
-        return toAjax(cmcDeviceExpenseService.deleteCmcDeviceExpenseByDeviceExpenseIds(deviceExpenseIds));
+        return success(cmcDeviceExpenseService.deleteCmcDeviceExpenseByDeviceExpenseIds(deviceExpenseIds));
     }
 }

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

@@ -62,7 +62,7 @@ public class CmcDeviceHandoverController extends BaseController
      * 获取cmc设备移交详细信息
      */
     @GetMapping(value = "/{deviceHandoverId}")
-    public AjaxResult getInfo(@PathVariable("deviceHandoverId") String deviceHandoverId)
+    public AjaxResult getInfo(@PathVariable("deviceHandoverId") Integer deviceHandoverId)
     {
         return success(cmcDeviceHandoverService.selectCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId));
     }
@@ -74,7 +74,6 @@ public class CmcDeviceHandoverController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceHandover cmcDeviceHandover)
     {
-        cmcDeviceHandover.setDeviceHandoverId(new SnowFlake().generateId());
         return toAjax(cmcDeviceHandoverService.insertCmcDeviceHandover(cmcDeviceHandover));
     }
 
@@ -93,8 +92,8 @@ public class CmcDeviceHandoverController extends BaseController
      */
     @Log(title = "cmc设备移交", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceHandoverIds}")
-    public AjaxResult remove(@PathVariable String[] deviceHandoverIds)
+    public AjaxResult remove(@PathVariable Integer[] deviceHandoverIds)
     {
-        return toAjax(cmcDeviceHandoverService.deleteCmcDeviceHandoverByDeviceHandoverIds(deviceHandoverIds));
+        return success(cmcDeviceHandoverService.deleteCmcDeviceHandoverByDeviceHandoverIds(deviceHandoverIds));
     }
 }

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

@@ -72,7 +72,7 @@ public class CmcDeviceScrapController extends BaseController
      * 获取cmc设备报废详细信息
      */
     @GetMapping(value = "/{deviceScrapId}")
-    public AjaxResult getInfo(@PathVariable("deviceScrapId") String deviceScrapId)
+    public AjaxResult getInfo(@PathVariable("deviceScrapId") Integer deviceScrapId)
     {
         return success(cmcDeviceScrapService.selectCmcDeviceScrapByDeviceScrapId(deviceScrapId));
     }
@@ -84,13 +84,14 @@ public class CmcDeviceScrapController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceScrap cmcDeviceScrap)
     {
-        cmcDeviceScrap.setDeviceScrapId(new SnowFlake().generateId());
-        if (cmcDeviceScrap.getDeviceId() != null) {
+        if (cmcDeviceScrap.getDeviceId() != null && cmcDeviceScrap.getCarId() == null) {
+            cmcDeviceScrap.setCarId(0);
             CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(cmcDeviceScrap.getDeviceId());
             cmcDevice.setStatus("4");
             cmcDeviceService.updateCmcDevice(cmcDevice);
         }
-        if (cmcDeviceScrap.getCarId() != null) {
+        if (cmcDeviceScrap.getCarId() != null && cmcDeviceScrap.getDeviceId() == null) {
+            cmcDeviceScrap.setDeviceId(0);
             CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(cmcDeviceScrap.getCarId());
             cmcCar.setStatus("4");
             cmcCarService.updateCmcCar(cmcCar);
@@ -113,8 +114,8 @@ public class CmcDeviceScrapController extends BaseController
      */
     @Log(title = "cmc设备报废", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceScrapIds}")
-    public AjaxResult remove(@PathVariable String[] deviceScrapIds)
+    public AjaxResult remove(@PathVariable Integer[] deviceScrapIds)
     {
-        return toAjax(cmcDeviceScrapService.deleteCmcDeviceScrapByDeviceScrapIds(deviceScrapIds));
+        return success(cmcDeviceScrapService.deleteCmcDeviceScrapByDeviceScrapIds(deviceScrapIds));
     }
 }

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

@@ -74,7 +74,7 @@ public class CmcPartnerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcPartner cmcPartner)
     {
-        cmcPartner.setPartnerId(new SnowFlake().generateId());
+        cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
         return toAjax(cmcPartnerService.insertCmcPartner(cmcPartner));
     }
 
@@ -95,6 +95,6 @@ public class CmcPartnerController extends BaseController
 	@DeleteMapping("/{partnerIds}")
     public AjaxResult remove(@PathVariable String[] partnerIds)
     {
-        return toAjax(cmcPartnerService.deleteCmcPartnerByPartnerIds(partnerIds));
+        return success(cmcPartnerService.deleteCmcPartnerByPartnerIds(partnerIds));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcPartyAController extends BaseController
 	@DeleteMapping("/{partyAIds}")
     public AjaxResult remove(@PathVariable String[] partyAIds)
     {
-        return toAjax(cmcPartyAService.deleteCmcPartyAByPartyAIds(partyAIds));
+        return success(cmcPartyAService.deleteCmcPartyAByPartyAIds(partyAIds));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcPostSalaryController extends BaseController
 	@DeleteMapping("/{salaryIds}")
     public AjaxResult remove(@PathVariable Integer[] salaryIds)
     {
-        return toAjax(cmcPostSalaryService.deleteCmcPostSalaryBySalaryIds(salaryIds));
+        return success(cmcPostSalaryService.deleteCmcPostSalaryBySalaryIds(salaryIds));
     }
 }

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

@@ -183,6 +183,6 @@ public class CmcPriceController extends BaseController
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(cmcPriceService.deleteCmcPriceByIds(ids));
+        return success(cmcPriceService.deleteCmcPriceByIds(ids));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcProjectChangeController extends BaseController
 	@DeleteMapping("/{changeIds}")
     public AjaxResult remove(@PathVariable Long[] changeIds)
     {
-        return toAjax(cmcProjectChangeService.deleteCmcProjectChangeByChangeIds(changeIds));
+        return success(cmcProjectChangeService.deleteCmcProjectChangeByChangeIds(changeIds));
     }
 }

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

@@ -125,6 +125,6 @@ public class CmcProjectCommentController extends BaseController
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return toAjax(cmcProjectCommentService.deleteCmcProjectCommentByProjectIds(projectIds));
+        return success(cmcProjectCommentService.deleteCmcProjectCommentByProjectIds(projectIds));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcProjectContractController extends BaseController
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return toAjax(cmcProjectContractService.deleteCmcProjectContractByProjectIds(projectIds));
+        return success(cmcProjectContractService.deleteCmcProjectContractByProjectIds(projectIds));
     }
 }

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

@@ -127,7 +127,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setIsFinished("0");
         if (!cmcProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
             CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
             cmcPartyA.setPartyAName(cmcProject.getPartyAId());
             cmcPartyAService.insertCmcPartyA(cmcPartyA);
             cmcProject.setPartyAId(cmcPartyA.getPartyAId());
@@ -153,6 +153,6 @@ public class CmcProjectController extends BaseController
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
         cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectIds);
-        return toAjax(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
+        return success(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcProjectProgressController extends BaseController
 	@DeleteMapping("/{projectIds}")
     public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProjectIds(projectIds));
+        return success(cmcProjectProgressService.deleteCmcProjectProgressByProjectIds(projectIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcProjectWorkController extends BaseController
 	@DeleteMapping("/{projectId}")
     public AjaxResult remove(@PathVariable String[] projectId)
     {
-        return toAjax(cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectId));
+        return success(cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectId));
     }
 }

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

@@ -1,97 +0,0 @@
-package com.ruoyi.web.controller.oa;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcProjectWorker;
-import com.ruoyi.oa.service.ICmcProjectWorkerService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * cmc项目人员Controller
- * 
- * @author cmc
- * @date 2024-03-26
- */
-@RestController
-@RequestMapping("/oa/projectWorker")
-public class CmcProjectWorkerController extends BaseController
-{
-    @Autowired
-    private ICmcProjectWorkerService cmcProjectWorkerService;
-
-    /**
-     * 查询cmc项目人员列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(CmcProjectWorker cmcProjectWorker)
-    {
-        startPage();
-        List<CmcProjectWorker> list = cmcProjectWorkerService.selectCmcProjectWorkerList(cmcProjectWorker);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出cmc项目人员列表
-     */
-    @Log(title = "cmc项目人员", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcProjectWorker cmcProjectWorker)
-    {
-        List<CmcProjectWorker> list = cmcProjectWorkerService.selectCmcProjectWorkerList(cmcProjectWorker);
-        ExcelUtil<CmcProjectWorker> util = new ExcelUtil<CmcProjectWorker>(CmcProjectWorker.class);
-        util.exportExcel(response, list, "cmc项目人员数据");
-    }
-
-    /**
-     * 获取cmc项目人员详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
-        return success(cmcProjectWorkerService.selectCmcProjectWorkerById(id));
-    }
-
-    /**
-     * 新增cmc项目人员
-     */
-    @Log(title = "cmc项目人员", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CmcProjectWorker cmcProjectWorker)
-    {
-        return toAjax(cmcProjectWorkerService.insertCmcProjectWorker(cmcProjectWorker));
-    }
-
-    /**
-     * 修改cmc项目人员
-     */
-    @Log(title = "cmc项目人员", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CmcProjectWorker cmcProjectWorker)
-    {
-        return toAjax(cmcProjectWorkerService.updateCmcProjectWorker(cmcProjectWorker));
-    }
-
-    /**
-     * 删除cmc项目人员
-     */
-    @Log(title = "cmc项目人员", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
-        return toAjax(cmcProjectWorkerService.deleteCmcProjectWorkerByIds(ids));
-    }
-}

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

@@ -92,6 +92,6 @@ public class CmcSafeController extends BaseController
 	@DeleteMapping("/{safeIds}")
     public AjaxResult remove(@PathVariable String[] safeIds)
     {
-        return toAjax(cmcSafeService.deleteCmcSafeBySafeIds(safeIds));
+        return success(cmcSafeService.deleteCmcSafeBySafeIds(safeIds));
     }
 }

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

@@ -92,6 +92,6 @@ public class CmcSettleController extends BaseController
 	@DeleteMapping("/{settleIds}")
     public AjaxResult remove(@PathVariable String[] settleIds)
     {
-        return toAjax(cmcSettleService.deleteCmcSettleBySettleIds(settleIds));
+        return success(cmcSettleService.deleteCmcSettleBySettleIds(settleIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcSettleSummaryController extends BaseController
 	@DeleteMapping("/{settleIds}")
     public AjaxResult remove(@PathVariable String[] settleIds)
     {
-        return toAjax(cmcSettleSummaryService.deleteCmcSettleSummaryBySettleIds(settleIds));
+        return success(cmcSettleSummaryService.deleteCmcSettleSummaryBySettleIds(settleIds));
     }
 }

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

@@ -94,6 +94,6 @@ public class CmcSettleWorkController extends BaseController
 	@DeleteMapping("/{settleIds}")
     public AjaxResult remove(@PathVariable String[] settleIds)
     {
-        return toAjax(cmcSettleWorkService.deleteCmcSettleWorkBySettleIds(settleIds));
+        return success(cmcSettleWorkService.deleteCmcSettleWorkBySettleIds(settleIds));
     }
 }

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

@@ -82,7 +82,7 @@ public class CmcSubContractController extends BaseController
     {
         if (!cmcSubContract.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
             CmcPartner cmcPartner = new CmcPartner();
-            cmcPartner.setPartnerId(new SnowFlake().generateId());
+            cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
             cmcPartner.setPartnerName(cmcSubContract.getPartnerId());
             cmcPartner.setTelephone(cmcSubContract.getTelephone());
             cmcPartner.setContactPerson(cmcSubContract.getContactPerson());
@@ -113,6 +113,6 @@ public class CmcSubContractController extends BaseController
 	@DeleteMapping("/{subContractIds}")
     public AjaxResult remove(@PathVariable String[] subContractIds)
     {
-        return toAjax(cmcSubContractService.deleteCmcSubContractBySubContractIds(subContractIds));
+        return success(cmcSubContractService.deleteCmcSubContractBySubContractIds(subContractIds));
     }
 }

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

@@ -106,6 +106,6 @@ public class CmcTechnicalController extends BaseController
 	@DeleteMapping("/{technicalIds}")
     public AjaxResult remove(@PathVariable String[] technicalIds)
     {
-        return toAjax(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
+        return success(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
     }
 }

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

@@ -81,7 +81,7 @@ public class CmcTenderController extends BaseController
     {
         if (!cmcTender.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
             CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
             cmcPartyA.setPartyAName(cmcTender.getPartyAId());
             cmcPartyAService.insertCmcPartyA(cmcPartyA);
             cmcTender.setPartyAId(cmcPartyA.getPartyAId());
@@ -106,6 +106,6 @@ public class CmcTenderController extends BaseController
 	@DeleteMapping("/{tenderIds}")
     public AjaxResult remove(@PathVariable String[] tenderIds)
     {
-        return toAjax(cmcTenderService.deleteCmcTenderByTenderIds(tenderIds));
+        return success(cmcTenderService.deleteCmcTenderByTenderIds(tenderIds));
     }
 }

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

@@ -64,6 +64,12 @@ public class SysPostController extends BaseController
         SysUser deptLeader = postService.selectDeptLeaderByUserId(userId);
         if (deptLeader == null)
             deptLeader = postService.selectViceDeptLeaderByUserId(userId);
+        if (deptLeader == null)
+            deptLeader = postService.selectSubLeaderByUserId(userId);
+        if (deptLeader == null)
+            deptLeader = postService.selectSubGmByUserId(userId);
+        if (deptLeader == null)
+            deptLeader = postService.selectBranchLeaderByUserId(userId);
         return success(deptLeader);
     }
 
@@ -86,6 +92,12 @@ public class SysPostController extends BaseController
         SysUser deptLeader = postService.selectDeptLeaderByDeptId(deptId);
         if (deptLeader == null)
             deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);
+        if (deptLeader == null)
+            deptLeader = postService.selectSubLeaderByDeptId(deptId);
+        if (deptLeader == null)
+            deptLeader = postService.selectSubGmByDeptId(deptId);
+        if (deptLeader == null)
+            deptLeader = postService.selectBranchLeaderByDeptId(deptId);
         return success(deptLeader);
     }
 

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

@@ -19,7 +19,7 @@ public class CmcCarExpense extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 车辆费用id */
-    private String carExpenseId;
+    private Integer carExpenseId;
 
     /** 车辆id */
     @Excel(name = "车牌号")
@@ -44,12 +44,12 @@ public class CmcCarExpense extends BaseEntity
     @Excel(name = "附件")
     private String document;
 
-    public void setCarExpenseId(String carExpenseId) 
+    public void setCarExpenseId(Integer carExpenseId)
     {
         this.carExpenseId = carExpenseId;
     }
 
-    public String getCarExpenseId() 
+    public Integer getCarExpenseId()
     {
         return carExpenseId;
     }

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

@@ -19,7 +19,7 @@ public class CmcContractMeeting extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 合同会审id */
-    private String meetingId;
+    private Long meetingId;
 
     /** 合同id */
     @Excel(name = "合同id")
@@ -57,12 +57,12 @@ public class CmcContractMeeting extends BaseEntity
     @Excel(name = "总结时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date commentTime;
 
-    public void setMeetingId(String meetingId)
+    public void setMeetingId(Long meetingId)
     {
         this.meetingId = meetingId;
     }
 
-    public String getMeetingId()
+    public Long getMeetingId()
     {
         return meetingId;
     }

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

@@ -20,12 +20,19 @@ public class CmcDeviceExpense extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备费用id */
-    private String deviceExpenseId;
+    private Integer deviceExpenseId;
 
     /** 设备id */
     private Integer deviceId;
     private CmcDevice device;
 
+    /** 车辆id */
+    private Integer carId;
+    private CmcCar car;
+
+    @Excel(name = "车牌号")
+    private String licensePlate;
+
     @Excel(name = "设备编码")
     private String deviceNumber;
 
@@ -65,12 +72,12 @@ public class CmcDeviceExpense extends BaseEntity
     @Excel(name = "附件")
     private String document;
 
-    public void setDeviceExpenseId(String deviceExpenseId) 
+    public void setDeviceExpenseId(Integer deviceExpenseId)
     {
         this.deviceExpenseId = deviceExpenseId;
     }
 
-    public String getDeviceExpenseId() 
+    public Integer getDeviceExpenseId()
     {
         return deviceExpenseId;
     }
@@ -83,6 +90,15 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return deviceId;
     }
+    public void setCarId(Integer carId)
+    {
+        this.carId = carId;
+    }
+
+    public Integer getCarId()
+    {
+        return carId;
+    }
     public void setDevice(CmcDevice device)
     {
         this.device = device;
@@ -99,6 +115,19 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return device;
     }
+
+    public void setCar(CmcCar car)
+    {
+        this.car = car;
+        if (car != null) {
+            this.licensePlate = car.getLicensePlate();
+        }
+    }
+
+    public CmcCar getCar()
+    {
+        return car;
+    }
     public void setUserId(Long userId) 
     {
         this.userId = userId;
@@ -160,6 +189,7 @@ public class CmcDeviceExpense extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceExpenseId", getDeviceExpenseId())
             .append("deviceId", getDeviceId())
+            .append("carId", getCarId())
             .append("userId", getUserId())
             .append("expenseType", getExpenseType())
             .append("expense", getExpense())

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

@@ -20,7 +20,7 @@ public class CmcDeviceHandover extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备移交id */
-    private String deviceHandoverId;
+    private Integer deviceHandoverId;
 
     /** 设备id */
     private Integer deviceId;
@@ -83,12 +83,12 @@ public class CmcDeviceHandover extends BaseEntity
     @Excel(name = "交接原因")
     private String reason;
 
-    public void setDeviceHandoverId(String deviceHandoverId) 
+    public void setDeviceHandoverId(Integer deviceHandoverId)
     {
         this.deviceHandoverId = deviceHandoverId;
     }
 
-    public String getDeviceHandoverId() 
+    public Integer getDeviceHandoverId()
     {
         return deviceHandoverId;
     }

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

@@ -19,7 +19,7 @@ public class CmcDeviceScrap extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备报废id */
-    private String deviceScrapId;
+    private Integer deviceScrapId;
 
     /** 设备id */
     @Excel(name = "设备id")
@@ -50,12 +50,12 @@ public class CmcDeviceScrap extends BaseEntity
     @Excel(name = "附件")
     private String document;
 
-    public void setDeviceScrapId(String deviceScrapId) 
+    public void setDeviceScrapId(Integer deviceScrapId)
     {
         this.deviceScrapId = deviceScrapId;
     }
 
-    public String getDeviceScrapId() 
+    public Integer getDeviceScrapId()
     {
         return deviceScrapId;
     }

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

@@ -1,61 +0,0 @@
-package com.ruoyi.oa.mapper;
-
-import java.util.List;
-import com.ruoyi.oa.domain.CmcCarExpense;
-
-/**
- * cmc车辆费用Mapper接口
- * 
- * @author cmc
- * @date 2024-03-12
- */
-public interface CmcCarExpenseMapper 
-{
-    /**
-     * 查询cmc车辆费用
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return cmc车辆费用
-     */
-    public CmcCarExpense selectCmcCarExpenseByCarExpenseId(String carExpenseId);
-
-    /**
-     * 查询cmc车辆费用列表
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return cmc车辆费用集合
-     */
-    public List<CmcCarExpense> selectCmcCarExpenseList(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 新增cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    public int insertCmcCarExpense(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 修改cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    public int updateCmcCarExpense(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 删除cmc车辆费用
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return 结果
-     */
-    public int deleteCmcCarExpenseByCarExpenseId(String carExpenseId);
-
-    /**
-     * 批量删除cmc车辆费用
-     * 
-     * @param carExpenseIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCmcCarExpenseByCarExpenseIds(String[] carExpenseIds);
-}

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

@@ -17,7 +17,7 @@ public interface CmcDeviceExpenseMapper
      * @param deviceExpenseId cmc设备费用主键
      * @return cmc设备费用
      */
-    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
+    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId);
 
     /**
      * 查询cmc设备费用列表
@@ -49,7 +49,7 @@ public interface CmcDeviceExpenseMapper
      * @param deviceExpenseId cmc设备费用主键
      * @return 结果
      */
-    public int deleteCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
+    public int deleteCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId);
 
     /**
      * 批量删除cmc设备费用
@@ -57,5 +57,5 @@ public interface CmcDeviceExpenseMapper
      * @param deviceExpenseIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceExpenseByDeviceExpenseIds(String[] deviceExpenseIds);
+    public int deleteCmcDeviceExpenseByDeviceExpenseIds(Integer[] deviceExpenseIds);
 }

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

@@ -17,7 +17,7 @@ public interface CmcDeviceHandoverMapper
      * @param deviceHandoverId cmc设备移交主键
      * @return cmc设备移交
      */
-    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId);
 
     /**
      * 查询cmc设备移交列表
@@ -49,7 +49,7 @@ public interface CmcDeviceHandoverMapper
      * @param deviceHandoverId cmc设备移交主键
      * @return 结果
      */
-    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId);
 
     /**
      * 批量删除cmc设备移交
@@ -57,5 +57,5 @@ public interface CmcDeviceHandoverMapper
      * @param deviceHandoverIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds);
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(Integer[] deviceHandoverIds);
 }

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

@@ -17,7 +17,7 @@ public interface CmcDeviceScrapMapper
      * @param deviceScrapId cmc设备报废主键
      * @return cmc设备报废
      */
-    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId);
 
     /**
      * 查询cmc设备报废列表
@@ -49,7 +49,7 @@ public interface CmcDeviceScrapMapper
      * @param deviceScrapId cmc设备报废主键
      * @return 结果
      */
-    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+    public int deleteCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId);
 
     /**
      * 批量删除cmc设备报废
@@ -57,5 +57,5 @@ public interface CmcDeviceScrapMapper
      * @param deviceScrapIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds);
+    public int deleteCmcDeviceScrapByDeviceScrapIds(Integer[] deviceScrapIds);
 }

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

@@ -1,63 +0,0 @@
-package com.ruoyi.oa.mapper;
-
-import java.util.List;
-
-import com.ruoyi.oa.domain.CmcProject;
-import com.ruoyi.oa.domain.CmcProjectWorker;
-
-/**
- * cmc项目人员Mapper接口
- * 
- * @author cmc
- * @date 2024-03-26
- */
-public interface CmcProjectWorkerMapper 
-{
-    /**
-     * 查询cmc项目人员
-     * 
-     * @param id cmc项目人员主键
-     * @return cmc项目人员
-     */
-    public CmcProjectWorker selectCmcProjectWorkerById(String id);
-
-    /**
-     * 查询cmc项目人员列表
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return cmc项目人员集合
-     */
-    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 新增cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 修改cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 删除cmc项目人员
-     * 
-     * @param id cmc项目人员主键
-     * @return 结果
-     */
-    public int deleteCmcProjectWorkerById(String id);
-
-    /**
-     * 批量删除cmc项目人员
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCmcProjectWorkerByIds(String[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.oa.service;
-
-import java.util.List;
-import com.ruoyi.oa.domain.CmcCarExpense;
-
-/**
- * cmc车辆费用Service接口
- * 
- * @author cmc
- * @date 2024-03-12
- */
-public interface ICmcCarExpenseService 
-{
-    /**
-     * 查询cmc车辆费用
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return cmc车辆费用
-     */
-    public CmcCarExpense selectCmcCarExpenseByCarExpenseId(String carExpenseId);
-
-    /**
-     * 查询cmc车辆费用列表
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return cmc车辆费用集合
-     */
-    public List<CmcCarExpense> selectCmcCarExpenseList(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 新增cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    public int insertCmcCarExpense(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 修改cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    public int updateCmcCarExpense(CmcCarExpense cmcCarExpense);
-
-    /**
-     * 批量删除cmc车辆费用
-     * 
-     * @param carExpenseIds 需要删除的cmc车辆费用主键集合
-     * @return 结果
-     */
-    public int deleteCmcCarExpenseByCarExpenseIds(String[] carExpenseIds);
-
-    /**
-     * 删除cmc车辆费用信息
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return 结果
-     */
-    public int deleteCmcCarExpenseByCarExpenseId(String carExpenseId);
-}

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

@@ -17,7 +17,7 @@ public interface ICmcDeviceExpenseService
      * @param deviceExpenseId cmc设备费用主键
      * @return cmc设备费用
      */
-    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
+    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId);
 
     /**
      * 查询cmc设备费用列表
@@ -49,7 +49,7 @@ public interface ICmcDeviceExpenseService
      * @param deviceExpenseIds 需要删除的cmc设备费用主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceExpenseByDeviceExpenseIds(String[] deviceExpenseIds);
+    public int deleteCmcDeviceExpenseByDeviceExpenseIds(Integer[] deviceExpenseIds);
 
     /**
      * 删除cmc设备费用信息
@@ -57,5 +57,5 @@ public interface ICmcDeviceExpenseService
      * @param deviceExpenseId cmc设备费用主键
      * @return 结果
      */
-    public int deleteCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
+    public int deleteCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId);
 }

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

@@ -17,7 +17,7 @@ public interface ICmcDeviceHandoverService
      * @param deviceHandoverId cmc设备移交主键
      * @return cmc设备移交
      */
-    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId);
 
     /**
      * 查询cmc设备移交列表
@@ -49,7 +49,7 @@ public interface ICmcDeviceHandoverService
      * @param deviceHandoverIds 需要删除的cmc设备移交主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds);
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(Integer[] deviceHandoverIds);
 
     /**
      * 删除cmc设备移交信息
@@ -57,5 +57,5 @@ public interface ICmcDeviceHandoverService
      * @param deviceHandoverId cmc设备移交主键
      * @return 结果
      */
-    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId);
 }

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

@@ -17,7 +17,7 @@ public interface ICmcDeviceScrapService
      * @param deviceScrapId cmc设备报废主键
      * @return cmc设备报废
      */
-    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId);
 
     /**
      * 查询cmc设备报废列表
@@ -49,7 +49,7 @@ public interface ICmcDeviceScrapService
      * @param deviceScrapIds 需要删除的cmc设备报废主键集合
      * @return 结果
      */
-    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds);
+    public int deleteCmcDeviceScrapByDeviceScrapIds(Integer[] deviceScrapIds);
 
     /**
      * 删除cmc设备报废信息
@@ -57,5 +57,5 @@ public interface ICmcDeviceScrapService
      * @param deviceScrapId cmc设备报废主键
      * @return 结果
      */
-    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+    public int deleteCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId);
 }

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

@@ -1,63 +0,0 @@
-package com.ruoyi.oa.service;
-
-import java.util.List;
-
-import com.ruoyi.oa.domain.CmcProject;
-import com.ruoyi.oa.domain.CmcProjectWorker;
-
-/**
- * cmc项目人员Service接口
- * 
- * @author cmc
- * @date 2024-03-26
- */
-public interface ICmcProjectWorkerService 
-{
-    /**
-     * 查询cmc项目人员
-     * 
-     * @param id cmc项目人员主键
-     * @return cmc项目人员
-     */
-    public CmcProjectWorker selectCmcProjectWorkerById(String id);
-
-    /**
-     * 查询cmc项目人员列表
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return cmc项目人员集合
-     */
-    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 新增cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 修改cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker);
-
-    /**
-     * 批量删除cmc项目人员
-     * 
-     * @param ids 需要删除的cmc项目人员主键集合
-     * @return 结果
-     */
-    public int deleteCmcProjectWorkerByIds(String[] ids);
-
-    /**
-     * 删除cmc项目人员信息
-     * 
-     * @param id cmc项目人员主键
-     * @return 结果
-     */
-    public int deleteCmcProjectWorkerById(String id);
-}

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

@@ -1,93 +0,0 @@
-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.CmcCarExpenseMapper;
-import com.ruoyi.oa.domain.CmcCarExpense;
-import com.ruoyi.oa.service.ICmcCarExpenseService;
-
-/**
- * cmc车辆费用Service业务层处理
- * 
- * @author cmc
- * @date 2024-03-12
- */
-@Service
-public class CmcCarExpenseServiceImpl implements ICmcCarExpenseService 
-{
-    @Autowired
-    private CmcCarExpenseMapper cmcCarExpenseMapper;
-
-    /**
-     * 查询cmc车辆费用
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return cmc车辆费用
-     */
-    @Override
-    public CmcCarExpense selectCmcCarExpenseByCarExpenseId(String carExpenseId)
-    {
-        return cmcCarExpenseMapper.selectCmcCarExpenseByCarExpenseId(carExpenseId);
-    }
-
-    /**
-     * 查询cmc车辆费用列表
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return cmc车辆费用
-     */
-    @Override
-    public List<CmcCarExpense> selectCmcCarExpenseList(CmcCarExpense cmcCarExpense)
-    {
-        return cmcCarExpenseMapper.selectCmcCarExpenseList(cmcCarExpense);
-    }
-
-    /**
-     * 新增cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    @Override
-    public int insertCmcCarExpense(CmcCarExpense cmcCarExpense)
-    {
-        return cmcCarExpenseMapper.insertCmcCarExpense(cmcCarExpense);
-    }
-
-    /**
-     * 修改cmc车辆费用
-     * 
-     * @param cmcCarExpense cmc车辆费用
-     * @return 结果
-     */
-    @Override
-    public int updateCmcCarExpense(CmcCarExpense cmcCarExpense)
-    {
-        return cmcCarExpenseMapper.updateCmcCarExpense(cmcCarExpense);
-    }
-
-    /**
-     * 批量删除cmc车辆费用
-     * 
-     * @param carExpenseIds 需要删除的cmc车辆费用主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCmcCarExpenseByCarExpenseIds(String[] carExpenseIds)
-    {
-        return cmcCarExpenseMapper.deleteCmcCarExpenseByCarExpenseIds(carExpenseIds);
-    }
-
-    /**
-     * 删除cmc车辆费用信息
-     * 
-     * @param carExpenseId cmc车辆费用主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCmcCarExpenseByCarExpenseId(String carExpenseId)
-    {
-        return cmcCarExpenseMapper.deleteCmcCarExpenseByCarExpenseId(carExpenseId);
-    }
-}

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

@@ -26,7 +26,7 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
      * @return cmc设备费用
      */
     @Override
-    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId)
+    public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId)
     {
         return cmcDeviceExpenseMapper.selectCmcDeviceExpenseByDeviceExpenseId(deviceExpenseId);
     }
@@ -74,7 +74,7 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceExpenseByDeviceExpenseIds(String[] deviceExpenseIds)
+    public int deleteCmcDeviceExpenseByDeviceExpenseIds(Integer[] deviceExpenseIds)
     {
         return cmcDeviceExpenseMapper.deleteCmcDeviceExpenseByDeviceExpenseIds(deviceExpenseIds);
     }
@@ -86,7 +86,7 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId)
+    public int deleteCmcDeviceExpenseByDeviceExpenseId(Integer deviceExpenseId)
     {
         return cmcDeviceExpenseMapper.deleteCmcDeviceExpenseByDeviceExpenseId(deviceExpenseId);
     }

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

@@ -26,7 +26,7 @@ public class CmcDeviceHandoverServiceImpl implements ICmcDeviceHandoverService
      * @return cmc设备移交
      */
     @Override
-    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId)
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId)
     {
         return cmcDeviceHandoverMapper.selectCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId);
     }
@@ -74,7 +74,7 @@ public class CmcDeviceHandoverServiceImpl implements ICmcDeviceHandoverService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds)
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(Integer[] deviceHandoverIds)
     {
         return cmcDeviceHandoverMapper.deleteCmcDeviceHandoverByDeviceHandoverIds(deviceHandoverIds);
     }
@@ -86,7 +86,7 @@ public class CmcDeviceHandoverServiceImpl implements ICmcDeviceHandoverService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId)
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(Integer deviceHandoverId)
     {
         return cmcDeviceHandoverMapper.deleteCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId);
     }

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

@@ -26,7 +26,7 @@ public class CmcDeviceScrapServiceImpl implements ICmcDeviceScrapService
      * @return cmc设备报废
      */
     @Override
-    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId)
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId)
     {
         return cmcDeviceScrapMapper.selectCmcDeviceScrapByDeviceScrapId(deviceScrapId);
     }
@@ -74,7 +74,7 @@ public class CmcDeviceScrapServiceImpl implements ICmcDeviceScrapService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds)
+    public int deleteCmcDeviceScrapByDeviceScrapIds(Integer[] deviceScrapIds)
     {
         return cmcDeviceScrapMapper.deleteCmcDeviceScrapByDeviceScrapIds(deviceScrapIds);
     }
@@ -86,7 +86,7 @@ public class CmcDeviceScrapServiceImpl implements ICmcDeviceScrapService
      * @return 结果
      */
     @Override
-    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId)
+    public int deleteCmcDeviceScrapByDeviceScrapId(Integer deviceScrapId)
     {
         return cmcDeviceScrapMapper.deleteCmcDeviceScrapByDeviceScrapId(deviceScrapId);
     }

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

@@ -1,95 +0,0 @@
-package com.ruoyi.oa.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.oa.domain.CmcProject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.oa.mapper.CmcProjectWorkerMapper;
-import com.ruoyi.oa.domain.CmcProjectWorker;
-import com.ruoyi.oa.service.ICmcProjectWorkerService;
-
-/**
- * cmc项目人员Service业务层处理
- * 
- * @author cmc
- * @date 2024-03-26
- */
-@Service
-public class CmcProjectWorkerServiceImpl implements ICmcProjectWorkerService 
-{
-    @Autowired
-    private CmcProjectWorkerMapper cmcProjectWorkerMapper;
-
-    /**
-     * 查询cmc项目人员
-     * 
-     * @param id cmc项目人员主键
-     * @return cmc项目人员
-     */
-    @Override
-    public CmcProjectWorker selectCmcProjectWorkerById(String id)
-    {
-        return cmcProjectWorkerMapper.selectCmcProjectWorkerById(id);
-    }
-
-    /**
-     * 查询cmc项目人员列表
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return cmc项目人员
-     */
-    @Override
-    public List<CmcProjectWorker> selectCmcProjectWorkerList(CmcProjectWorker cmcProjectWorker)
-    {
-        return cmcProjectWorkerMapper.selectCmcProjectWorkerList(cmcProjectWorker);
-    }
-
-    /**
-     * 新增cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    @Override
-    public int insertCmcProjectWorker(CmcProjectWorker cmcProjectWorker)
-    {
-        return cmcProjectWorkerMapper.insertCmcProjectWorker(cmcProjectWorker);
-    }
-
-    /**
-     * 修改cmc项目人员
-     * 
-     * @param cmcProjectWorker cmc项目人员
-     * @return 结果
-     */
-    @Override
-    public int updateCmcProjectWorker(CmcProjectWorker cmcProjectWorker)
-    {
-        return cmcProjectWorkerMapper.updateCmcProjectWorker(cmcProjectWorker);
-    }
-
-    /**
-     * 批量删除cmc项目人员
-     * 
-     * @param ids 需要删除的cmc项目人员主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCmcProjectWorkerByIds(String[] ids)
-    {
-        return cmcProjectWorkerMapper.deleteCmcProjectWorkerByIds(ids);
-    }
-
-    /**
-     * 删除cmc项目人员信息
-     * 
-     * @param id cmc项目人员主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCmcProjectWorkerById(String id)
-    {
-        return cmcProjectWorkerMapper.deleteCmcProjectWorkerById(id);
-    }
-}

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

@@ -60,6 +60,30 @@ public interface SysUserPostMapper
      */
     public List<SysUser> selectUserListByPostName(String postName);
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    public SysUser selectSubLeaderByUserId(String userId);
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    public SysUser selectSubGmByUserId(String userId);
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    public SysUser selectBranchLeaderByUserId(String userId);
+
     /**
      * 查询部门主任
      *
@@ -76,6 +100,30 @@ public interface SysUserPostMapper
      */
     public SysUser selectViceDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    public SysUser selectSubLeaderByDeptId(String userId);
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    public SysUser selectSubGmByDeptId(String userId);
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    public SysUser selectBranchLeaderByDeptId(String userId);
+
     /**
      * 查询部门主任
      *

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

@@ -116,6 +116,30 @@ public interface ISysPostService
      */
     public List<SysUser> selectUserListByPostName(String postName);
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    public SysUser selectSubLeaderByUserId(String userId);
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    public SysUser selectSubGmByUserId(String userId);
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    public SysUser selectBranchLeaderByUserId(String userId);
+
     /**
      * 查询部门主任
      *
@@ -132,6 +156,30 @@ public interface ISysPostService
      */
     public SysUser selectViceDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    public SysUser selectSubLeaderByDeptId(String userId);
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    public SysUser selectSubGmByDeptId(String userId);
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    public SysUser selectBranchLeaderByDeptId(String userId);
+
     /**
      * 查询部门主任
      *

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

@@ -200,6 +200,39 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectUserListByPostName(postName);
     }
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    @Override
+    public SysUser selectSubLeaderByUserId(String userId) {
+        return userPostMapper.selectSubLeaderByUserId(userId);
+    }
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    @Override
+    public SysUser selectSubGmByUserId(String userId) {
+        return userPostMapper.selectSubGmByUserId(userId);
+    }
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    @Override
+    public SysUser selectBranchLeaderByUserId(String userId) {
+        return userPostMapper.selectBranchLeaderByUserId(userId);
+    }
+
     /**
      * 查询部门主任
      *
@@ -222,6 +255,39 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectViceDeptLeaderByUserId(userId);
     }
 
+    /**
+     * 查询子公司执行董事
+     *
+     * @param
+     * @return 查询子公司执行董事
+     */
+    @Override
+    public SysUser selectSubLeaderByDeptId(String deptId) {
+        return userPostMapper.selectSubLeaderByDeptId(deptId);
+    }
+
+    /**
+     * 查询子公司总经理
+     *
+     * @param
+     * @return 查询子公司总经理
+     */
+    @Override
+    public SysUser selectSubGmByDeptId(String userId) {
+        return userPostMapper.selectSubGmByDeptId(userId);
+    }
+
+    /**
+     * 查询分公司经理
+     *
+     * @param
+     * @return 查询分公司经理
+     */
+    @Override
+    public SysUser selectBranchLeaderByDeptId(String userId) {
+        return userPostMapper.selectBranchLeaderByDeptId(userId);
+    }
+
     /**
      * 查询部门主任
      *

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceExpense" id="CmcDeviceExpenseResult">
         <result property="deviceExpenseId"    column="device_expense_id"    />
         <result property="deviceId"    column="device_id"    />
+        <result property="carId"    column="car_id"    />
         <result property="userId"    column="user_id"    />
         <result property="expenseType"    column="expense_type"    />
         <result property="expense"    column="expense"    />
@@ -15,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="document"    column="document"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+        <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -31,16 +33,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="brand"    column="brand"    />
     </resultMap>
 
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
+    </resultMap>
+
     <sql id="selectCmcDeviceExpenseVo">
-        select de.device_expense_id, de.device_id, d.device_number, d.code, d.name, d.brand, d.series, de.user_id, u.nick_name, de.expense_type, de.expense, de.occur_date, de.remark, de.document from cmc_device_expense as de
+        select de.device_expense_id, de.device_id, de.car_id, c.license_plate, d.device_number, d.code, d.name, d.brand, d.series, de.user_id, u.nick_name, de.expense_type, de.expense, de.occur_date, de.remark, de.document from cmc_device_expense as de
         left join sys_user as u on u.user_id = de.user_id
         left join cmc_device as d on d.device_id = de.device_id
+        left join cmc_car as c on c.car_id = de.car_id
     </sql>
 
     <select id="selectCmcDeviceExpenseList" parameterType="CmcDeviceExpense" resultMap="CmcDeviceExpenseResult">
         <include refid="selectCmcDeviceExpenseVo"/>
         <where>  
             <if test="deviceId != null "> and de.device_id = #{deviceId}</if>
+            <if test="carId != null "> and de.car_id = #{carId}</if>
             <if test="userId != null "> and de.user_id = #{userId}</if>
             <if test="expenseType != null  and expenseType != ''"> and de.expense_type = #{expenseType}</if>
             <if test="expense != null "> and de.expense = #{expense}</if>
@@ -57,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcDeviceExpense" parameterType="CmcDeviceExpense">
         insert into cmc_device_expense
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceExpenseId != null">device_expense_id,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="carId != null">car_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="expenseType != null">expense_type,</if>
             <if test="expense != null">expense,</if>
@@ -69,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceExpenseId != null">#{deviceExpenseId},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="carId != null">#{carId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="expenseType != null">#{expenseType},</if>
             <if test="expense != null">#{expense},</if>
@@ -82,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_expense
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="carId != null">car_id = #{carId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="expenseType != null">expense_type = #{expenseType},</if>
             <if test="expense != null">expense = #{expense},</if>
@@ -92,11 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_expense_id = #{deviceExpenseId}
     </update>
 
-    <delete id="deleteCmcDeviceExpenseByDeviceExpenseId" parameterType="String">
+    <delete id="deleteCmcDeviceExpenseByDeviceExpenseId" parameterType="Integer">
         delete from cmc_device_expense where device_expense_id = #{deviceExpenseId}
     </delete>
 
-    <delete id="deleteCmcDeviceExpenseByDeviceExpenseIds" parameterType="String">
+    <delete id="deleteCmcDeviceExpenseByDeviceExpenseIds" parameterType="Integer">
         delete from cmc_device_expense where device_expense_id in 
         <foreach item="deviceExpenseId" collection="array" open="(" separator="," close=")">
             #{deviceExpenseId}

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

@@ -83,7 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcDeviceHandover" parameterType="CmcDeviceHandover">
         insert into cmc_device_handover
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceHandoverId != null">device_handover_id,</if>
             <if test="deviceId != null">device_id,</if>
             <if test="handoverDeptId != null">handover_dept_id,</if>
             <if test="handoverUserId != null">handover_user_id,</if>
@@ -124,11 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_handover_id = #{deviceHandoverId}
     </update>
 
-    <delete id="deleteCmcDeviceHandoverByDeviceHandoverId" parameterType="String">
+    <delete id="deleteCmcDeviceHandoverByDeviceHandoverId" parameterType="Integer">
         delete from cmc_device_handover where device_handover_id = #{deviceHandoverId}
     </delete>
 
-    <delete id="deleteCmcDeviceHandoverByDeviceHandoverIds" parameterType="String">
+    <delete id="deleteCmcDeviceHandoverByDeviceHandoverIds" parameterType="Integer">
         delete from cmc_device_handover where device_handover_id in 
         <foreach item="deviceHandoverId" collection="array" open="(" separator="," close=")">
             #{deviceHandoverId}

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

@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcDeviceScrap" parameterType="CmcDeviceScrap">
         insert into cmc_device_scrap
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceScrapId != null">device_scrap_id,</if>
             <if test="deviceId != null">device_id,</if>
             <if test="carId != null">car_id,</if>
             <if test="cost != null">cost,</if>
@@ -79,11 +78,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_scrap_id = #{deviceScrapId}
     </update>
 
-    <delete id="deleteCmcDeviceScrapByDeviceScrapId" parameterType="String">
+    <delete id="deleteCmcDeviceScrapByDeviceScrapId" parameterType="Integer">
         delete from cmc_device_scrap where device_scrap_id = #{deviceScrapId}
     </delete>
 
-    <delete id="deleteCmcDeviceScrapByDeviceScrapIds" parameterType="String">
+    <delete id="deleteCmcDeviceScrapByDeviceScrapIds" parameterType="Integer">
         delete from cmc_device_scrap where device_scrap_id in 
         <foreach item="deviceScrapId" collection="array" open="(" separator="," close=")">
             #{deviceScrapId}

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

@@ -1,76 +0,0 @@
-<?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.CmcProjectWorkerMapper">
-    
-    <resultMap type="CmcProjectWorker" id="CmcProjectWorkerResult">
-        <result property="id"    column="id"    />
-        <result property="projectId"    column="project_id"    />
-        <result property="inWorker"    column="in_worker"    />
-        <result property="outWorker"    column="out_worker"    />
-        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
-    </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="selectCmcProjectWorkerVo">
-        select pw.id, pw.project_id, p.project_number, p.project_name, pw.in_worker, pw.out_worker from cmc_project_worker as pw
-            left join cmc_project as p on p.project_id = pw.project_id
-    </sql>
-
-    <select id="selectCmcProjectWorkerList" parameterType="CmcProjectWorker" resultMap="CmcProjectWorkerResult">
-        <include refid="selectCmcProjectWorkerVo"/>
-        <where>  
-            <if test="projectId != null  and projectId != ''"> and pw.project_id = #{projectId}</if>
-            <if test="inWorker != null  and inWorker != ''"> and pw.in_worker = #{inWorker}</if>
-            <if test="outWorker != null  and outWorker != ''"> and pw.out_worker = #{outWorker}</if>
-        </where>
-    </select>
-
-    <select id="selectCmcProjectWorkerById" parameterType="String" resultMap="CmcProjectWorkerResult">
-        <include refid="selectCmcProjectWorkerVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertCmcProjectWorker" parameterType="CmcProjectWorker">
-        insert into cmc_project_worker
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="projectId != null">project_id,</if>
-            <if test="inWorker != null">in_worker,</if>
-            <if test="outWorker != null">out_worker,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="projectId != null">#{projectId},</if>
-            <if test="inWorker != null">#{inWorker},</if>
-            <if test="outWorker != null">#{outWorker},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCmcProjectWorker" parameterType="CmcProjectWorker">
-        update cmc_project_worker
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="projectId != null">project_id = #{projectId},</if>
-            <if test="inWorker != null">in_worker = #{inWorker},</if>
-            <if test="outWorker != null">out_worker = #{outWorker},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCmcProjectWorkerById" parameterType="String">
-        delete from cmc_project_worker where id = #{id}
-    </delete>
-
-    <delete id="deleteCmcProjectWorkerByIds" parameterType="String">
-        delete from cmc_project_worker where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -94,6 +94,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.post_name = #{param}
 	</select>
 
+	<select id="selectSubLeaderByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '子公司执行董事'
+	</select>
+
+	<select id="selectSubGmByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '子公司总经理'
+	</select>
+
+	<select id="selectBranchLeaderByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '经理'
+	</select>
+
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select u1.user_id, u1.nick_name, u.dept_id from
@@ -113,6 +140,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by r.user_id desc limit 1
 	</select>
 
+	<select id="selectSubLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '子公司执行董事'
+	</select>
+
+	<select id="selectSubGmByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '子公司总经理'
+	</select>
+
+	<select id="selectBranchLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '经理'
+	</select>
+
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select user_id, nick_name, dept_id from

oa-ui/src/api/oa/car/carExpense.js

@@ -1,50 +0,0 @@
-/*
- * @Author: wrh
- * @Date: 2024-03-12 15:30:58
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-12 15:38:27
- */
-import request from '@/utils/request'
-
-// 查询cmc车辆费用列表
-export function listCarExpense(query) {
-  return request({
-    url: '/oa/carExpense/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询cmc车辆费用详细
-export function getCarExpense(carExpenseId) {
-  return request({
-    url: '/oa/carExpense/' + carExpenseId,
-    method: 'get'
-  })
-}
-
-// 新增cmc车辆费用
-export function addCarExpense(data) {
-  return request({
-    url: '/oa/carExpense',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改cmc车辆费用
-export function updateCarExpense(data) {
-  return request({
-    url: '/oa/carExpense',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除cmc车辆费用
-export function delCarExpense(carExpenseId) {
-  return request({
-    url: '/oa/carExpense/' + carExpenseId,
-    method: 'delete'
-  })
-}

oa-ui/src/assets/icons/svg/delete.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718268584150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5461" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M916.29 159.48H646.43C635.67 102.6 585.75 59.39 525.78 59.39S415.91 102.6 405.15 159.48H135.3a25 25 0 0 0 0 49.9h67.17A80.57 80.57 0 0 0 192 253.31l36 624.49a80.47 80.47 0 0 0 80.28 75.8h435a80.47 80.47 0 0 0 80.28-75.8l36-624.49a80.53 80.53 0 0 0-10.44-43.93h67.19a25 25 0 0 0 0-49.9zM773.76 874.93a30.56 30.56 0 0 1-30.48 28.77h-435a30.55 30.55 0 0 1-30.48-28.77l-36-624.5a30.54 30.54 0 0 1 30.48-32.28h506.98a30.53 30.53 0 0 1 30.48 32.28z m-248-765.64c32.26 0 59.39 21.15 69.05 50.19H456.76c9.66-29.04 36.77-50.19 69.02-50.19z" fill="#ffffff" p-id="5462"></path><path d="M374 305.45a24.93 24.93 0 0 0-25 24.94v446.23a24.95 24.95 0 1 0 49.9 0V330.39a24.93 24.93 0 0 0-24.9-24.94zM525.78 305.45a24.93 24.93 0 0 0-24.95 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-24.95-24.94zM686.9 305.45a24.93 24.93 0 0 0-24.9 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-25-24.94z" fill="#ffffff" p-id="5463"></path></svg>

oa-ui/src/assets/icons/svg/pass.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718268777068" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6583" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M938.75 388.44L644.58 94.26c-7.5-7.49-25.47-9.77-35.24-5.67s-22.87 13.59-22.87 24.17v145.8C365.31 301.9 184.78 471.34 131.43 738c-2.42 12.11 7.31 24.25 18.63 29.15a34.58 34.58 0 0 0 12.07 2.15c8.25 0 10.38-3.91 15.42-10.95 94.77-132.67 232.17-197.57 408.91-203v145.76c0 10.59 13.1 20.13 22.87 24.18s24.38 1.82 31.88-5.67l295.86-294.18c10.22-10.23 11.91-26.79 1.67-37z m0 0" fill="#ffffff" p-id="6584"></path></svg>

oa-ui/src/views/file/filesProject/achievement.vue

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-12 09:53:12
+ * @LastEditTime: 2024-06-13 22:42:16
 -->
 <template>
   <div>
@@ -31,13 +31,13 @@
     <!-- 操作栏 -->
     <el-row style="margin-bottom: 10px;">
       <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddAchievement"
-        v-hasPermi="['oa:archive:add']">新增成果</el-button>
+        v-hasPermi="['file:achievement:add']">新增成果</el-button>
       <el-button type="success" size="small" icon="el-icon-download" @click="handleExprot"
-        v-hasPermi="['oa:archive:export']">导出</el-button>
+        v-hasPermi="['file:achievement:export']">导出</el-button>
       <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadAchievement"
-        v-hasPermi="['oa:archive:add']">上传成果表</el-button>
+        v-hasPermi="['file:achievement:add']">上传成果表</el-button>
       <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
-        v-hasPermi="['oa:archive:edit']">批量删除
+        v-hasPermi="['file:achievement:edit']">批量删除
       </el-button>
     </el-row>
     <!-- 表格 -->
@@ -76,12 +76,12 @@
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
-                v-hasPermi="['oa:archive:edit']">
+                v-hasPermi="['file:achievement:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['oa:archive:remove']">
+                v-hasPermi="['file:achievement:remove']">
               </el-button>
             </el-tooltip>
           </template>

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

@@ -17,7 +17,7 @@
               }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
               }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
               }}</el-descriptions-item>
               <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
               }}</el-descriptions-item>

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 16:18:24
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-13 20:05:22
 -->
 
 <template>
@@ -180,7 +180,7 @@ export default {
           icon: 'car',
           bgColor: '#eeb62f',
           boxShadow: '0 5px 20px rgba(238,182,47,0.5)',
-          path: '/car',
+          path: '/car/index',
           privilege:['oa:car:list']
         }, {
           id: 6,

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

@@ -0,0 +1,463 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="考核时间" prop="assessTime">
+        <el-date-picker clearable
+          v-model="queryParams.assessTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择考核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门考核等级" prop="deptAssessment">
+        <el-input
+          v-model="queryParams.deptAssessment"
+          placeholder="请输入部门考核等级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门考核意见" prop="deptAdvice">
+        <el-input
+          v-model="queryParams.deptAdvice"
+          placeholder="请输入部门考核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门考核时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门考核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门考核负责人" prop="deptAssesser">
+        <el-input
+          v-model="queryParams.deptAssesser"
+          placeholder="请输入部门考核负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管考核等级" prop="managerAssessment">
+        <el-input
+          v-model="queryParams.managerAssessment"
+          placeholder="请输入分管考核等级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管考核意见" prop="managerAdvice">
+        <el-input
+          v-model="queryParams.managerAdvice"
+          placeholder="请输入分管考核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管考核时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管考核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管考核负责人" prop="managerAssesser">
+        <el-input
+          v-model="queryParams.managerAssesser"
+          placeholder="请输入分管考核负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="自述" prop="selfAssess">
+        <el-input
+          v-model="queryParams.selfAssess"
+          placeholder="请输入自述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="考核填报时间" prop="fillTime">
+        <el-date-picker clearable
+          v-model="queryParams.fillTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择考核填报时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="其他工作" prop="otherWork">
+        <el-input
+          v-model="queryParams.otherWork"
+          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:assess: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:assess: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:assess: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:assess:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="assessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="总考核表id" align="center" prop="assessId" />
+      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="考核时间" align="center" prop="assessTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.assessTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门考核等级" align="center" prop="deptAssessment" />
+      <el-table-column label="部门考核意见" align="center" prop="deptAdvice" />
+      <el-table-column label="部门考核时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门考核负责人" align="center" prop="deptAssesser" />
+      <el-table-column label="分管考核等级" align="center" prop="managerAssessment" />
+      <el-table-column label="分管考核意见" align="center" prop="managerAdvice" />
+      <el-table-column label="分管考核时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管考核负责人" align="center" prop="managerAssesser" />
+      <el-table-column label="自述" align="center" prop="selfAssess" />
+      <el-table-column label="考核填报时间" align="center" prop="fillTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fillTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="其他工作" align="center" prop="otherWork" />
+      <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:assess:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:assess: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="用户id" prop="userId">
+          <el-input v-model="form.userId" 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="assessTime">
+          <el-date-picker clearable
+            v-model="form.assessTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择考核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门考核等级" prop="deptAssessment">
+          <el-input v-model="form.deptAssessment" placeholder="请输入部门考核等级" />
+        </el-form-item>
+        <el-form-item label="部门考核意见" prop="deptAdvice">
+          <el-input v-model="form.deptAdvice" placeholder="请输入部门考核意见" />
+        </el-form-item>
+        <el-form-item label="部门考核时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门考核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门考核负责人" prop="deptAssesser">
+          <el-input v-model="form.deptAssesser" placeholder="请输入部门考核负责人" />
+        </el-form-item>
+        <el-form-item label="分管考核等级" prop="managerAssessment">
+          <el-input v-model="form.managerAssessment" placeholder="请输入分管考核等级" />
+        </el-form-item>
+        <el-form-item label="分管考核意见" prop="managerAdvice">
+          <el-input v-model="form.managerAdvice" placeholder="请输入分管考核意见" />
+        </el-form-item>
+        <el-form-item label="分管考核时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管考核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="分管考核负责人" prop="managerAssesser">
+          <el-input v-model="form.managerAssesser" placeholder="请输入分管考核负责人" />
+        </el-form-item>
+        <el-form-item label="自述" prop="selfAssess">
+          <el-input v-model="form.selfAssess" placeholder="请输入自述" />
+        </el-form-item>
+        <el-form-item label="考核填报时间" prop="fillTime">
+          <el-date-picker clearable
+            v-model="form.fillTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择考核填报时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="其他工作" prop="otherWork">
+          <el-input v-model="form.otherWork" 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 { listAssess, getAssess, delAssess, addAssess, updateAssess } from "@/api/oa/assess/assess";
+
+export default {
+  name: "Assess",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc考核表格数据
+      assessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        projectId: null,
+        assessTime: null,
+        deptAssessment: null,
+        deptAdvice: null,
+        deptTime: null,
+        deptAssesser: null,
+        managerAssessment: null,
+        managerAdvice: null,
+        managerTime: null,
+        managerAssesser: null,
+        selfAssess: null,
+        fillTime: null,
+        otherWork: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc考核列表 */
+    getList() {
+      this.loading = true;
+      listAssess(this.queryParams).then(response => {
+        this.assessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        assessId: null,
+        userId: null,
+        projectId: null,
+        assessTime: null,
+        deptAssessment: null,
+        deptAdvice: null,
+        deptTime: null,
+        deptAssesser: null,
+        managerAssessment: null,
+        managerAdvice: null,
+        managerTime: null,
+        managerAssesser: null,
+        selfAssess: null,
+        fillTime: null,
+        otherWork: 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.assessId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc考核";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const assessId = row.assessId || this.ids
+      getAssess(assessId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc考核";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.assessId != null) {
+            updateAssess(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAssess(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const assessIds = row.assessId || this.ids;
+      this.$modal.confirm('是否确认删除cmc考核编号为"' + assessIds + '"的数据项？').then(function() {
+        return delAssess(assessIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/assess/export', {
+        ...this.queryParams
+      }, `assess_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,512 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员成本" prop="staffCost">
+        <el-input
+          v-model="queryParams.staffCost"
+          placeholder="请输入人员成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆成本" prop="carCost">
+        <el-input
+          v-model="queryParams.carCost"
+          placeholder="请输入车辆成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备成本" prop="deviceCost">
+        <el-input
+          v-model="queryParams.deviceCost"
+          placeholder="请输入设备成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="固定成本" prop="fixCost">
+        <el-input
+          v-model="queryParams.fixCost"
+          placeholder="请输入固定成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预结算额" prop="settleExpense">
+        <el-input
+          v-model="queryParams.settleExpense"
+          placeholder="请输入预结算额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外协费用" prop="outExpense">
+        <el-input
+          v-model="queryParams.outExpense"
+          placeholder="请输入外协费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经营费用" prop="businessExpense">
+        <el-input
+          v-model="queryParams.businessExpense"
+          placeholder="请输入经营费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="税费成本" prop="taxExpense">
+        <el-input
+          v-model="queryParams.taxExpense"
+          placeholder="请输入税费成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车船租赁" prop="rentExpense">
+        <el-input
+          v-model="queryParams.rentExpense"
+          placeholder="请输入车船租赁"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="其他费用" prop="otherExpense">
+        <el-input
+          v-model="queryParams.otherExpense"
+          placeholder="请输入其他费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外协费用备注" prop="outRemark">
+        <el-input
+          v-model="queryParams.outRemark"
+          placeholder="请输入外协费用备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经营管理备注" prop="businessRemark">
+        <el-input
+          v-model="queryParams.businessRemark"
+          placeholder="请输入经营管理备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="税费成本备注" prop="taxRemark">
+        <el-input
+          v-model="queryParams.taxRemark"
+          placeholder="请输入税费成本备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车船租赁备注" prop="rentRemark">
+        <el-input
+          v-model="queryParams.rentRemark"
+          placeholder="请输入车船租赁备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="其他费用备注" prop="otherRemark">
+        <el-input
+          v-model="queryParams.otherRemark"
+          placeholder="请输入其他费用备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="直接成本" prop="directExpense">
+        <el-input
+          v-model="queryParams.directExpense"
+          placeholder="请输入直接成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预算总额" prop="totalBudget">
+        <el-input
+          v-model="queryParams.totalBudget"
+          placeholder="请输入预算总额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编制人" prop="compiler">
+        <el-input
+          v-model="queryParams.compiler"
+          placeholder="请输入编制人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核人" prop="auditor">
+        <el-input
+          v-model="queryParams.auditor"
+          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:budget: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:budget: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:budget: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:budget:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="预算id" align="center" prop="budgetId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="人员成本" align="center" prop="staffCost" />
+      <el-table-column label="车辆成本" align="center" prop="carCost" />
+      <el-table-column label="设备成本" align="center" prop="deviceCost" />
+      <el-table-column label="固定成本" align="center" prop="fixCost" />
+      <el-table-column label="预结算额" align="center" prop="settleExpense" />
+      <el-table-column label="外协费用" align="center" prop="outExpense" />
+      <el-table-column label="经营费用" align="center" prop="businessExpense" />
+      <el-table-column label="税费成本" align="center" prop="taxExpense" />
+      <el-table-column label="车船租赁" align="center" prop="rentExpense" />
+      <el-table-column label="其他费用" align="center" prop="otherExpense" />
+      <el-table-column label="外协费用备注" align="center" prop="outRemark" />
+      <el-table-column label="经营管理备注" align="center" prop="businessRemark" />
+      <el-table-column label="税费成本备注" align="center" prop="taxRemark" />
+      <el-table-column label="车船租赁备注" align="center" prop="rentRemark" />
+      <el-table-column label="其他费用备注" align="center" prop="otherRemark" />
+      <el-table-column label="直接成本" align="center" prop="directExpense" />
+      <el-table-column label="预算总额" align="center" prop="totalBudget" />
+      <el-table-column label="编制人" align="center" prop="compiler" />
+      <el-table-column label="审核人" align="center" prop="auditor" />
+      <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:budget:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:budget: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="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="人员成本" prop="staffCost">
+          <el-input v-model="form.staffCost" placeholder="请输入人员成本" />
+        </el-form-item>
+        <el-form-item label="车辆成本" prop="carCost">
+          <el-input v-model="form.carCost" placeholder="请输入车辆成本" />
+        </el-form-item>
+        <el-form-item label="设备成本" prop="deviceCost">
+          <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
+        </el-form-item>
+        <el-form-item label="固定成本" prop="fixCost">
+          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+        </el-form-item>
+        <el-form-item label="预结算额" prop="settleExpense">
+          <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
+        </el-form-item>
+        <el-form-item label="外协费用" prop="outExpense">
+          <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
+        </el-form-item>
+        <el-form-item label="经营费用" prop="businessExpense">
+          <el-input v-model="form.businessExpense" placeholder="请输入经营费用" />
+        </el-form-item>
+        <el-form-item label="税费成本" prop="taxExpense">
+          <el-input v-model="form.taxExpense" placeholder="请输入税费成本" />
+        </el-form-item>
+        <el-form-item label="车船租赁" prop="rentExpense">
+          <el-input v-model="form.rentExpense" placeholder="请输入车船租赁" />
+        </el-form-item>
+        <el-form-item label="其他费用" prop="otherExpense">
+          <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
+        </el-form-item>
+        <el-form-item label="外协费用备注" prop="outRemark">
+          <el-input v-model="form.outRemark" placeholder="请输入外协费用备注" />
+        </el-form-item>
+        <el-form-item label="经营管理备注" prop="businessRemark">
+          <el-input v-model="form.businessRemark" placeholder="请输入经营管理备注" />
+        </el-form-item>
+        <el-form-item label="税费成本备注" prop="taxRemark">
+          <el-input v-model="form.taxRemark" placeholder="请输入税费成本备注" />
+        </el-form-item>
+        <el-form-item label="车船租赁备注" prop="rentRemark">
+          <el-input v-model="form.rentRemark" placeholder="请输入车船租赁备注" />
+        </el-form-item>
+        <el-form-item label="其他费用备注" prop="otherRemark">
+          <el-input v-model="form.otherRemark" placeholder="请输入其他费用备注" />
+        </el-form-item>
+        <el-form-item label="直接成本" prop="directExpense">
+          <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
+        </el-form-item>
+        <el-form-item label="预算总额" prop="totalBudget">
+          <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
+        </el-form-item>
+        <el-form-item label="编制人" prop="compiler">
+          <el-input v-model="form.compiler" placeholder="请输入编制人" />
+        </el-form-item>
+        <el-form-item label="审核人" prop="auditor">
+          <el-input v-model="form.auditor" 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 { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
+
+export default {
+  name: "Budget",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc预算管理表格数据
+      budgetList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        staffCost: null,
+        carCost: null,
+        deviceCost: null,
+        fixCost: null,
+        settleExpense: null,
+        outExpense: null,
+        businessExpense: null,
+        taxExpense: null,
+        rentExpense: null,
+        otherExpense: null,
+        outRemark: null,
+        businessRemark: null,
+        taxRemark: null,
+        rentRemark: null,
+        otherRemark: null,
+        directExpense: null,
+        totalBudget: null,
+        compiler: null,
+        auditor: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc预算管理列表 */
+    getList() {
+      this.loading = true;
+      listBudget(this.queryParams).then(response => {
+        this.budgetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        budgetId: null,
+        projectId: null,
+        staffCost: null,
+        carCost: null,
+        deviceCost: null,
+        fixCost: null,
+        settleExpense: null,
+        outExpense: null,
+        businessExpense: null,
+        taxExpense: null,
+        rentExpense: null,
+        otherExpense: null,
+        outRemark: null,
+        businessRemark: null,
+        taxRemark: null,
+        rentRemark: null,
+        otherRemark: null,
+        directExpense: null,
+        totalBudget: null,
+        compiler: null,
+        auditor: null,
+        createTime: 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.budgetId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc预算管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const budgetId = row.budgetId || this.ids
+      getBudget(budgetId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc预算管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.budgetId != null) {
+            updateBudget(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBudget(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const budgetIds = row.budgetId || this.ids;
+      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function() {
+        return delBudget(budgetIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/budget/export', {
+        ...this.queryParams
+      }, `budget_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/car/approval.vue

@@ -0,0 +1,645 @@
+<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="applier">
+        <el-input
+          v-model="queryParams.applier"
+          placeholder="请输入申请人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="使用部门" prop="useDept">
+        <el-input
+          v-model="queryParams.useDept"
+          placeholder="请输入使用部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆id" prop="cars">
+        <el-input
+          v-model="queryParams.cars"
+          placeholder="请输入车辆id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驾驶员id" prop="drivers">
+        <el-input
+          v-model="queryParams.drivers"
+          placeholder="请输入驾驶员id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请用途" prop="carUsage">
+        <el-input
+          v-model="queryParams.carUsage"
+          placeholder="请输入申请用途"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用车事由" prop="applyReason">
+        <el-input
+          v-model="queryParams.applyReason"
+          placeholder="请输入用车事由"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人数" prop="passengers">
+        <el-input
+          v-model="queryParams.passengers"
+          placeholder="请输入人数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始日期" prop="beginDate">
+        <el-date-picker clearable
+          v-model="queryParams.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="queryParams.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="queryParams.days"
+          placeholder="请输入天数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批人" prop="deptUserId">
+        <el-input
+          v-model="queryParams.deptUserId"
+          placeholder="请输入部门审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批意见" prop="deptComment">
+        <el-input
+          v-model="queryParams.deptComment"
+          placeholder="请输入部门审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管审批人" prop="managerUserId">
+        <el-input
+          v-model="queryParams.managerUserId"
+          placeholder="请输入分管审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审批意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审批时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="工会审批人" prop="unionUserId">
+        <el-input
+          v-model="queryParams.unionUserId"
+          placeholder="请输入工会审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工会审批意见" prop="unionComment">
+        <el-input
+          v-model="queryParams.unionComment"
+          placeholder="请输入工会审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工会审批时间" prop="unionTime">
+        <el-date-picker clearable
+          v-model="queryParams.unionTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择工会审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理审批人" prop="gmUserId">
+        <el-input
+          v-model="queryParams.gmUserId"
+          placeholder="请输入总经理审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批意见" prop="gmComment">
+        <el-input
+          v-model="queryParams.gmComment"
+          placeholder="请输入总经理审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批时间" prop="gmTime">
+        <el-date-picker clearable
+          v-model="queryParams.gmTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择总经理审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="派车人" prop="dispatcher">
+        <el-input
+          v-model="queryParams.dispatcher"
+          placeholder="请输入派车人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="派车审批意见" prop="dispatchComment">
+        <el-input
+          v-model="queryParams.dispatchComment"
+          placeholder="请输入派车审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="派车审批时间" prop="dispatchTime">
+        <el-date-picker clearable
+          v-model="queryParams.dispatchTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择派车审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="预计用车成本" prop="estimateCost">
+        <el-input
+          v-model="queryParams.estimateCost"
+          placeholder="请输入预计用车成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期" prop="applyDate">
+        <el-date-picker clearable
+          v-model="queryParams.applyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['car:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="carApprovalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用车申请id" align="center" prop="carApplyId" />
+      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="使用部门" align="center" prop="useDept" />
+      <el-table-column label="车辆id" align="center" prop="cars" />
+      <el-table-column label="驾驶员id" align="center" prop="drivers" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="申请用途" align="center" prop="carUsage" />
+      <el-table-column label="用车事由" align="center" prop="applyReason" />
+      <el-table-column label="人数" align="center" prop="passengers" />
+      <el-table-column label="开始日期" align="center" prop="beginDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="天数" align="center" prop="days" />
+      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
+      <el-table-column label="部门审批意见" align="center" prop="deptComment" />
+      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
+      <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工会审批人" align="center" prop="unionUserId" />
+      <el-table-column label="工会审批意见" align="center" prop="unionComment" />
+      <el-table-column label="工会审批时间" align="center" prop="unionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.unionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总经理审批人" align="center" prop="gmUserId" />
+      <el-table-column label="总经理审批意见" align="center" prop="gmComment" />
+      <el-table-column label="总经理审批时间" align="center" prop="gmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="派车人" align="center" prop="dispatcher" />
+      <el-table-column label="派车审批意见" align="center" prop="dispatchComment" />
+      <el-table-column label="派车审批时间" align="center" prop="dispatchTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dispatchTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="预计用车成本" align="center" prop="estimateCost" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </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="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="cars">
+          <el-input v-model="form.cars" placeholder="请输入车辆id" />
+        </el-form-item>
+        <el-form-item label="驾驶员id" prop="drivers">
+          <el-input v-model="form.drivers" 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="carUsage">
+          <el-input v-model="form.carUsage" placeholder="请输入申请用途" />
+        </el-form-item>
+        <el-form-item label="用车事由" prop="applyReason">
+          <el-input v-model="form.applyReason" placeholder="请输入用车事由" />
+        </el-form-item>
+        <el-form-item label="人数" prop="passengers">
+          <el-input v-model="form.passengers" 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="deptUserId">
+          <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
+        </el-form-item>
+        <el-form-item label="部门审批意见" prop="deptComment">
+          <el-input v-model="form.deptComment" placeholder="请输入部门审批意见" />
+        </el-form-item>
+        <el-form-item label="部门审批时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="分管审批人" prop="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+        </el-form-item>
+        <el-form-item label="分管审批意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+        </el-form-item>
+        <el-form-item label="分管审批时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="工会审批人" prop="unionUserId">
+          <el-input v-model="form.unionUserId" placeholder="请输入工会审批人" />
+        </el-form-item>
+        <el-form-item label="工会审批意见" prop="unionComment">
+          <el-input v-model="form.unionComment" placeholder="请输入工会审批意见" />
+        </el-form-item>
+        <el-form-item label="工会审批时间" prop="unionTime">
+          <el-date-picker clearable
+            v-model="form.unionTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择工会审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理审批人" prop="gmUserId">
+          <el-input v-model="form.gmUserId" placeholder="请输入总经理审批人" />
+        </el-form-item>
+        <el-form-item label="总经理审批意见" prop="gmComment">
+          <el-input v-model="form.gmComment" placeholder="请输入总经理审批意见" />
+        </el-form-item>
+        <el-form-item label="总经理审批时间" prop="gmTime">
+          <el-date-picker clearable
+            v-model="form.gmTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="派车人" prop="dispatcher">
+          <el-input v-model="form.dispatcher" placeholder="请输入派车人" />
+        </el-form-item>
+        <el-form-item label="派车审批意见" prop="dispatchComment">
+          <el-input v-model="form.dispatchComment" placeholder="请输入派车审批意见" />
+        </el-form-item>
+        <el-form-item label="派车审批时间" prop="dispatchTime">
+          <el-date-picker clearable
+            v-model="form.dispatchTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择派车审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="预计用车成本" prop="estimateCost">
+          <el-input v-model="form.estimateCost" 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>
+      <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 { listCarApproval, getCarApproval, delCarApproval, addCarApproval, updateCarApproval } from "@/api/oa/car/carApproval";
+
+export default {
+  name: "CarApproval",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc用车审批表格数据
+      carApprovalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applier: null,
+        useDept: null,
+        cars: null,
+        drivers: null,
+        projectId: null,
+        carUsage: null,
+        applyReason: null,
+        passengers: null,
+        beginDate: null,
+        endDate: null,
+        days: null,
+        deptUserId: null,
+        deptComment: null,
+        deptTime: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        unionUserId: null,
+        unionComment: null,
+        unionTime: null,
+        gmUserId: null,
+        gmComment: null,
+        gmTime: null,
+        dispatcher: null,
+        dispatchComment: null,
+        dispatchTime: null,
+        estimateCost: null,
+        applyDate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc用车审批列表 */
+    getList() {
+      this.loading = true;
+      listCarApproval(this.queryParams).then(response => {
+        this.carApprovalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carApplyId: null,
+        applier: null,
+        useDept: null,
+        cars: null,
+        drivers: null,
+        projectId: null,
+        carUsage: null,
+        applyReason: null,
+        passengers: null,
+        beginDate: null,
+        endDate: null,
+        days: null,
+        deptUserId: null,
+        deptComment: null,
+        deptTime: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        unionUserId: null,
+        unionComment: null,
+        unionTime: null,
+        gmUserId: null,
+        gmComment: null,
+        gmTime: null,
+        dispatcher: null,
+        dispatchComment: null,
+        dispatchTime: null,
+        estimateCost: null,
+        applyDate: 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.carApplyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc用车审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const carApplyId = row.carApplyId || this.ids
+      getCarApproval(carApplyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc用车审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.carApplyId != null) {
+            updateCarApproval(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCarApproval(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const carApplyIds = row.carApplyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc用车审批编号为"' + carApplyIds + '"的数据项？').then(function() {
+        return delCarApproval(carApplyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/carApproval/export', {
+        ...this.queryParams
+      }, `carApproval_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/car/detail.vue

@@ -123,6 +123,11 @@
           <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="userId">
+              <template slot-scope="scope">
+                {{ scope.row.user ? scope.row.user.nickName : '' }}
+              </template>
+            </el-table-column>
             <el-table-column label="费用类型" align="center" prop="expenseType">
               <template slot-scope="scope">
                 <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
@@ -199,24 +204,31 @@
     </el-row>
     <!-- 添加明细 -->
     <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 ref="expenseForm" :model="expenseForm" :rules="rules" label-width="100px">
+        <el-form-item label="负责人" prop="userId">
+          <el-select v-model="expenseForm.userId" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="费用类型" prop="expenseType">
-          <el-select v-model="form.expenseType" placeholder="请选择" clearable @change="expenseTypePath">
+          <el-select v-model="expenseForm.expenseType" placeholder="请选择" clearable @change="expenseTypePath">
             <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-input v-model="expenseForm.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"
+          <el-date-picker clearable v-model="expenseForm.occurDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择发生日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注说明" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注说明" style="width:220px" />
+          <el-input type="textarea" v-model="expenseForm.remark" placeholder="请输入备注说明" style="width:220px" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
           <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
@@ -225,9 +237,9 @@
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
               tag="ul">
               <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                <el-link :href="`${baseUrl}${'/profile/upload' + form.document}`" :underline="false" target="_blank">
+                <el-link :href="`${baseUrl}${'/profile/upload' + expenseForm.document}`" :underline="false" target="_blank">
                   <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                    {{ getFileName(form.document) }}
+                    {{ getFileName(expenseForm.document) }}
                   </span>
                 </el-link>
               </li>
@@ -288,9 +300,10 @@
 
 <script>
 import { getCar } from '@/api/oa/car/car.js'
-import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
+import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
 import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
 import { listCarApproval } from "@/api/oa/car/carApproval";
+import { listUser } from '@/api/system/user';
 export default {
   data() {
     let validateExpense = (rule, value, callback) => {
@@ -311,6 +324,7 @@ export default {
       carInfo: {},
       expenseList: [],
       approvalList: [],
+      userList: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -327,7 +341,9 @@ export default {
       modifyOpen: false,
       scrapOpen: false,
       scrapModifyOpen: false,
-      form: {},
+      expenseForm: {
+        userId: 17,
+      },
       scrapForm: {},
       scrapButtonName: '',
       expenseName: '',
@@ -351,6 +367,7 @@ export default {
         this.carInfo = res.data;
       })
       this.getList();
+      this.getUserList();
       this.getScrapStatus();
     }
     if (this.$store.state.app.device == 'desktop') {
@@ -362,7 +379,7 @@ export default {
   methods: {
     getList() {
       this.queryParams.carId = this.$route.query.carId;
-      listCarExpense(this.queryParams).then(res => {
+      listDeviceExpense(this.queryParams).then(res => {
         this.expenseList = res.rows;
         this.expenseTotal = res.total;
       });
@@ -372,10 +389,15 @@ export default {
         this.approvalTotal = res.total;
       })
     },
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
     goBack() {
       let obj = { path: "/car/detail" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/car' });
+      this.$router.push({ path: '/car/index' });
     },
     getScrapStatus() {
       this.queryParams.carId = this.$route.query.carId
@@ -393,7 +415,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.carExpenseId)
+      this.ids = selection.map(item => item.deviceExpenseId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -404,32 +426,32 @@ export default {
     },
     handleUpdate(row) {
       this.reset();
-      const carExpenseId = row.carExpenseId || this.ids
-      getCarExpense(carExpenseId).then(response => {
-        this.form = response.data;
+      const deviceExpenseId = row.deviceExpenseId || this.ids
+      getDeviceExpense(deviceExpenseId).then(response => {
+        this.expenseForm = response.data;
         this.modifyOpen = true;
         this.open = true;
         this.title = "修改车辆明细";
       });
     },
     handleDelete(row) {
-      const carExpenseIds = row.carExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
-        return delCarExpense(carExpenseIds);
+      const deviceExpenseIds = row.deviceExpenseId || this.ids;
+      this.$modal.confirm('是否确认删除车辆费用编号为"' + deviceExpenseIds + '"的数据项？').then(function () {
+        return delDeviceExpense(deviceExpenseIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
     handleExport() {
-      this.download('oa/carExpense/export', {
+      this.download('oa/deviceExpense/export', {
         ...this.queryParams
-      }, `carExpense_${new Date().getTime()}.xlsx`)
+      }, `deviceExpense_${new Date().getTime()}.xlsx`)
     },
     // 表单重置
     reset() {
-      this.form = {
-        carExpenseId: null,
+      this.expenseForm = {
+        deviceExpenseId: null,
         carId: null,
         expenseType: null,
         expense: null,
@@ -441,16 +463,16 @@ export default {
     submitForm() {
       this.$refs["expenseForm"].validate(valid => {
         if (valid) {
-          this.form.carId = this.$route.query.carId
-          if (this.form.carExpenseId != null) {
-            updateCarExpense(this.form).then(response => {
+          this.expenseForm.carId = this.$route.query.carId
+          if (this.expenseForm.deviceExpenseId != null) {
+            updateDeviceExpense(this.expenseForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.modifyOpen = false;
               this.getList();
             });
           } else {
-            addCarExpense(this.form).then(response => {
+            addDeviceExpense(this.expenseForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -467,9 +489,9 @@ export default {
     //费用附件路径
     getExpensePath(val) {
       let arr = val.split('/upload')
-      this.form.document = arr[1]
+      this.expenseForm.document = arr[1]
       if (val == "") {
-        this.form.document = ""
+        this.expenseForm.document = ""
       }
     },
     //报废附件路径

oa-ui/src/views/oa/car/expense.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车辆id" prop="carId">
+        <el-input
+          v-model="queryParams.carId"
+          placeholder="请输入车辆id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入负责人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="费用金额" prop="expense">
+        <el-input
+          v-model="queryParams.expense"
+          placeholder="请输入费用金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发生日期" prop="occurDate">
+        <el-date-picker clearable
+          v-model="queryParams.occurDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发生日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="附件" prop="document">
+        <el-input
+          v-model="queryParams.document"
+          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="['car:record: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="['car:record: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="['car:record: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="['car:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="车辆id" align="center" prop="carId" />
+      <el-table-column label="负责人id" align="center" prop="userId" />
+      <el-table-column label="费用类型" align="center" prop="expenseType" />
+      <el-table-column label="费用金额" align="center" prop="expense" />
+      <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.occurDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="附件" align="center" prop="document" />
+      <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="['car:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['car:record: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="设备id" prop="carId">
+          <el-input v-model="form.carId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="负责人id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入负责人id" />
+        </el-form-item>
+        <el-form-item label="费用金额" prop="expense">
+          <el-input v-model="form.expense" placeholder="请输入费用金额" />
+        </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-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="form.document" 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 { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
+
+export default {
+  name: "DeviceExpense",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备费用表格数据
+      deviceExpenseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carId: null,
+        userId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null,
+        document: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备费用列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.deviceId = 0;
+      listDeviceExpense(this.queryParams).then(response => {
+        this.deviceExpenseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceExpenseId: null,
+        carId: null,
+        userId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null,
+        remark: null,
+        document: 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.deviceExpenseId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备费用";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceExpenseId = row.deviceExpenseId || this.ids
+      getDeviceExpense(deviceExpenseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备费用";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceExpenseId != null) {
+            updateDeviceExpense(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceExpense(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceExpenseIds = row.deviceExpenseId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function() {
+        return delDeviceExpense(deviceExpenseIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceExpense/export', {
+        ...this.queryParams
+      }, `deviceExpense_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/car/scrap.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">      
+      <el-form-item label="车辆id" prop="carId">
+        <el-input
+          v-model="queryParams.carId"
+          placeholder="请输入车辆id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原价值" prop="cost">
+        <el-input
+          v-model="queryParams.cost"
+          placeholder="请输入原价值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报废日期" prop="scrapDate">
+        <el-date-picker clearable
+          v-model="queryParams.scrapDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择报废日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="报废原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入报废原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理结果" prop="deal">
+        <el-input
+          v-model="queryParams.deal"
+          placeholder="请输入处理结果"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="附件" prop="document">
+        <el-input
+          v-model="queryParams.document"
+          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="['car:record: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="['car:record: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="['car:record: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="['car:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceScrapList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="车辆id" align="center" prop="carId" />
+      <el-table-column label="原价值" align="center" prop="cost" />
+      <el-table-column label="报废日期" align="center" prop="scrapDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.scrapDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报废原因" align="center" prop="reason" />
+      <el-table-column label="处理结果" align="center" prop="deal" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="附件" align="center" prop="document" />
+      <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="['car:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['car:record: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="车辆id" prop="carId">
+          <el-input v-model="form.carId" placeholder="请输入车辆id" />
+        </el-form-item>
+        <el-form-item label="原价值" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入原价值" />
+        </el-form-item>
+        <el-form-item label="报废日期" prop="scrapDate">
+          <el-date-picker clearable
+            v-model="form.scrapDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择报废日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报废原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入报废原因" />
+        </el-form-item>
+        <el-form-item label="处理结果" prop="deal">
+          <el-input v-model="form.deal" placeholder="请输入处理结果" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="form.document" 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 { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
+
+export default {
+  name: "DeviceScrap",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备报废表格数据
+      deviceScrapList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carId: null,
+        cost: null,
+        scrapDate: null,
+        reason: null,
+        deal: null,
+        document: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备报废列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.deviceId = 0;
+      listDeviceScrap(this.queryParams).then(response => {
+        this.deviceScrapList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceScrapId: null,
+        carId: null,
+        cost: null,
+        scrapDate: null,
+        reason: null,
+        deal: null,
+        remark: null,
+        document: 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.deviceScrapId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备报废";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceScrapId = row.deviceScrapId || this.ids
+      getDeviceScrap(deviceScrapId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备报废";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceScrapId != null) {
+            updateDeviceScrap(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceScrap(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceScrapIds = row.deviceScrapId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function() {
+        return delDeviceScrap(deviceScrapIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceScrap/export', {
+        ...this.queryParams
+      }, `deviceScrap_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-11 16:35:10
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-13 21:33:20
 -->
 <template>
   <div class="app-container">
@@ -33,8 +33,8 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+    <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:contract:add']">新增</el-button>
       </el-col>
@@ -45,13 +45,13 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:contract:remove']">删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:contract:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
+    </el-row>
 
     <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />

oa-ui/src/views/oa/contract/subContract.vue

@@ -88,38 +88,6 @@
     </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:subContract: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:subContract: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:subContract:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -157,22 +125,8 @@
       <el-table-column label="签订扫描件" align="center" prop="signScan" />
       <el-table-column label="评审方式" align="center" prop="commentType" />
       <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:subContract:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:subContract:remove']"
-          >删除</el-button>
-        </template>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:subContract:query']">查看</el-button>
       </el-table-column>
     </el-table>
     
@@ -300,6 +254,12 @@ export default {
         this.loading = false;
       });
     },
+    handleView(row) {
+      this.openInfo = true;
+      this.title = "合同详情";
+      this.form = row;
+      this.$set(this.taskForm,'formId',row.subContractId)
+    },
     // 取消按钮
     cancel() {
       this.open = false;

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

@@ -89,6 +89,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="分管审批意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="分管审批时间" prop="managerTime">
         <el-date-picker clearable
           v-model="queryParams.managerTime"
@@ -145,6 +153,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="汇款凭证" prop="remitDocument">
+        <el-input
+          v-model="queryParams.remitDocument"
+          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>
@@ -220,6 +236,7 @@
       </el-table-column>
       <el-table-column label="申请说明" align="center" prop="applyReason" />
       <el-table-column label="相关附件" align="center" prop="applyDocument" />
+      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
       <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
@@ -243,6 +260,7 @@
       </el-table-column>
       <el-table-column label="财务打款备注" align="center" prop="cwComment" />
       <el-table-column label="财务处理人" align="center" prop="cwUserId" />
+      <el-table-column label="汇款凭证" align="center" prop="remitDocument" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -317,6 +335,9 @@
         <el-form-item label="相关附件" prop="applyDocument">
           <el-input v-model="form.applyDocument" placeholder="请输入相关附件" />
         </el-form-item>
+        <el-form-item label="分管审批意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+        </el-form-item>
         <el-form-item label="分管审批时间" prop="managerTime">
           <el-date-picker clearable
             v-model="form.managerTime"
@@ -358,6 +379,9 @@
         <el-form-item label="财务处理人" prop="cwUserId">
           <el-input v-model="form.cwUserId" placeholder="请输入财务处理人" />
         </el-form-item>
+        <el-form-item label="汇款凭证" prop="remitDocument">
+          <el-input v-model="form.remitDocument" placeholder="请输入汇款凭证" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -408,13 +432,15 @@ export default {
         applyTime: null,
         applyReason: null,
         applyDocument: null,
+        managerComment: null,
         managerTime: null,
         managerUserId: null,
         remitTime: null,
         cwTime: null,
         backTime: null,
         cwComment: null,
-        cwUserId: null
+        cwUserId: null,
+        remitDocument: null
       },
       // 表单参数
       form: {},
@@ -457,13 +483,15 @@ export default {
         applyTime: null,
         applyReason: null,
         applyDocument: null,
+        managerComment: null,
         managerTime: null,
         managerUserId: null,
         remitTime: null,
         cwTime: null,
         backTime: null,
         cwComment: null,
-        cwUserId: null
+        cwUserId: null,
+        remitDocument: null
       };
       this.resetForm("form");
     },

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

@@ -0,0 +1,552 @@
+<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="applier">
+        <el-input
+          v-model="queryParams.applier"
+          placeholder="请输入申请人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="使用部门" prop="useDept">
+        <el-input
+          v-model="queryParams.useDept"
+          placeholder="请输入使用部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备id" prop="devices">
+        <el-input
+          v-model="queryParams.devices"
+          placeholder="请输入设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改后设备id" prop="modifyDevices">
+        <el-input
+          v-model="queryParams.modifyDevices"
+          placeholder="请输入修改后设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申领事由" prop="applyReason">
+        <el-input
+          v-model="queryParams.applyReason"
+          placeholder="请输入申领事由"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始日期" prop="beginDate">
+        <el-date-picker clearable
+          v-model="queryParams.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="queryParams.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="queryParams.days"
+          placeholder="请输入天数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审批人" prop="managerUserId">
+        <el-input
+          v-model="queryParams.managerUserId"
+          placeholder="请输入分管审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审批意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调度员" prop="dispatcher">
+        <el-input
+          v-model="queryParams.dispatcher"
+          placeholder="请输入调度员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调度审批意见" prop="dispatchComment">
+        <el-input
+          v-model="queryParams.dispatchComment"
+          placeholder="请输入调度审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计设备成本" prop="estimateCost">
+        <el-input
+          v-model="queryParams.estimateCost"
+          placeholder="请输入预计设备成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期" prop="applyDate">
+        <el-date-picker clearable
+          v-model="queryParams.applyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="确认日期" prop="confirmDate">
+        <el-date-picker clearable
+          v-model="queryParams.confirmDate"
+          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="queryParams.returnDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择归还日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="需维修设备id" prop="repairDevices">
+        <el-input
+          v-model="queryParams.repairDevices"
+          placeholder="请输入需维修设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管审批时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调度审批时间" prop="dispatchTime">
+        <el-date-picker clearable
+          v-model="queryParams.dispatchTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择调度审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['device:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceApprovalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备申请id" align="center" prop="deviceApplyId" />
+      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="使用部门" align="center" prop="useDept" />
+      <el-table-column label="设备id" align="center" prop="devices" />
+      <el-table-column label="修改后设备id" align="center" prop="modifyDevices" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="申领事由" align="center" prop="applyReason" />
+      <el-table-column label="开始日期" align="center" prop="beginDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="天数" align="center" prop="days" />
+      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
+      <el-table-column label="调度员" align="center" prop="dispatcher" />
+      <el-table-column label="调度审批意见" align="center" prop="dispatchComment" />
+      <el-table-column label="预计设备成本" align="center" prop="estimateCost" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认日期" align="center" prop="confirmDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="归还日期" align="center" prop="returnDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.returnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="需维修设备id" align="center" prop="repairDevices" />
+      <el-table-column label="备注说明" align="center" prop="remark" />
+      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="调度审批时间" align="center" prop="dispatchTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dispatchTime, '{y}-{m}-{d}') }}</span>
+        </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="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="modifyDevices">
+          <el-input v-model="form.modifyDevices" 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="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+        </el-form-item>
+        <el-form-item label="分管审批意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+        </el-form-item>
+        <el-form-item label="调度员" prop="dispatcher">
+          <el-input v-model="form.dispatcher" placeholder="请输入调度员" />
+        </el-form-item>
+        <el-form-item label="调度审批意见" prop="dispatchComment">
+          <el-input v-model="form.dispatchComment" placeholder="请输入调度审批意见" />
+        </el-form-item>
+        <el-form-item label="预计设备成本" prop="estimateCost">
+          <el-input v-model="form.estimateCost" 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="confirmDate">
+          <el-date-picker clearable
+            v-model="form.confirmDate"
+            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-item label="需维修设备id" prop="repairDevices">
+          <el-input v-model="form.repairDevices" placeholder="请输入需维修设备id" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注说明" />
+        </el-form-item>
+        <el-form-item label="部门审批时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="分管审批时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="调度审批时间" prop="dispatchTime">
+          <el-date-picker clearable
+            v-model="form.dispatchTime"
+            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 { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
+
+export default {
+  name: "DeviceApproval",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备审批表格数据
+      deviceApprovalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applier: null,
+        useDept: null,
+        devices: null,
+        modifyDevices: null,
+        projectId: null,
+        applyReason: null,
+        beginDate: null,
+        endDate: null,
+        days: null,
+        managerUserId: null,
+        managerComment: null,
+        dispatcher: null,
+        dispatchComment: null,
+        estimateCost: null,
+        applyDate: null,
+        confirmDate: null,
+        returnDate: null,
+        repairDevices: null,
+        deptTime: null,
+        managerTime: null,
+        dispatchTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备审批列表 */
+    getList() {
+      this.loading = true;
+      listDeviceApproval(this.queryParams).then(response => {
+        this.deviceApprovalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceApplyId: null,
+        applier: null,
+        useDept: null,
+        devices: null,
+        modifyDevices: null,
+        projectId: null,
+        applyReason: null,
+        beginDate: null,
+        endDate: null,
+        days: null,
+        managerUserId: null,
+        managerComment: null,
+        dispatcher: null,
+        dispatchComment: null,
+        estimateCost: null,
+        applyDate: null,
+        confirmDate: null,
+        returnDate: null,
+        repairDevices: null,
+        remark: null,
+        deptTime: null,
+        managerTime: null,
+        dispatchTime: 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.deviceApplyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceApplyId = row.deviceApplyId || this.ids
+      getDeviceApproval(deviceApplyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceApplyId != 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();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceApplyIds = row.deviceApplyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备审批编号为"' + deviceApplyIds + '"的数据项？').then(function() {
+        return delDeviceApproval(deviceApplyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceApproval/export', {
+        ...this.queryParams
+      }, `deviceApproval_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -421,7 +421,7 @@
 
 <script>
 import { getDevice } from '@/api/oa/device/device.js'
-import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
+import { listDeviceApproval } from "@/api/oa/device/deviceApproval";
 import { listDeviceHandover, getDeviceHandover, delDeviceHandover, addDeviceHandover, updateDeviceHandover } from "@/api/oa/device/deviceHandover";
 import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
 import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";

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

@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备id" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入负责人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="费用金额" prop="expense">
+        <el-input
+          v-model="queryParams.expense"
+          placeholder="请输入费用金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发生日期" prop="occurDate">
+        <el-date-picker clearable
+          v-model="queryParams.occurDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发生日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="附件" prop="document">
+        <el-input
+          v-model="queryParams.document"
+          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="['device:record: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="['device:record: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="['device:record: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="['device:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="负责人id" align="center" prop="userId" />
+      <el-table-column label="费用类型" align="center" prop="expenseType" />
+      <el-table-column label="费用金额" align="center" prop="expense" />
+      <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.occurDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="附件" align="center" prop="document" />
+      <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="['device:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record: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="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="负责人id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入负责人id" />
+        </el-form-item>
+        <el-form-item label="费用金额" prop="expense">
+          <el-input v-model="form.expense" placeholder="请输入费用金额" />
+        </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-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="form.document" 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 { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
+
+export default {
+  name: "DeviceExpense",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备费用表格数据
+      deviceExpenseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        userId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null,
+        document: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备费用列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.carId = 0;
+      listDeviceExpense(this.queryParams).then(response => {
+        this.deviceExpenseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceExpenseId: null,
+        deviceId: null,
+        userId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null,
+        remark: null,
+        document: 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.deviceExpenseId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备费用";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceExpenseId = row.deviceExpenseId || this.ids
+      getDeviceExpense(deviceExpenseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备费用";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceExpenseId != null) {
+            updateDeviceExpense(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceExpense(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceExpenseIds = row.deviceExpenseId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function() {
+        return delDeviceExpense(deviceExpenseIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceExpense/export', {
+        ...this.queryParams
+      }, `deviceExpense_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备id" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原价值" prop="cost">
+        <el-input
+          v-model="queryParams.cost"
+          placeholder="请输入原价值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报废日期" prop="scrapDate">
+        <el-date-picker clearable
+          v-model="queryParams.scrapDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择报废日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="报废原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入报废原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理结果" prop="deal">
+        <el-input
+          v-model="queryParams.deal"
+          placeholder="请输入处理结果"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="附件" prop="document">
+        <el-input
+          v-model="queryParams.document"
+          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="['device:record: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="['device:record: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="['device:record: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="['device:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceScrapList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="原价值" align="center" prop="cost" />
+      <el-table-column label="报废日期" align="center" prop="scrapDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.scrapDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报废原因" align="center" prop="reason" />
+      <el-table-column label="处理结果" align="center" prop="deal" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="附件" align="center" prop="document" />
+      <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="['device:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record: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="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="原价值" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入原价值" />
+        </el-form-item>
+        <el-form-item label="报废日期" prop="scrapDate">
+          <el-date-picker clearable
+            v-model="form.scrapDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择报废日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报废原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入报废原因" />
+        </el-form-item>
+        <el-form-item label="处理结果" prop="deal">
+          <el-input v-model="form.deal" placeholder="请输入处理结果" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="form.document" 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 { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
+
+export default {
+  name: "DeviceScrap",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备报废表格数据
+      deviceScrapList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        cost: null,
+        scrapDate: null,
+        reason: null,
+        deal: null,
+        document: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备报废列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.carId = 0;
+      listDeviceScrap(this.queryParams).then(response => {
+        this.deviceScrapList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceScrapId: null,
+        deviceId: null,
+        cost: null,
+        scrapDate: null,
+        reason: null,
+        deal: null,
+        remark: null,
+        document: 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.deviceScrapId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备报废";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceScrapId = row.deviceScrapId || this.ids
+      getDeviceScrap(deviceScrapId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备报废";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceScrapId != null) {
+            updateDeviceScrap(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceScrap(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceScrapIds = row.deviceScrapId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function() {
+        return delDeviceScrap(deviceScrapIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceScrap/export', {
+        ...this.queryParams
+      }, `deviceScrap_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/supply/handover.vue

@@ -0,0 +1,357 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备id" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="移交部门id" prop="handoverDeptId">
+        <el-input
+          v-model="queryParams.handoverDeptId"
+          placeholder="请输入移交部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="移交人id" prop="handoverUserId">
+        <el-input
+          v-model="queryParams.handoverUserId"
+          placeholder="请输入移交人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="移交日期" prop="handoverDate">
+        <el-date-picker clearable
+          v-model="queryParams.handoverDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择移交日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="接收部门id" prop="receiveDeptId">
+        <el-input
+          v-model="queryParams.receiveDeptId"
+          placeholder="请输入接收部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接收人id" prop="receiveUserId">
+        <el-input
+          v-model="queryParams.receiveUserId"
+          placeholder="请输入接收人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备软件说明" prop="description">
+        <el-input
+          v-model="queryParams.description"
+          placeholder="请输入设备软件说明"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交接原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          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="['device:record: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="['device:record: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="['device:record: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="['device:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceHandoverList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备移交id" align="center" prop="deviceHandoverId" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="移交部门id" align="center" prop="handoverDeptId" />
+      <el-table-column label="移交人id" align="center" prop="handoverUserId" />
+      <el-table-column label="移交日期" align="center" prop="handoverDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.handoverDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收部门id" align="center" prop="receiveDeptId" />
+      <el-table-column label="接收人id" align="center" prop="receiveUserId" />
+      <el-table-column label="设备软件说明" align="center" prop="description" />
+      <el-table-column label="交接原因" align="center" prop="reason" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['device:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record: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="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="移交部门id" prop="handoverDeptId">
+          <el-input v-model="form.handoverDeptId" placeholder="请输入移交部门id" />
+        </el-form-item>
+        <el-form-item label="移交人id" prop="handoverUserId">
+          <el-input v-model="form.handoverUserId" placeholder="请输入移交人id" />
+        </el-form-item>
+        <el-form-item label="移交日期" prop="handoverDate">
+          <el-date-picker clearable
+            v-model="form.handoverDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择移交日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="接收部门id" prop="receiveDeptId">
+          <el-input v-model="form.receiveDeptId" placeholder="请输入接收部门id" />
+        </el-form-item>
+        <el-form-item label="接收人id" prop="receiveUserId">
+          <el-input v-model="form.receiveUserId" placeholder="请输入接收人id" />
+        </el-form-item>
+        <el-form-item label="设备软件说明" prop="description">
+          <el-input v-model="form.description" placeholder="请输入设备软件说明" />
+        </el-form-item>
+        <el-form-item label="交接原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入交接原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listDeviceHandover, getDeviceHandover, delDeviceHandover, addDeviceHandover, updateDeviceHandover } from "@/api/oa/device/deviceHandover";
+
+export default {
+  name: "DeviceHandover",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备移交表格数据
+      deviceHandoverList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        handoverDeptId: null,
+        handoverUserId: null,
+        handoverDate: null,
+        receiveDeptId: null,
+        receiveUserId: null,
+        description: null,
+        reason: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备移交列表 */
+    getList() {
+      this.loading = true;
+      listDeviceHandover(this.queryParams).then(response => {
+        this.deviceHandoverList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceHandoverId: null,
+        deviceId: null,
+        handoverDeptId: null,
+        handoverUserId: null,
+        handoverDate: null,
+        receiveDeptId: null,
+        receiveUserId: null,
+        description: null,
+        reason: null,
+        remark: 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.deviceHandoverId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备移交";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceHandoverId = row.deviceHandoverId || this.ids
+      getDeviceHandover(deviceHandoverId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备移交";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceHandoverId != null) {
+            updateDeviceHandover(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceHandover(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceHandoverIds = row.deviceHandoverId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备移交编号为"' + deviceHandoverIds + '"的数据项？').then(function() {
+        return delDeviceHandover(deviceHandoverIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deviceHandover/export', {
+        ...this.queryParams
+      }, `deviceHandover_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -20,6 +20,10 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:tender: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:tender: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:tender:remove']">删除</el-button>