设备计提折旧

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

@@ -3,6 +3,9 @@ package com.ruoyi.web.controller.oa;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +37,9 @@ public class CmcBorrowController extends BaseController
     @Autowired
     private ICmcBorrowService cmcBorrowService;
 
+    @Autowired
+    private ICmcProjectService cmcProjectService;
+
     /**
      * 查询cmc借款申请列表
      */
@@ -74,6 +80,10 @@ public class CmcBorrowController extends BaseController
     public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
     {
         cmcBorrow.setApplyDept(getLoginUser().getDeptId());
+        if (cmcBorrow.getProjectId() != null) {
+            CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(cmcBorrow.getProjectId());
+            cmcBorrow.setBorrowUsage(cmcProject.getProjectNumber() + "-" + cmcProject.getProjectName());
+        }
         return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
     }
 

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

@@ -80,7 +80,7 @@ public class CmcCarController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
     {
-        if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() != null) {
+        if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() == null) {
             // 年数总和法折旧
             int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));
             int life = cmcCar.getExpectLife() == null ? 0 : cmcCar.getExpectLife();
@@ -90,7 +90,7 @@ public class CmcCarController extends BaseController
             if (total > 0) {
                 int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
                 int num = life - (currentYear - acquisitionYear) + 1;
-                BigDecimal estimateCost = new BigDecimal(num  * 0.95 * 10000 / total / 365).multiply(cmcCar.getCost());
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 / total / 365).multiply(cmcCar.getCost());
                 cmcCar.setDayCost(estimateCost);
             }
         }
@@ -104,6 +104,20 @@ public class CmcCarController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
     {
+        if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() == null) {
+            // 年数总和法折旧
+            int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));
+            int life = cmcCar.getExpectLife() == null ? 0 : cmcCar.getExpectLife();
+            int total = 0;
+            for (int i = 0; i < life + 1; i++)
+                total += i;
+            if (total > 0) {
+                int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
+                int num = life - (currentYear - acquisitionYear) + 1;
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 / total / 365).multiply(cmcCar.getCost());
+                cmcCar.setDayCost(estimateCost);
+            }
+        }
         return toAjax(cmcCarService.updateCmcCar(cmcCar));
     }
 

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.DateUtils;
+import liquibase.pro.packaged.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -87,7 +88,7 @@ public class CmcDeviceController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDevice cmcDevice)
     {
-        if (cmcDevice.getAcquisitionTime() != null && cmcDevice.getCost() != null && cmcDevice.getDayCost() != null) {
+        if (cmcDevice.getAcquisitionTime() != null && cmcDevice.getCost() != null && cmcDevice.getDayCost() == null) {
             // 年数总和法折旧
             int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcDevice.getAcquisitionTime()));
             int life = cmcDevice.getExpectLife() == null ? 0 : cmcDevice.getExpectLife();
@@ -97,7 +98,7 @@ public class CmcDeviceController extends BaseController
             if (total > 0) {
                 int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
                 int num = life - (currentYear - acquisitionYear) + 1;
-                BigDecimal estimateCost = new BigDecimal(num  * 0.95 * 10000 / total / 365).multiply(cmcDevice.getCost());
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 / total / 365).multiply(cmcDevice.getCost());
                 cmcDevice.setDayCost(estimateCost);
             }
         }
@@ -111,9 +112,51 @@ public class CmcDeviceController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcDevice cmcDevice)
     {
+        if (cmcDevice.getAcquisitionTime() != null && cmcDevice.getCost() != null && cmcDevice.getDayCost() == null) {
+            // 年数总和法折旧
+            int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcDevice.getAcquisitionTime()));
+            int life = cmcDevice.getExpectLife() == null ? 0 : cmcDevice.getExpectLife();
+            int total = 0;
+            for (int i = 0; i < life + 1; i++)
+                total += i;
+            if (total > 0) {
+                int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
+                int num = life - (currentYear - acquisitionYear) + 1;
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 / total / 365).multiply(cmcDevice.getCost());
+                cmcDevice.setDayCost(estimateCost);
+            }
+        }
         return toAjax(cmcDeviceService.updateCmcDevice(cmcDevice));
     }
 
+    /**
+     * 修改cmc设备信息
+     */
+    @Log(title = "cmc设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/dayCost")
+    public AjaxResult editDayCost()
+    {
+        List<CmcDevice> list = cmcDeviceService.selectCmcDeviceList(new CmcDevice());
+        for (CmcDevice cmcDevice : list) {
+            if (cmcDevice.getAcquisitionTime() != null && cmcDevice.getCost() != null && cmcDevice.getDayCost() == null) {
+                // 年数总和法折旧
+                int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcDevice.getAcquisitionTime()));
+                int life = cmcDevice.getExpectLife() == null ? 0 : cmcDevice.getExpectLife();
+                int total = 0;
+                for (int i = 0; i < life + 1; i++)
+                    total += i;
+                if (total > 0) {
+                    int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
+                    int num = life - (currentYear - acquisitionYear) + 1;
+                    BigDecimal estimateCost = new BigDecimal(num  * 0.95 / total / 365).multiply(cmcDevice.getCost());
+                    cmcDevice.setDayCost(estimateCost);
+                }
+            }
+            cmcDeviceService.updateCmcDevice(cmcDevice);
+        }
+        return toAjax(list.size());
+    }
+
     /**
      * 删除cmc设备信息
      */

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

@@ -27,93 +27,93 @@ public class CmcArchive extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
+
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String submitSituation;
 
     /** 项目负责人 */
     @Excel(name = "项目负责人")
     private String leaderUserName;
     private Long projectLeader;
 
-    /** 生产部门检查员 */
-    @Excel(name = "生产部门检查员")
-    private String produceUserName;
-    private Long produceInspector;
-
-    /** 质量检查员 */
-    @Excel(name = "质量检查员")
-    private String qualityUserName;
-    private Long qualityInspector;
-
-    /** 技术部负责人 */
-    @Excel(name = "技术部负责人")
-    private String deptUserName;
-    private Long deptLeader;
-
-    /** 资料归档人 */
-    @Excel(name = "资料归档人")
-    private String archiveUserName;
-    private Long archiver;
-
-    private SysUser leaderUser;
-
-    private SysUser produceUser;
-
-    private SysUser qualityUser;
-
-    private SysUser deptUser;
-
-    private SysUser archiveUser;
-
     /** 成果提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "成果提交日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date submitTime;
 
+    /** 生产部门意见 */
+    @Excel(name = "生产部门意见")
+    private String produceComment;
+
+    /** 生产部门检查员 */
+    @Excel(name = "生产部门检查员")
+    private String produceUserName;
+    private Long produceInspector;
+
     /** 资料接收时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "资料接收时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date receiveTime;
 
+    /** 生产部门检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产部门检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date produceTime;
+
+    /** 质量检查意见 */
+    @Excel(name = "质量检查意见")
+    private String qualityComment;
+
+    /** 质量检查员 */
+    @Excel(name = "质量检查员")
+    private String qualityUserName;
+    private Long qualityInspector;
+
     /** 质量检查时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "质量检查时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date qualityTime;
 
-    /** 生产部门检查时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "生产部门检查时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date produceTime;
+    /** 技术质量与安全部审核意见 */
+    @Excel(name = "技术质量与安全部审核意见")
+    private String deptComment;
 
-    /** 技术部审核时间 */
+    /** 技术质量与安全部负责人 */
+    @Excel(name = "技术质量与安全部负责人")
+    private String deptUserName;
+    private Long deptLeader;
+
+    /** 技术质量与安全部审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "技术部审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "技术质量与安全部审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deptTime;
 
+    /** 归档审核意见 */
+    @Excel(name = "归档审核意见")
+    private String archiveComment;
+
+    /** 资料归档员 */
+    @Excel(name = "资料归档员")
+    private String archiveUserName;
+    private Long archiver;
+
     /** 归档时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date archiveTime;
 
-    /** 备注说明 */
-    @Excel(name = "备注说明")
-    private String submitSituation;
+    private SysUser leaderUser;
 
+    private SysUser produceUser;
 
-    /** 生产部门意见 */
-    @Excel(name = "生产部门意见")
-    private String produceComment;
+    private SysUser qualityUser;
 
-    /** 质量检查意见 */
-    @Excel(name = "质量检查意见")
-    private String qualityComment;
+    private SysUser deptUser;
 
-    /** 技术部审核意见 */
-    @Excel(name = "技术部审核意见")
-    private String deptComment;
+    private SysUser archiveUser;
 
-    /** 归档审核意见 */
-    @Excel(name = "归档审核意见")
-    private String archiveComment;
+    private CmcProject project;
 
     public void setArchiveId(String archiveId) 
     {

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

@@ -29,7 +29,6 @@ public class CmcBorrow extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
 
     /** 借款事由 */
     @Excel(name = "借款事由")
@@ -39,135 +38,135 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "借款用途")
     private String borrowUsage;
 
+    /** 借款附件 */
+    private String borrowDocument;
+
+    /** 申请金额 */
+    @Excel(name = "申请金额")
+    private BigDecimal applyAmount;
+
+    /** 核准金额 */
+    @Excel(name = "核准金额")
+    private BigDecimal managerAmount;
+
     /** 借款部门 */
     @Excel(name = "借款部门")
     private Long applyDept;
 
-    private SysDept dept;
-
     /** 借款人 */
-    private Long applier;
-
     @Excel(name = "借款人")
     private String applierUserName;
-    private SysUser applierUser;
-
-    @Excel(name = "部门审批人")
-    private String deptUserName;
-    private SysUser deptUser;
-
-    @Excel(name = "分管审批人")
-    private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "总经理")
-    private String zjlUserName;
-    private SysUser zjlUser;
-
-    @Excel(name = "董事长")
-    private String dszUserName;
-    private SysUser dszUser;
-
-    @Excel(name = "党工团审批人")
-    private String unionUserName;
-    private SysUser unionUser;
-
-    @Excel(name = "财务部经办人")
-    private String cwUserName;
-    private SysUser cwUser;
+    private Long applier;
 
     /** 借款日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "借款日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyDate;
 
-    /** 申请金额 */
-    @Excel(name = "申请金额")
-    private BigDecimal applyAmount;
-
-    /** 核准金额 */
-    @Excel(name = "核准金额")
-    private BigDecimal managerAmount;
-
     /** 部门意见 */
     @Excel(name = "部门意见")
     private String deptComment;
 
     /** 部门审批人 */
+    @Excel(name = "部门审批人")
+    private String deptUserName;
     private Long deptUserId;
 
+    /** 部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
     /** 分管审批意见 */
     @Excel(name = "分管审批意见")
     private String managerComment;
 
     /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private String managerUserName;
     private Long managerUserId;
 
-    /** 总经理审批人 */
-    private Long zjlUserId;
-
-    /** 董事长审批人 */
-    private Long dszUserId;
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
 
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 总经理审 */
+    @Excel(name = "总经理")
+    private String zjlUserName;
+    private Long zjlUserId;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
     /** 董事长审批意见 */
     @Excel(name = "董事长审批意见")
     private String dszComment;
 
-    /** 工会审批人 */
-    private Long unionUserId;
+    /** 董事长 */
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private Long dszUserId;
+
+    /** 董事长审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "董事长审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dszTime;
 
-    /** 工会审批意见 */
-    @Excel(name = "工会审批意见")
+    /** 党工团审批意见 */
+    @Excel(name = "党工团审批意见")
     private String unionComment;
 
-    /** 财务部经办人 */
-    private Long cwUserId;
+    /** 党工团审批人 */
+    @Excel(name = "党工团审批人")
+    private String unionUserName;
+    private Long unionUserId;
+
+    /** 党工团审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "党工团审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date unionTime;
 
     /** 财务部支付备注 */
     @Excel(name = "财务部支付备注")
     private String cwComment;
 
     /** 支付凭证 */
-    @Excel(name = "支付凭证")
     private String lendDocument;
 
-    /** 借款附件 */
-    @Excel(name = "借款附件")
-    private String borrowDocument;
+    /** 财务部经办人 */
+    @Excel(name = "财务部经办人")
+    private String cwUserName;
+    private Long cwUserId;
 
-    /** 部门审批时间 */
+    /** 借款支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deptTime;
+    @Excel(name = "借款支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lendTime;
 
-    /** 分管审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date managerTime;
+    private SysDept dept;
 
-    /** 总经理审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date zjlTime;
+    private SysUser applierUser;
 
-    /** 董事长审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "董事长审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dszTime;
+    private SysUser deptUser;
 
-    /** 工会审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "工会审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date unionTime;
+    private SysUser managerUser;
 
-    /** 借款支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "借款支付时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date lendTime;
+    private SysUser zjlUser;
+
+    private SysUser dszUser;
+
+    private SysUser unionUser;
+
+    private SysUser cwUser;
+
+    private CmcProject project;
 
     public void setBorrowId(String borrowId) 
     {

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -34,7 +35,7 @@ public class CmcBrandProject extends BaseEntity
     private String partyAId;
 
     @Excel(name = "甲方单位")
-    private CmcPartyA partyA;
+    private String partyAName;
 
     /** 甲方单位联系人 */
     @Excel(name = "甲方单位联系人")
@@ -48,7 +49,7 @@ public class CmcBrandProject extends BaseEntity
     private String partnerId;
 
     @Excel(name = "合作单位")
-    private CmcPartner partner;
+    private String partnerName;
 
     /** 合作单位联系人 */
     @Excel(name = "合作单位联系人")
@@ -72,8 +73,15 @@ public class CmcBrandProject extends BaseEntity
 
     /** 项目登记人 */
     @Excel(name = "项目登记人")
+    private String registrantUserName;
     private Long projectRegistrant;
 
+    private SysUser registrantUser;
+
+    private CmcPartyA partyA;
+
+    private CmcPartner partner;
+
     /** 项目登记日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "项目登记日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -118,6 +126,7 @@ public class CmcBrandProject extends BaseEntity
     public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
+        this.partyAName = partyA == null ? "" : partyA.getPartyAName();
     }
 
     public CmcPartyA getPartyA()
@@ -154,6 +163,7 @@ public class CmcBrandProject extends BaseEntity
     public void setPartner(CmcPartner partner)
     {
         this.partner = partner;
+        this.partnerName = partner == null ? "" : partner.getPartnerName();
     }
 
     public CmcPartner getPartner()
@@ -223,6 +233,16 @@ public class CmcBrandProject extends BaseEntity
     {
         return registerTime;
     }
+        public void setRegistrantUser(SysUser registrantUser)
+    {
+        this.registrantUser = registrantUser;
+        this.registrantUserName = registrantUser == null ? "" : registrantUser.getNickName();
+    }
+
+    public SysUser getRegistrantUser()
+    {
+        return registrantUser;
+    }
 
     @Override
     public String toString() {

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

@@ -30,7 +30,13 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "项目名称")
     private String projectName;
 
-    private CmcProject project;
+    /** 预算总额 */
+    @Excel(name = "预算总额")
+    private BigDecimal totalBudget;
+
+    /** 间接成本 */
+    @Excel(name = "间接成本")
+    private BigDecimal fixCost;
 
     /** 人员成本 */
     @Excel(name = "人员成本")
@@ -44,9 +50,9 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "设备成本")
     private BigDecimal deviceCost;
 
-    /** 固定成本 */
-    @Excel(name = "固定成本")
-    private BigDecimal fixCost;
+    /** 直接成本 */
+    @Excel(name = "直接成本")
+    private BigDecimal directExpense;
 
     /** 预结算额 */
     @Excel(name = "预结算额")
@@ -56,76 +62,73 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "外协费用")
     private BigDecimal outExpense;
 
-    /** 经营费用 */
-    @Excel(name = "经营费用")
-    private BigDecimal businessExpense;
-
-    /** 税费成本 */
-    @Excel(name = "税费成本")
-    private BigDecimal taxExpense;
-
-    /** 车船租赁 */
-    @Excel(name = "车船租赁")
-    private BigDecimal rentExpense;
-
-    /** 其他费用 */
-    @Excel(name = "其他费用")
-    private BigDecimal otherExpense;
-
     /** 外协费用备注 */
     @Excel(name = "外协费用备注")
     private String outRemark;
 
+    /** 经营费用 */
+    @Excel(name = "经营费用")
+    private BigDecimal businessExpense;
+
     /** 经营管理备注 */
     @Excel(name = "经营管理备注")
     private String businessRemark;
 
+    /** 税费成本 */
+    @Excel(name = "税费成本")
+    private BigDecimal taxExpense;
+
     /** 税费成本备注 */
     @Excel(name = "税费成本备注")
     private String taxRemark;
 
+    /** 车船租赁 */
+    @Excel(name = "车船租赁")
+    private BigDecimal rentExpense;
+
     /** 车船租赁备注 */
     @Excel(name = "车船租赁备注")
     private String rentRemark;
 
+    /** 其他费用 */
+    @Excel(name = "其他费用")
+    private BigDecimal otherExpense;
+
     /** 其他费用备注 */
     @Excel(name = "其他费用备注")
     private String otherRemark;
 
-    /** 直接成本 */
-    @Excel(name = "直接成本")
-    private BigDecimal directExpense;
-
-    /** 预算总额 */
-    @Excel(name = "预算总额")
-    private BigDecimal totalBudget;
-
     /** 编制人 */
+    @Excel(name = "编制人")
+    private String compilerUserName;
     private Long compiler;
 
-    /** 董事长 */
-    private Long approver;
+    /** 预算编制时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预算编制时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTime;
 
     /** 分管审核人 */
+    @Excel(name = "分管审核意见")
+    private String managerComment;
     private Long manager;
 
-    @Excel(name = "编制人")
-    private String compilerUserName;
-    private SysUser compilerUser;
-
+    /** 董事长 */
     @Excel(name = "分管审核人")
     private String managerUserName;
-    private SysUser managerUser;
+    private Long approver;
 
-    @Excel(name = "总经理")
-    private String zjlUserName;
-    private SysUser zjlUser;
+    /** 分管审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
 
-    @Excel(name = "董事长")
-    private String dszUserName;
-    private SysUser dszUser;
+    @Excel(name = "总经理审批意见")
+    private String zjlComment;
 
     /** 总经理 */
+    @Excel(name = "总经理")
+    private String zjlUserName;
     private Long auditor;
 
     /** 总经理审批时间 */
@@ -133,24 +136,26 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zjlTime;
 
-    /** 分管审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date managerTime;
+    @Excel(name = "董事长批准意见")
+    private String dszComment;
+
+    @Excel(name = "董事长")
+    private String dszUserName;
 
     /** 董事长批准时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dszTime;
 
-    @Excel(name = "分管审核意见")
-    private String managerComment;
+    private SysUser compilerUser;
 
-    @Excel(name = "总经理审批意见")
-    private String zjlComment;
+    private SysUser managerUser;
 
-    @Excel(name = "董事长批准意见")
-    private String dszComment;
+    private SysUser zjlUser;
+
+    private SysUser dszUser;
+
+    private CmcProject project;
 
     public void setBudgetId(String budgetId)
     {
@@ -411,6 +416,16 @@ public class CmcBudget extends BaseEntity
     {
         return dszUser;
     }
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
     public void setManagerTime(Date managerTime)
     {
         this.managerTime = managerTime;

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

@@ -28,19 +28,30 @@ public class CmcCar extends BaseEntity
 
     /** 驾驶员（常用） */
     @Excel(name = "驾驶员")
+    private String driverUserName;
     private Long driver;
 
-    private SysUser driverUser;
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
+    /** 车型 */
+    @Excel(name = "车型")
+    private String series;
+
+    /** 单日成本 */
+    @Excel(name = "单日成本")
+    private BigDecimal dayCost;
+
+    /** 总价 */
+    @Excel(name = "总价（元）")
+    private BigDecimal cost;
 
     /** 购置时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acquisitionTime;
 
-    /** 总价 */
-    @Excel(name = "总价")
-    private BigDecimal cost;
-
     /** 预计使用年限 */
     @Excel(name = "预计使用年限")
     private Integer expectLife;
@@ -49,26 +60,20 @@ public class CmcCar extends BaseEntity
     @Excel(name = "预计行驶里程（万千米）")
     private Integer expectKm;
 
-    /** 车型 */
-    @Excel(name = "车型")
-    private String series;
-
-    /** 品牌 */
-    @Excel(name = "品牌")
-    private String brand;
-
     /** 是否为租车 */
-    @Excel(name = "是否为租车")
+    @Excel(name = "是否为租车", readConverterExp = "0=否,1=是")
     private String isRent;
 
-    /** 单日成本 */
-    @Excel(name = "单日成本")
-    private BigDecimal dayCost;
-
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", readConverterExp = "0=被领用,1=可领用,2=维修中,3=已停用,4=已报废")
     private String status;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    private SysUser driverUser;
+
     public void setCarId(Integer carId)
     {
         this.carId = carId;
@@ -99,6 +104,7 @@ public class CmcCar extends BaseEntity
     public void setDriverUser(SysUser driverUser)
     {
         this.driverUser = driverUser;
+        this.driverUserName = driverUser == null ? "" : driverUser.getNickName();
     }
 
     public SysUser getDriverUser()
@@ -186,6 +192,15 @@ public class CmcCar extends BaseEntity
     {
         return status;
     }
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
 
     @Override
     public String toString() {

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

@@ -76,7 +76,7 @@ public class CmcDevice extends BaseEntity
     private SysDept dept;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", readConverterExp = "0=被领用,1=可领用,2=维修中,3=已停用,4=已报废")
     private String status;
 
     public void setDeviceId(Integer deviceId)

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

@@ -44,7 +44,7 @@ public class CmcSettle extends BaseEntity
     private String zhUserName;
     private SysUser zhUser;
 
-    @Excel(name = "技术质量部审核人")
+    @Excel(name = "技术质量与安全部审核人")
     private String jsUserName;
     private SysUser jsUser;
 
@@ -85,16 +85,16 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "综合事务部审核意见")
     private String zhComment;
 
-    /** 技术质量部审核人 */
+    /** 技术质量与安全部审核人 */
     private Long jsUserId;
 
-    /** 技术质量部审核日期 */
+    /** 技术质量与安全部审核日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "技术质量部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "技术质量与安全部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date jsTime;
 
-    /** 技术质量部审核意见 */
-    @Excel(name = "技术质量部审核意见")
+    /** 技术质量与安全部审核意见 */
+    @Excel(name = "技术质量与安全部审核意见")
     private String jsComment;
 
     /** 经营发展部审核人 */

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

@@ -20,10 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="projectRegistrant"    column="project_registrant"    />
         <result property="registerTime"    column="register_time"    />
+        <association property="registrantUser"    javaType="SysUser"         resultMap="RegistrantResult" />
         <association property="partner"    javaType="CmcPartner"         resultMap="CmcPartnerResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
+    <resultMap type="SysUser" id="RegistrantResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="registrant_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcPartner" id="CmcPartnerResult">
         <result property="partnerId"    column="partner_id"    />
         <result property="partnerName"    column="partner_name"    />
@@ -36,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcBrandProjectVo">
         select bp.project_id, bp.project_number, bp.project_name, bp.party_a_id, pa.party_a_name, bp.a_person, bp.a_phone, bp.partner_id, p.partner_name, bp.contact_person, bp.telephone,
-               bp.duration, bp.amount, bp.content, bp.remark, bp.register_time, bp.project_registrant from cmc_brand_project as bp
+               bp.duration, bp.amount, bp.content, bp.remark, bp.register_time, bp.project_registrant, u.nick_name as registrant_nick_name from cmc_brand_project as bp
+        left join sys_user as u on u.user_id = bp.project_registrant
         left join cmc_partner as p on p.partner_id = bp.partner_id
         left join cmc_party_a as pa on pa.party_a_id = bp.party_a_id
     </sql>

oa-back/sql/sql.sql

@@ -343,7 +343,8 @@ insert into sys_role values('8', '经营管理员',	'business', 8, 2, 1, 1, '0',
 insert into sys_role values('9', '财务管理员',	'finance', 9, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '财务管理员');
 insert into sys_role values('10', '技术管理员',	'technical', 10, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '技术管理员');
 insert into sys_role values('11', '安全管理员',	'safe', 11, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '安全管理员');
-insert into sys_role values('12', '部门领导',	'dept', 12, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '部门领导');
+insert into sys_role values('12', '项目管理员',	'project', 12, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '项目管理员');
+insert into sys_role values('13', '部门负责人',	'dept', 13, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '部门负责人');
 
 -- ----------------------------
 -- 5、菜单权限表
@@ -382,13 +383,13 @@ insert into sys_menu values('2', 	'系统监控', '0', '2', 'monitor',	null, '',
 insert into sys_menu values('3', 	'系统工具', '0', '3', 'tool',		null, '', 1, 0, 'M', '0', '0', '', 'tool',		'admin', sysdate(), '', null, '系统工具目录');
 insert into sys_menu values('4', 	'生产管理', '0', '4', 'product', 	null, '', 1, 0, 'M', '0', '0', '', 'date-range','admin', sysdate(), '', null, '生产管理目录');
 insert into sys_menu values('5', 	'经营管理', '0', '5', 'business', 	null, '', 1, 0, 'M', '0', '0', '', 'business', 	'admin', sysdate(), '', null, '经营管理目录');
-insert into sys_menu values('6', 	'办公管理', '0', '6', 'oa', 		null, '', 1, 0, 'M', '0', '0', '', 'component', 'admin', sysdate(), '', null, '办公管理目录');
+insert into sys_menu values('6', 	'办公管理', '0', '6', 'oa', 		null, '', 1, 0, 'M', '0', '0', '', 'project', 	'admin', sysdate(), '', null, '办公管理目录');
 insert into sys_menu values('7', 	'人事管理', '6', '1', 'staff',		null, '', 1, 0, 'M', '0', '0', '', 'user',		'admin', sysdate(), '', null, '人事管理目录');
 insert into sys_menu values('8', 	'设备管理', '6', '2', 'device',		null, '', 1, 0, 'M', '0', '0', '', 'equipment',	'admin', sysdate(), '', null, '设备管理目录');
 insert into sys_menu values('9', 	'车辆管理', '6', '3', 'car',		null, '', 1, 0, 'M', '0', '0', '', 'car',		'admin', sysdate(), '', null, '车辆管理目录');
 insert into sys_menu values('10', 	'合同评审', '5', '2', 'contract',	null, '', 1, 0, 'M', '0', '0', '', 'documentation',	'admin', sysdate(), '', null, '合同评审目录');
 insert into sys_menu values('11', 	'保证金管理','5','3', 'deposit',	null, '', 1, 0, 'M', '0', '0', '', 'cost',		'admin', sysdate(), '', null, '保证金管理目录');
-insert into sys_menu values('12', 	'项目台账', '4', '1', 'account',	null, '', 1, 0, 'M', '0', '0', '', 'project',	'admin', sysdate(), '', null, '项目台账目录');
+insert into sys_menu values('12', 	'项目台账', '4', '1', 'account',	null, '', 1, 0, 'M', '0', '0', '', 'list',		'admin', sysdate(), '', null, '项目台账目录');
 insert into sys_menu values('13', 	'安全管理', '4', '2', 'safe',		null, '', 1, 0, 'M', '0', '0', '', 'validCode',	'admin', sysdate(), '', null, '安全管理目录');
 insert into sys_menu values('14', 	'技术管理', '4', '3', 'tech',		null, '', 1, 0, 'M', '0', '0', '', 'clipboard',	'admin', sysdate(), '', null, '技术管理目录');
 insert into sys_menu values('15', 	'资料成果', '4', '4', 'archive',	null, '', 1, 0, 'M', '0', '0', '', 'education',	'admin', sysdate(), '', null, '资料成果目录');
@@ -402,7 +403,7 @@ insert into sys_menu values('103',  '部门管理', '1',   '4', 'dept',       's
 insert into sys_menu values('104',  '岗位管理', '1',   '5', 'post',       'system/post/index',        '', 1, 0, 'C', '0', '0', 'system:post:list',        'post',          'admin', sysdate(), '', null, '岗位管理菜单');
 insert into sys_menu values('105',  '字典管理', '1',   '6', 'dict',       'system/dict/index',        '', 1, 0, 'C', '0', '0', 'system:dict:list',        'dict',          'admin', sysdate(), '', null, '字典管理菜单');
 insert into sys_menu values('106',  '参数设置', '1',   '7', 'config',     'system/config/index',      '', 1, 0, 'C', '0', '0', 'system:config:list',      'edit',          'admin', sysdate(), '', null, '参数设置菜单');
-insert into sys_menu values('107',  '通知公告', '1',   '8', 'notice',     'system/notice/index',      '', 1, 0, 'C', '0', '0', 'system:notice:list',      'message',       'admin', sysdate(), '', null, '通知公告菜单');
+insert into sys_menu values('107',  '通知公示', '1',   '8', 'notice',     'system/notice/index',      '', 1, 0, 'C', '0', '0', 'system:notice:list',      'message',       'admin', sysdate(), '', null, '通知公示菜单');
 insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        '',                         '', 1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
 insert into sys_menu values('109',  '在线用户', '2',   '1', 'online',     'monitor/online/index',     '', 1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        'admin', sysdate(), '', null, '在线用户菜单');
 insert into sys_menu values('110',  '定时任务', '2',   '2', 'job',        'monitor/job/index',        '', 1, 0, 'C', '0', '0', 'monitor:job:list',        'job',           'admin', sysdate(), '', null, '定时任务菜单');
@@ -495,11 +496,11 @@ insert into sys_menu values('1033', '参数新增', '106', '2', '#', '', '', 1,
 insert into sys_menu values('1034', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1035', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1036', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1037', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1038', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1039', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1040', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
+-- 通知公示按钮
+insert into sys_menu values('1037', '公示查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1038', '公示新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1039', '公示修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1040', '公示删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
 -- 操作日志按钮
 insert into sys_menu values('1041', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query',      '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1042', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove',     '#', 'admin', sysdate(), '', null, '');
@@ -710,7 +711,7 @@ INSERT INTO `sys_user_role` VALUES (8, 2);
 INSERT INTO `sys_user_role` VALUES (8, 3);
 INSERT INTO `sys_user_role` VALUES (8, 5);
 INSERT INTO `sys_user_role` VALUES (8, 7);
-INSERT INTO `sys_user_role` VALUES (8, 12);
+INSERT INTO `sys_user_role` VALUES (8, 13);
 INSERT INTO `sys_user_role` VALUES (9, 2);
 INSERT INTO `sys_user_role` VALUES (9, 7);
 INSERT INTO `sys_user_role` VALUES (10, 2);
@@ -724,11 +725,12 @@ INSERT INTO `sys_user_role` VALUES (13, 7);
 INSERT INTO `sys_user_role` VALUES (14, 2);
 INSERT INTO `sys_user_role` VALUES (14, 7);
 INSERT INTO `sys_user_role` VALUES (14, 9);
-INSERT INTO `sys_user_role` VALUES (14, 12);
+INSERT INTO `sys_user_role` VALUES (14, 13);
 INSERT INTO `sys_user_role` VALUES (15, 2);
 INSERT INTO `sys_user_role` VALUES (15, 7);
 INSERT INTO `sys_user_role` VALUES (15, 8);
 INSERT INTO `sys_user_role` VALUES (15, 12);
+INSERT INTO `sys_user_role` VALUES (15, 13);
 INSERT INTO `sys_user_role` VALUES (16, 2);
 INSERT INTO `sys_user_role` VALUES (16, 5);
 INSERT INTO `sys_user_role` VALUES (17, 2);
@@ -738,10 +740,10 @@ INSERT INTO `sys_user_role` VALUES (18, 3);
 INSERT INTO `sys_user_role` VALUES (19, 2);
 INSERT INTO `sys_user_role` VALUES (20, 2);
 INSERT INTO `sys_user_role` VALUES (20, 8);
-INSERT INTO `sys_user_role` VALUES (20, 12);
+INSERT INTO `sys_user_role` VALUES (20, 13);
 INSERT INTO `sys_user_role` VALUES (21, 2);
 INSERT INTO `sys_user_role` VALUES (21, 8);
-INSERT INTO `sys_user_role` VALUES (21, 12);
+INSERT INTO `sys_user_role` VALUES (21, 13);
 INSERT INTO `sys_user_role` VALUES (22, 2);
 INSERT INTO `sys_user_role` VALUES (22, 8);
 INSERT INTO `sys_user_role` VALUES (23, 2);
@@ -755,12 +757,12 @@ INSERT INTO `sys_user_role` VALUES (26, 8);
 INSERT INTO `sys_user_role` VALUES (27, 2);
 INSERT INTO `sys_user_role` VALUES (28, 2);
 INSERT INTO `sys_user_role` VALUES (28, 9);
-INSERT INTO `sys_user_role` VALUES (28, 12);
+INSERT INTO `sys_user_role` VALUES (28, 13);
 INSERT INTO `sys_user_role` VALUES (29, 2);
 INSERT INTO `sys_user_role` VALUES (30, 2);
 INSERT INTO `sys_user_role` VALUES (31, 2);
 INSERT INTO `sys_user_role` VALUES (32, 2);
-INSERT INTO `sys_user_role` VALUES (32, 12);
+INSERT INTO `sys_user_role` VALUES (32, 13);
 INSERT INTO `sys_user_role` VALUES (33, 2);
 INSERT INTO `sys_user_role` VALUES (34, 2);
 INSERT INTO `sys_user_role` VALUES (35, 2);
@@ -768,7 +770,7 @@ INSERT INTO `sys_user_role` VALUES (36, 2);
 INSERT INTO `sys_user_role` VALUES (37, 2);
 INSERT INTO `sys_user_role` VALUES (38, 2);
 INSERT INTO `sys_user_role` VALUES (39, 2);
-INSERT INTO `sys_user_role` VALUES (39, 12);
+INSERT INTO `sys_user_role` VALUES (39, 13);
 INSERT INTO `sys_user_role` VALUES (40, 2);
 INSERT INTO `sys_user_role` VALUES (41, 2);
 INSERT INTO `sys_user_role` VALUES (42, 2);
@@ -776,7 +778,7 @@ INSERT INTO `sys_user_role` VALUES (43, 2);
 INSERT INTO `sys_user_role` VALUES (44, 2);
 INSERT INTO `sys_user_role` VALUES (45, 2);
 INSERT INTO `sys_user_role` VALUES (46, 2);
-INSERT INTO `sys_user_role` VALUES (46, 12);
+INSERT INTO `sys_user_role` VALUES (46, 13);
 INSERT INTO `sys_user_role` VALUES (46, 10);
 INSERT INTO `sys_user_role` VALUES (47, 2);
 INSERT INTO `sys_user_role` VALUES (48, 2);
@@ -793,11 +795,11 @@ INSERT INTO `sys_user_role` VALUES (57, 2);
 INSERT INTO `sys_user_role` VALUES (58, 2);
 INSERT INTO `sys_user_role` VALUES (58, 11);
 INSERT INTO `sys_user_role` VALUES (59, 2);
-INSERT INTO `sys_user_role` VALUES (59, 12);
+INSERT INTO `sys_user_role` VALUES (59, 13);
 INSERT INTO `sys_user_role` VALUES (60, 2);
-INSERT INTO `sys_user_role` VALUES (60, 12);
+INSERT INTO `sys_user_role` VALUES (60, 13);
 INSERT INTO `sys_user_role` VALUES (61, 2);
-INSERT INTO `sys_user_role` VALUES (61, 12);
+INSERT INTO `sys_user_role` VALUES (61, 13);
 INSERT INTO `sys_user_role` VALUES (62, 2);
 INSERT INTO `sys_user_role` VALUES (63, 2);
 INSERT INTO `sys_user_role` VALUES (64, 2);
@@ -820,9 +822,9 @@ INSERT INTO `sys_user_role` VALUES (80, 2);
 INSERT INTO `sys_user_role` VALUES (81, 2);
 INSERT INTO `sys_user_role` VALUES (82, 2);
 INSERT INTO `sys_user_role` VALUES (83, 2);
-INSERT INTO `sys_user_role` VALUES (83, 12);
+INSERT INTO `sys_user_role` VALUES (83, 13);
 INSERT INTO `sys_user_role` VALUES (84, 2);
-INSERT INTO `sys_user_role` VALUES (84, 12);
+INSERT INTO `sys_user_role` VALUES (84, 13);
 INSERT INTO `sys_user_role` VALUES (85, 2);
 INSERT INTO `sys_user_role` VALUES (86, 2);
 INSERT INTO `sys_user_role` VALUES (87, 2);
@@ -840,9 +842,9 @@ INSERT INTO `sys_user_role` VALUES (98, 2);
 INSERT INTO `sys_user_role` VALUES (99, 2);
 INSERT INTO `sys_user_role` VALUES (100, 2);
 INSERT INTO `sys_user_role` VALUES (101, 2);
-INSERT INTO `sys_user_role` VALUES (101, 12);
+INSERT INTO `sys_user_role` VALUES (101, 13);
 INSERT INTO `sys_user_role` VALUES (102, 2);
-INSERT INTO `sys_user_role` VALUES (102, 12);
+INSERT INTO `sys_user_role` VALUES (102, 13);
 INSERT INTO `sys_user_role` VALUES (103, 2);
 INSERT INTO `sys_user_role` VALUES (104, 2);
 INSERT INTO `sys_user_role` VALUES (105, 2);
@@ -857,7 +859,7 @@ INSERT INTO `sys_user_role` VALUES (113, 2);
 INSERT INTO `sys_user_role` VALUES (114, 2);
 INSERT INTO `sys_user_role` VALUES (115, 2);
 INSERT INTO `sys_user_role` VALUES (116, 2);
-INSERT INTO `sys_user_role` VALUES (116, 12);
+INSERT INTO `sys_user_role` VALUES (116, 13);
 INSERT INTO `sys_user_role` VALUES (117, 2);
 INSERT INTO `sys_user_role` VALUES (118, 2);
 INSERT INTO `sys_user_role` VALUES (119, 2);
@@ -880,12 +882,12 @@ INSERT INTO `sys_user_role` VALUES (135, 2);
 INSERT INTO `sys_user_role` VALUES (136, 2);
 INSERT INTO `sys_user_role` VALUES (137, 2);
 INSERT INTO `sys_user_role` VALUES (138, 2);
-INSERT INTO `sys_user_role` VALUES (138, 12);
+INSERT INTO `sys_user_role` VALUES (138, 13);
 INSERT INTO `sys_user_role` VALUES (139, 2);
 INSERT INTO `sys_user_role` VALUES (140, 2);
 INSERT INTO `sys_user_role` VALUES (141, 2);
 INSERT INTO `sys_user_role` VALUES (142, 2);
-INSERT INTO `sys_user_role` VALUES (142, 12);
+INSERT INTO `sys_user_role` VALUES (142, 13);
 INSERT INTO `sys_user_role` VALUES (143, 2);
 INSERT INTO `sys_user_role` VALUES (144, 2);
 INSERT INTO `sys_user_role` VALUES (145, 2);
@@ -1112,7 +1114,6 @@ insert into `sys_role_menu` values (8, 1103);
 insert into `sys_role_menu` values (8, 1107);
 insert into `sys_role_menu` values (8, 1108);
 insert into `sys_role_menu` values (8, 1112);
-insert into `sys_role_menu` values (8, 1117);
 insert into `sys_role_menu` values (9, 10);
 insert into `sys_role_menu` values (9, 16);
 insert into `sys_role_menu` values (9, 133);
@@ -1162,7 +1163,8 @@ insert into `sys_role_menu` values (11, 1138);
 insert into `sys_role_menu` values (11, 1139);
 insert into `sys_role_menu` values (11, 1140);
 insert into `sys_role_menu` values (11, 1144);
-insert into `sys_role_menu` values (12, 1114);
+insert into `sys_role_menu` values (12, 1117);
+insert into `sys_role_menu` values (13, 1114);
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门
@@ -1497,7 +1499,7 @@ insert into sys_dict_data values (13, 2, '系统', 'SYSTEM', 'sys_job_group', ''
 insert into sys_dict_data values (14, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '系统默认是');
 insert into sys_dict_data values (15, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '系统默认否');
 insert into sys_dict_data values (16, 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '通知');
-insert into sys_dict_data values (17, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '公告');
+insert into sys_dict_data values (17, 2, '公示', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '公示');
 insert into sys_dict_data values (18, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '正常状态');
 insert into sys_dict_data values (19, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '关闭状态');
 insert into sys_dict_data values (20, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '其他操作');
@@ -1783,30 +1785,27 @@ create table sys_job_log (
 
 
 -- ----------------------------
+-- 17、通知公示表
 -- ----------------------------
 drop table if exists sys_notice;
 create table sys_notice (
-  notice_id         int(4)          not null auto_increment    comment '公告ID',
-  notice_title      varchar(50)     not null                   comment '公告标题',
-  notice_type       char(1)         not null                   comment '公告类型（1通知 2公告）',
-  notice_content    longblob        default null               comment '公告内容',
-  status            char(1)         default '0'                comment '公告状态（0正常 1关闭）',
+  notice_id         int(4)          not null auto_increment    comment '公示ID',
+  notice_title      varchar(50)     not null                   comment '标题',
+  notice_type       char(1)         not null                   comment '类型（1通知 2公示）',
+  notice_content    longblob        default null               comment '内容',
+  status            char(1)         default '0'                comment '状态（0正常 1关闭）',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_time       datetime                                   comment '创建时间',
   update_by         varchar(64)     default ''                 comment '更新者',
   update_time       datetime                                   comment '更新时间',
   remark            varchar(255)    default null               comment '备注',
   primary key (notice_id)
-) engine=innodb auto_increment=10 comment = '通知公告表';
+) engine=innodb auto_increment=10 comment = '通知公示表';
 
 -- ----------------------------
+-- 初始化-公示信息表数据
 -- ----------------------------
-insert into sys_notice values('1', '温馨提醒：2024-07-15 综合办公系统公开测试版本发布啦', '2', '新版本内容', '0', '管理员', sysdate(), '', null, '管理员');
-insert into sys_notice values('2', '维护通知：2024-07-15 综合办公系统在试用期间将不定期维护更新', '1', '维护内容',   '0', '管理员', sysdate(), '', null, '管理员');
-
-
+INSERT INTO sys_notice VALUES (1, '关于新版OA系统上线公测的通知', '1', 0x3C703E20202020202020E585B3E4BA8EE696B0E789884F41E7B3BBE7BB9FE4B88AE7BABFE585ACE6B58BE79A84E9809AE79FA520E4B8BAE8BF9BE4B880E6ADA5E4BC98E58C96E585ACE58FB8E58A9EE585ACE887AAE58AA8E58C96E78EAFE5A283EFBC8CE68F90E58D87E5B7A5E4BD9CE69588E78E87EFBC8CE59CB0E79086E4BFA1E681AFE4B8ADE5BF83EFBC88E4BBA5E4B88BE7AE80E7A7B022E68891E4B8ADE5BF8322EFBC89E7BB8FE8BF87E6B7B1E585A5E7A094E7A9B6E5928CE68A80E69CAFE58786E5A487EFBC8CE5BC80E58F91E4BA86E696B0E789884F41E7B3BBE7BB9FE38082E4B8BAE7A1AEE4BF9DE7B3BBE7BB9FE7A8B3E5AE9AE8BF90E8A18CE5B9B6E6BBA1E8B6B3E585ACE58FB8E7AEA1E79086E99C80E6B182EFBC8CE586B3E5AE9AE5AFB9E696B0E789884F41E7B3BBE7BB9FE8BF9BE8A18CE4B88AE7BABFE585ACE5BC80E6B58BE8AF95EFBC8CE5B9B6E5B086E79BB8E585B3E4BA8BE9A1B9E9809AE79FA5E5A682E4B88BEFBC9A3C2F703E3C703E3C7374726F6E673E2020202020202020E4B880E38081E697B6E997B4E5AE89E68E923C2F7374726F6E673E203C2F703E3C703EE696B0E789884F41E7B3BBE7BB9FE5B086E4BA8E32303234E5B9B437E69C883135E697A5E6ADA3E5BC8FE4B88AE7BABFE8BF9BE8A18CE585ACE5BC80E6B58BE8AF95E38082E59CA8E6ADA4E69C9FE997B4EFBC8CE68891E4B8ADE5BF83E8AF9AE98280E585ACE58FB8E59084E9A286E5AFBCE38081E5908CE4BA8BE4BD93E9AA8CE696B0E7B3BBE7BB9FEFBC8CE5B9B6E68F90E587BAE5AE9DE8B4B5E6848FE8A781E38082E585ACE6B58BE7BB93E69D9FE5908EEFBC8CE6A0B9E68DAEE694B6E99B86E588B0E79A84E58F8DE9A688E4BFA1E681AFEFBC8CE68891E4B8ADE5BF83E5B086E5AFB9E7B3BBE7BB9FE8BF9BE8A18CE5BF85E8A681E79A84E8B083E695B4E5928CE4BC98E58C96E38082E8B083E695B4E5908EE79A84E7B3BBE7BB9FE8AEA1E58892E4BA8E32303234E5B9B438E69C8831E697A5E8BF9BE585A5E8AF95E794A8E69C9FEFBC8CE5B18AE697B6E5B086E585A8E99DA2E5BC80E694BEE4BDBFE794A8E69D83E99990E380823C2F703E3C703E20202020202020203C7374726F6E673EE4BA8CE38081E695B0E68DAEE4BF9DE79599E8AFB4E6988E3C2F7374726F6E673E3C2F703E3C703E2020202020202020E585ACE6B58BE69C9FE997B4EFBC8CE695B0E68DAEE58FAFE883BDE6B689E58F8AE5A4A7E9878FE8B083E695B4E38082E8AFB7E59084E4BD8DE9A286E5AFBCE38081E5908CE4BA8BE58AA1E5BF85E6B3A8E6848FEFBC8CE59CA8E6B58BE8AF95E998B6E6AEB5E6B3A8E6848FE4BF9DE5AD98E9878DE8A681E69687E4BBB6E68896E695B0E68DAEE380823C2F703E3C703E20202020202020203C7374726F6E673EE4B889E38081E695B0E68DAEE8BF81E7A7BBE8AFB4E6988E3C2F7374726F6E673E203C2F703E3C703E2020202020202020332E3120E5AFB9E4BA8EE58E9F4F41E7B3BBE7BB9FE4B8ADE5B7B2E7BB8FE5AE8CE68890E79A84E9A1B9E79BAEEFBC8CE68891E4B8ADE5BF83E5B086E8BF9BE8A18CE695B0E68DAEE6B885E6B497E5908EE98090E6ADA5E8BDACE7A7BBE588B0E696B0E789884F41E7B3BBE7BB9FEFBC9B203C2F703E3C703E2020202020202020332E3220E5AFB9E4BA8EE58E9F4F41E7B3BBE7BB9FE4B8ADE5B09AE69CAAE5AE8CE68890E79A84E9A1B9E79BAEEFBC8CE5BE85E5AE8CE68890E5908EE98090E6ADA5E8BDACE7A7BBE588B0E696B0E789884F41E7B3BBE7BB9FEFBC88E8BF87E6B8A1E697B6E997B4E696B0E697A74F41E7B3BBE7BB9FE5B086E5B9B6E8A18CE4BDBFE794A8EFBC89EFBC9BE794B1E4BA8EE58E9F4F41E9A1B9E79BAEE5B9B6E69CAAE59CA8E696B0E789884F41E7B3BBE7BB9FE58F91E8B5B7E79BB8E5BA94E6B581E7A88BEFBC8CE69585E8808CE8BF81E7A7BBE8BF87E69DA5E79A84E695B0E68DAEE4B99FE698AFE6B2A1E69C89E6B581E7A88BE4BFA1E681AFE79A84E38082203C2F703E3C703E2020202020202020332E3320E696B0E9A1B9E79BAEE8AF95E794A8E69C9FE5BC80E5A78BE79BB4E68EA5E59CA8E696B0E789884F41E7B3BBE7BB9FE799BBE8AEB0E380823C2F703E3C703E20202020202020203C7374726F6E673EE59B9BE38081E6B3A8E6848FE4BA8BE9A1B93C2F7374726F6E673E3C2F703E3C703E2020202020202020E585ACE6B58BE69C9FE997B4E58FAFE883BDE4BC9AE98187E588B0E7B3BBE7BB9FE4B88DE7A8B3E5AE9AE68896E58A9FE883BDE99990E588B6E79A84E68385E586B5EFBC8CE68891E4BBACE5B086E5B0BDE58A9BE8A7A3E586B3E587BAE78EB0E79A84E997AEE9A298EFBC8CE4BF9DE8AF81E7B3BBE7BB9FE79A84E7A8B3E5AE9AE8BF90E8A18CE38082E5908CE697B6EFBC8CE8AFB7E68F90E5898DE5819AE5A5BDE5B7A5E4BD9CE5AE89E68E92EFBC8CE4BBA5E5858DE5AFB9E697A5E5B8B8E5B7A5E4BD9CE980A0E68890E5BDB1E5938DE38082E5A682E59CA8E4BDBFE794A8E4B8ADE98187E588B0E4BBBBE4BD95E997AEE9A298EFBC8CE68896E69C89E4BBBBE4BD95E5BBBAE8AEAEEFBC8CE695ACE8AFB7E88194E7B3BBE68891E4B8ADE5BF83E380823C2F703E3C7020636C6173733D22716C2D616C69676E2D7269676874223EE59B9BE5B79DE4B8ADE6B0B4E68890E58B98E999A2E6B58BE7BB98E5B7A5E7A88BE69C89E99990E8B4A3E4BBBBE585ACE58FB83C2F703E3C7020636C6173733D22716C2D616C69676E2D7269676874223EE59CB0E79086E4BFA1E681AFE4B8ADE5BF8309090909093C2F703E3C7020636C6173733D22716C2D616C69676E2D7269676874223E32303234E5B9B437E69C883136E697A5090909093C2F703E, '0', '管理员', '2024-07-15', NULL, NULL, NULL);
 -- ----------------------------
 -- 18、代码生成业务表
 -- ----------------------------
@@ -9335,7 +9334,7 @@ INSERT INTO `cmc_tender` VALUES (10, '新能源前期咨询服务框架采购（
 INSERT INTO `cmc_tender` VALUES (11, '阳东至阳江港高速公路项目公司测绘工程', '阳江市中申高速公路投资有限公司阳东至阳江港高速公路项目公司', NULL, NULL, NULL, NULL, NULL, NULL, 105, 23, 1350000.00, NULL, NULL, '2023-02-17', NULL, NULL, NULL, '阳东至阳江港高速公路项目公司测绘工程合同的施工任务，其中包括以下内容：航拍正摄图、E级GPS控制点(含高程)、水准测量、GPS-RTK一级点、1:2000地形图测量、纵横断 面测量测绘工程等相关施工任务', 23, '2023-02-17', 23, '2023-02-17', 23, 23, 23, NULL);
 INSERT INTO `cmc_tender` VALUES (12, '青海公司玛尔挡水电站水库泥沙监测服务', '国能青海黄河玛尔挡水电开发有限公司', '李轩', '14797769567', '国家能源集团国际工程咨询有限公司', '闫磊', '0991-6809080', '国家能源招标网（网上投标）', 105, 7, 6470000.00, NULL, 100000.00, '2023-03-20', '2023-03-01', 'http://www.chnenergybidding.com.cn', NULL, '中标服务费：53996.15元     履约保证金：履约保函（中标金额的10%（不含暂列金））', 25, '2023-03-17', 57, '2023-03-16', 25, 23, 25, NULL);
 INSERT INTO `cmc_tender` VALUES (13, '泸定水电站2023年水库泥沙监测服务项目', '四川华电泸定水电有限公司', '蒲姝颖', '13996810905', NULL, NULL, NULL, '线上开标', 105, 23, 200000.00, NULL, NULL, '2023-03-22', NULL, NULL, NULL, '1. 项目概况：2022年5月，泸定水电站通过枢纽工程竣工安全鉴定，为落实竣工安全鉴定报告建议，加强库区泥沙监测，分析库区淤积变化情况，并掌握4年来库区泥沙淤积变化情况和校核水位库容曲线，以进一步指导、优化水库调度方式，现需外委开展开展2023年水库泥沙监测工作。\n2. 项目地点：泸定水电站。\n3. 项目服务期限：总工期60个日历天，其中现场作业时间7个日历天，计划开工日期为2023年4月，具体实施时间以泸定公司通知为准。\n4.采购内容：包括泥沙监测断面测量；泥沙监测断面设施检查、修复、基准点校核；水尺检查、校核和修复；测量资料整编；水库泥沙淤积、下游河道冲刷及水位分析，库容分析等，具体详见本项目技术规范书。', 23, '2023-03-22', 57, '2023-03-22', 23, 23, 23, NULL);
-INSERT INTO `cmc_tender` VALUES (14, '乐山市市本级重点区域2021-2023年度自然资源统一确权登记', '乐山市自然资源和规划局', '马老师', '0833-2401721', '四川盛大招标代理有限公司', '冯先生', '0833-2424118', '乐山市市中区嘉州大道625号', 105, 27, 5576519.00, NULL, NULL, '2023-04-03', '2023-03-20', NULL, NULL, '1.确定自然资源登记范围，划定登记单元。明确各项目的基本情况，分析各项目基本特性，依据《自然资源统一确权登记暂行办法》等要求,收集整理相关资料，制作工作底图。充分利用第三次全国国土调查、自然资源专项调查、集体土地所有权确权登记、水资源专项调查、水利普查、探明储量的矿产资源登记数据等现有成果，制定科学实用的技术路线和技术方法，确定自然资源统一确权登记范围,预划自然资源登记单元对重难点，问题提出技术解决方案，并实地核实登记单元界线。\n2.核实权籍调查成果，划清“四条边界”。对权籍调查形成的重要界址点和权属纠纷界限进行实地核实处理，清晰界定自然保护区范围内各类自然资源资产的所有权主体，划清全民所有和集体所有之间的边界，划清全民所有、不同层级政府行使所有权之间的边界，划清不同集体所有者的边界，划清不同类型自然资源之间的边界。\n3.数据上图入库,协助完成登簿。将调查成果数据登记信息系统,形成登记数据库,制作成果图件，探索三维登记模式。协助完成审核、公告和登簿工作。', 23, '2023-04-03', 57, '2023-04-03', 23, 24, 23, NULL);
+INSERT INTO `cmc_tender` VALUES (14, '乐山市市本级重点区域2021-2023年度自然资源统一确权登记', '乐山市自然资源和规划局', '马老师', '0833-2401721', '四川盛大招标代理有限公司', '冯先生', '0833-2424118', '乐山市市中区嘉州大道625号', 105, 27, 5576519.00, NULL, NULL, '2023-04-03', '2023-03-20', NULL, NULL, '1.确定自然资源登记范围，划定登记单元。明确各项目的基本情况，分析各项目基本特性，依据《自然资源统一确权登记暂行办法》等要求,收集整理相关资料，制作工作底图。充分利用第三次全国国土调查、自然资源专项调查、集体土地所有权确权登记、水资源专项调查、水利普查、探明储量的矿产资源登记数据等现有成果，制定科学实用的技术路线和技术方法，确定自然资源统一确权登记范围,预划自然资源登记单元对重难点，问题提出技术解决方案，并实地核实登记单元界线。\n2.核实权籍调查成果，划清“四条边界”。对权籍调查形成的重要界址点和权属纠纷界限进行实地核实处理，清晰界定自然保护区范围内各类自然资源资产的所有权主体，划清全民所有和集体所有之间的边界，划清全民所有、不同层级政府行使所有权之间的边界，划清不同集体所有者的边界，划清不同类型自然资源之间的边界。\n3.数据上图入库,协助完成登簿。将调查成果数据登记信息系统,形成登记数据库,制作成果图件，探索三维登记模式。协助完成审核、公示和登簿工作。', 23, '2023-04-03', 57, '2023-04-03', 23, 24, 23, NULL);
 INSERT INTO `cmc_tender` VALUES (15, '双流黄龙溪镇非建设流转用地地形测绘', '成都市锦上溪建设发展有限公司', '姚先生', '028-87596051', '华春建设工程项目管理有限责任公司', '李先生', '028-63047730', '成都市金牛区侯家桥路129号本项目开标室', 105, 23, 567229.25, NULL, 5000.00, '2023-04-04', NULL, NULL, NULL, '1.项目名称：双流黄龙溪镇非建设流转用地地形测绘。\n2.项目地点：成都市双流区黄龙溪镇川江村。\n3.项目规模：双流黄龙溪镇非建设流转用地一期集建用地占地约130亩，流转用地约2000亩。\n4.资金来源：企业自筹。\n5.质量要求：测量技术要求，符合《工程测量规范》（GB50026）、《城市测量规范》（CJJ/T 8）、《全球定位系统（GPS）测量规范》（GB/T18314）、《1:500、1:1000、1:2000地形图图式》（GB/T20257.1）、以及国家、四川省、成都市现行其他规范或技术标准。\n6.服务期限：20个工作日。\n7.询价范围：双流黄龙溪镇非建设流转用地范围内的1：500地形图测绘，影像测绘（含正射影像及倾斜摄影），土地分类面积测绘等。\n8.标段划分：1个标段。', 23, '2023-04-04', 57, '2023-04-04', 23, 23, 23, NULL);
 INSERT INTO `cmc_tender` VALUES (16, '南江县天然气管网及储气设施改造项目测绘服务采购', '南江县长赤城乡建设投资开发有限公司', '白', '0827-8280616', '成都千一工程项目咨询有限公司', '张', '028-61501001', '巴中市巴州区', 105, 25, 498000.00, NULL, NULL, '2023-04-10', '2023-04-07', 'http://www.ccgp.gov.cn/', NULL, '改造巴中至南江县城4MP天然气管网70公里，改建集州街道至赶场镇、流坝社区燃气管网50公里，改造集州街道、沙河镇、公山镇等老旧供气支管网120公里;新建储气调蓄设施2处，配套相关附属设施。\n完成南江县天然气管网及储气设施改造项目的测绘服务。', 24, '2023-04-08', 57, '2023-04-08', 24, 25, 24, NULL);
 INSERT INTO `cmc_tender` VALUES (17, '成都市锦江区公园城市建设和城市更新局锦江区2023年度耕地“非粮化”“撂荒地”技术服务项目', '成都市锦江区公园城市建设和城市更新局 ', '彭老师', '028-86927657 ', '四川中汇恒工程项目管理咨询有限公司', NULL, '028-85558473', '四川省成都市武侯区太平园中四路大合仓星商界4栋3单元310号', 105, 26, 200000.00, NULL, NULL, '2023-04-11', '2023-04-06', NULL, NULL, NULL, 26, '2023-04-11', NULL, '2023-04-11', 26, NULL, 26, NULL);
@@ -9651,7 +9650,7 @@ INSERT INTO `cmc_contract` VALUES ('1648881410878734337', 'CMC1：A-23061', 'A44
 INSERT INTO `cmc_contract` VALUES ('1648881410879477066', 'HT2020W004', 'PKS-XL-2020-001)', '深溪沟消力池及泄洪洞进出口水下检测及检查合同', NULL, '0077', 438508.00, NULL, NULL, 22, '2020-04-24', NULL, '2020-03-03', NULL, NULL, '2', NULL, 7, '2020-04-28', NULL, NULL, NULL);
 INSERT INTO `cmc_contract` VALUES ('1648881410883138636', 'CMC2：A-22027', NULL, '重庆道路建模项目技术服务合同', NULL, '0019', 38000.00, NULL, NULL, 22, '2022-12-05', '本项目服务费用为人民币38000.00元（人民币：叁万捌仟元整）以上费用包干使用，即已包含作业费、税金、管理费等所有费用。', NULL, NULL, NULL, '2', '已核', 7, '2022-12-23', NULL, NULL, NULL);
 INSERT INTO `cmc_contract` VALUES ('1648881410883917489', 'CMC2：A-24011', '202405YL-1', '南充家丰时装有限公司房产竣工测绘采购服务合同', NULL, '0117', 93519.81, NULL, NULL, 22, '2024-05-31', '第二条  服务费用\n1.依据：由国家测绘局颁布的《测绘工程产品价格》（国测财字[2002]3号），最终合同金额优惠完为93519.81元。', NULL, NULL, NULL, '2', NULL, NULL, '2024-05-31', NULL, NULL, NULL);
-INSERT INTO `cmc_contract` VALUES ('1648881410887197715', 'HT2021W057', 'SGDDB-CH-001', '韶关市韶关大道北（西联隧道至移山路）断面提升改造工程测量测绘合同（竣工阶段）', NULL, '0152', 89268.38, NULL, NULL, 22, '2021-04-15', '收费依据：根据中介超市选取公告中服务金额说明确定合同价。合同价为：89,268.38元（大写：捌万玖仟贰佰陆拾捌元叁角捌分）。\n结算价按实际完成工作量乘以合同单价计算。结算价不得超合同价，若超合同价按合同价结算。', '2021-04-20', NULL, NULL, '2', NULL, 7, '2021-04-16', NULL, NULL, NULL);
+INSERT INTO `cmc_contract` VALUES ('1648881410887197715', 'HT2021W057', 'SGDDB-CH-001', '韶关市韶关大道北（西联隧道至移山路）断面提升改造工程测量测绘合同（竣工阶段）', NULL, '0152', 89268.38, NULL, NULL, 22, '2021-04-15', '收费依据：根据中介超市选取公示中服务金额说明确定合同价。合同价为：89,268.38元（大写：捌万玖仟贰佰陆拾捌元叁角捌分）。\n结算价按实际完成工作量乘以合同单价计算。结算价不得超合同价，若超合同价按合同价结算。', '2021-04-20', NULL, NULL, '2', NULL, 7, '2021-04-16', NULL, NULL, NULL);
 INSERT INTO `cmc_contract` VALUES ('1648881410887847807', 'CMC2：A-23001', NULL, '测绘地理信息成果质量检验数据采集协作协议', NULL, '0161', 0.00, NULL, NULL, 22, '2022-12-05', '甲方根据项目需要，在本协议期限内，委托乙方安排专业人员协助完成测绘地理信息成果质量检验数据采集工作。\n1.2根据项目需要，确定本合同期限为2022年12月10日至2025年12月31日。\n1.3乙方根据甲方的需要，安排符合质检经验和条件的人员，并满足甲方的数量要求。\n1.4参与协作人员按1150元/人/天进行结算。本合同约定，合同签订后不预付经费，按季度项目结束经甲方按照本合同1.5条、1.12条确认后，进行结算。', NULL, NULL, NULL, '2', '已核', 7, '2022-12-07', NULL, NULL, NULL);
 INSERT INTO `cmc_contract` VALUES ('1648881410890414687', 'HT2020W044', NULL, '保税港（水港、空港）片区市政消火栓核查测绘成图项目', NULL, '0267', 453900.00, NULL, NULL, 22, '2020-09-07', NULL, '2020-09-16', NULL, NULL, '2', NULL, 7, '2020-09-09', NULL, NULL, NULL);
 INSERT INTO `cmc_contract` VALUES ('1648881410892891237', 'HT2021C029', 'A237ZB-21-02', '雅砻江孟底沟水电站招标阶段（深化设计）测绘技术服务合同', NULL, '0231', 92300.00, NULL, NULL, 22, '2021-06-15', '经甲、乙双方协商，本合同采用总价承包计价方式，合同总金额为人民币大写：玖万贰仟叁佰元整（小写：92300.00元）。', '2021-06-22', NULL, NULL, '2', NULL, 7, '2021-06-18', NULL, NULL, NULL);
@@ -10185,7 +10184,7 @@ create table `cmc_budget`  (
   `staff_cost` 			decimal(10, 2) 	default null 	comment '人员成本',
   `car_cost` 			decimal(10, 2) 	default null 	comment '车辆成本',
   `device_cost` 		decimal(10, 2) 	default null 	comment '设备成本',
-  `fix_cost` 			decimal(10, 2) 	default null 	comment '固定成本',
+  `fix_cost` 			decimal(10, 2) 	default null 	comment '间接成本',
   `settle_expense` 		decimal(10, 2) 	default null 	comment '预结算额',
   `out_expense` 		decimal(10, 2) 	default null 	comment '外协费用',
   `business_expense` 	decimal(10, 2) 	default null 	comment '经营费用',
@@ -12204,7 +12203,7 @@ INSERT INTO `cmc_borrow` VALUES ('1648881418853460137', NULL, '1', '邻水农经
 INSERT INTO `cmc_borrow` VALUES ('1648881418853470138', NULL, '1', '自贡市沿滩新城区管理委员会卧龙湖东区基础地理测绘项目中标代理服务费', 22, 105, '财务部：\n我公司于2020年7月参加的“四川省自贡市沿滩区沿滩新城区管理委员会卧龙湖东区基础地理测绘采购项目”已中标。根据《招标文件》的要求，本项目中标后需要缴纳中标代理服务费，本项目中标金额为￥478.00万元（大写：肆佰柒拾捌万元整），代理服务费为￥48170.00元（大写：人民币肆万捌仟壹佰柒拾元整）。\n招标代理机构的账户信息如下：\n收款单位：中凯环球国际招标有限公司\n开户银行：中国建设银行股份有限公司自贡汇东支行\n账   号：5105 0161 0046 0000 0227\n\n请贵部协助尽快支付该笔款项。谢谢！\n备注：\n四川省自贡市沿滩区沿滩新城区管理委员会卧龙湖东区基础地理测绘采购项目代理服务费 \n              \n                                          经营发展部\n                                    2020年7月21日', NULL, '2020-07-21', 48170.00, 48170.00, '同意', 15, '同意', 7, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-07-21', '2020-07-22', '2020-07-23', NULL, NULL, '2020-07-23');
 INSERT INTO `cmc_borrow` VALUES ('1648881418853480139', NULL, '1', '房地一体”宅基地使用权、集体建设用地使用权及房屋所有权不动产登记项目', 23, 105, NULL, NULL, '2020-08-11', 71060.00, 71060.00, '同意支付！', 20, '同意，尽快办理', 7, 2, '同意', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-08-11', '2020-08-11', '2020-08-12', NULL, NULL, '2020-08-13');
 INSERT INTO `cmc_borrow` VALUES ('1648881418853490140', '1648881418227154945', '0', NULL, 61, 111, '借款按一车、5人（含司机）、30天预算，后期根据实际工期、人员车辆增加再申请借款。', NULL, '2020-08-20', 41000.00, 41000.00, '同意借款', 61, '建议同意借支', 10, 2, '同意付款。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-08-20', '2020-08-21', '2020-08-26', NULL, NULL, '2020-08-26');
-INSERT INTO `cmc_borrow` VALUES ('1648881418853500141', NULL, '1', '购买安岳县集体建设用地使用权、宅基地“房地一体”不动产统一登记调查测绘监理项目（共1 个包段）招标文件', 22, 105, '根据代理机构的要求，需要从公司开户行账户对公转账300元至代理公司的指定账户。\n详见《安岳县集体建设用地使用权、宅基地“房地一体”不动产统一登记调查测绘监理项目（共1 个包段）磋商文件》第一章P3页的描述：\n七、磋商文件获取方式、时间、地点：\n磋商文件自2020 年9 月9 日至2020 年9 月15 日上午09：30 至11:30 下午14:30\n至16:30(节假日除)外在四川省安岳县岳城街道南山社区茶店子还房11 幢-1 获取。由于疫情原因，供应商可通过邮件报名。\n本项目磋商文件有偿获取，磋商文件售价：人民币300 元/份/包（磋商文件售后不退, 磋商资格不能转让）。\n      供应商按照采购公告内规定的报名费用以银行转账形式将报名费转账到四川鑫华信工程项目管理有限责任公司指定账户(转账时请备注公司名称，如无法备注公司名称请在转账成功后将转账图片及公司名称发送至邮箱scxhxgs@126.com：\n收款单位：四川鑫华信工程项目管理有限责任公司\n开户银行：中国建设银行股份有限公司成都沙河支行\n账号：51050110168600000071', NULL, '2020-09-11', 300.00, 300.00, '同意', 15, '同意', 7, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-09-11', '2020-09-11', '2020-09-14', NULL, NULL, '2020-09-14');
+INSERT INTO `cmc_borrow` VALUES ('1648881418853500141', NULL, '1', '购买安岳县集体建设用地使用权、宅基地“房地一体”不动产统一登记调查测绘监理项目（共1 个包段）招标文件', 22, 105, '根据代理机构的要求，需要从公司开户行账户对公转账300元至代理公司的指定账户。\n详见《安岳县集体建设用地使用权、宅基地“房地一体”不动产统一登记调查测绘监理项目（共1 个包段）磋商文件》第一章P3页的描述：\n七、磋商文件获取方式、时间、地点：\n磋商文件自2020 年9 月9 日至2020 年9 月15 日上午09：30 至11:30 下午14:30\n至16:30(节假日除)外在四川省安岳县岳城街道南山社区茶店子还房11 幢-1 获取。由于疫情原因，供应商可通过邮件报名。\n本项目磋商文件有偿获取，磋商文件售价：人民币300 元/份/包（磋商文件售后不退, 磋商资格不能转让）。\n      供应商按照采购公示内规定的报名费用以银行转账形式将报名费转账到四川鑫华信工程项目管理有限责任公司指定账户(转账时请备注公司名称，如无法备注公司名称请在转账成功后将转账图片及公司名称发送至邮箱scxhxgs@126.com：\n收款单位：四川鑫华信工程项目管理有限责任公司\n开户银行：中国建设银行股份有限公司成都沙河支行\n账号：51050110168600000071', NULL, '2020-09-11', 300.00, 300.00, '同意', 15, '同意', 7, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-09-11', '2020-09-11', '2020-09-14', NULL, NULL, '2020-09-14');
 INSERT INTO `cmc_borrow` VALUES ('1648881418853510142', NULL, '1', '邻水农经权项目2020借款（第二次）', 59, NULL, '1、农经权汇交委外费用，按组算15元/组，财务转账；\n2、中秋节，曾1600化妆品；付、曾、陈、王、刘、财政局甘等，6盒月饼1800。宴请未预算，据票报销。\n涉及70%付款事宜，曾新到任，商务标准是否合适，请领导批示。', NULL, '2020-09-15', 38000.00, 4000.00, '已核，委外费用不予立项，以合同款的方式支付；商务费用基本合理，建议按3410.00元借支。', 13, '同意', 7, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-09-17', '2020-09-22', '2020-09-24', NULL, NULL, '2020-09-25');
 INSERT INTO `cmc_borrow` VALUES ('1648881418853520143', '1648881418881466369', '0', NULL, 21, 105, '该项目水文分析划界部分初审', NULL, '2020-09-21', 10000.00, 10000.00, '同意', 15, '建议同意借支', 10, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-09-21', '2020-09-21', '2020-09-22', NULL, NULL, '2020-09-22');
 INSERT INTO `cmc_borrow` VALUES ('1648881418853530144', '1648881418034216962', '0', NULL, 83, 111, NULL, NULL, '2020-10-08', 85000.00, 85000.00, '同意。', 83, '建议同意借支。', 10, 2, '同意支付', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2020-10-08', '2020-10-12', '2020-10-12', NULL, NULL, '2020-10-14');
@@ -12738,7 +12737,7 @@ INSERT INTO `cmc_borrow` VALUES ('1648881418858800671', NULL, '1', '猴子岩水
 INSERT INTO `cmc_borrow` VALUES ('1648881418858810672', NULL, '1', '邻水农经权项目2022年6月', 59, NULL, '1、县城生活费较乡镇高一些，黄文峰工作至10日离开后，项目部计5人；\n3、现场无公车，按里程每公里2元补贴私车公用；\n4、临时工和实习生工资、按实际工作量计算至6月20日。', NULL, '2022-07-08', 28670.00, 28670.00, '情况属实，同意借款。', 20, '同意', 11, 2, '同意拨付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-07-08', '2022-07-11', '2022-07-12', NULL, NULL, '2022-07-13');
 INSERT INTO `cmc_borrow` VALUES ('1648881418858820673', '1648881413328207874', '0', NULL, 101, 112, '项目计划本月底或下月初进场，生产参与人员3人～4人，外业工期预计1个月。', NULL, '2022-10-24', 67000.00, 61200.00, '按照当地实际消费水平所列开支。', 101, '已阅核，按61200元借支。', 13, 2, '根据进场后生产需求拨付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-10-24', '2022-11-03', '2022-11-03', NULL, NULL, '2022-11-04');
 INSERT INTO `cmc_borrow` VALUES ('1648881418858830674', NULL, '1', '蓬安县林权类不动产登记数据整合项目代理服务费', 26, 105, '蓬安县林权类不动产登记数据整合项目代理服务费', NULL, '2022-10-25', 57300.00, 57300.00, '已核，情况属实。', 13, '同意', 7, 2, '同意支付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-10-25', '2022-10-25', '2022-10-27', NULL, NULL, '2022-10-27');
-INSERT INTO `cmc_borrow` VALUES ('1648881418858840675', NULL, '1', '招标代理服务费', 24, 105, '仪陇县林权数据整合建库采购项目（项目编号：N5113242022000086）于2022年10月25日发布中标公告，公告期1天。我公司中标价为：3157000.00元。现根据竞争性磋商文件要求，本项目需要办理的代理服务费为32260.00元。\n转账信息附后：\n收款单位：四川亘晟项目管理有限公司\n开 户 行：四川仪陇农村商业银行股份有限公司\n银行账号：5234 0120 0000 1689 4', NULL, '2022-10-26', 32260.00, 32260.00, '已核，情况属实。', 13, NULL, 7, 2, '同意支付', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-10-26', '2022-10-26', '2022-10-27', NULL, NULL, '2022-10-27');
+INSERT INTO `cmc_borrow` VALUES ('1648881418858840675', NULL, '1', '招标代理服务费', 24, 105, '仪陇县林权数据整合建库采购项目（项目编号：N5113242022000086）于2022年10月25日发布中标公示，公示期1天。我公司中标价为：3157000.00元。现根据竞争性磋商文件要求，本项目需要办理的代理服务费为32260.00元。\n转账信息附后：\n收款单位：四川亘晟项目管理有限公司\n开 户 行：四川仪陇农村商业银行股份有限公司\n银行账号：5234 0120 0000 1689 4', NULL, '2022-10-26', 32260.00, 32260.00, '已核，情况属实。', 13, NULL, 7, 2, '同意支付', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-10-26', '2022-10-26', '2022-10-27', NULL, NULL, '2022-10-27');
 INSERT INTO `cmc_borrow` VALUES ('1648881418858850676', '1648881412514512898', '0', NULL, 71, 111, NULL, NULL, '2022-07-22', 15226.00, 0.00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_borrow` VALUES ('1648881418858860677', NULL, '1', '临时人员购买意外伤害保险', 8, 104, '户名：泰康养老保险股份有限公司四川分公司\n账号：1000080004778685\n开户行：成都农村商业银行股份有限公司\n 联行号： 314651000000', NULL, '2022-08-11', 4500.00, 4500.00, '拟同意。', 112, '同意。', 2, 2, '尽快拨付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-08-11', '2022-08-12', '2022-08-12', NULL, NULL, '2022-08-12');
 INSERT INTO `cmc_borrow` VALUES ('1648881418858870678', NULL, '1', '招标代理服务费', 24, 105, '（1）乳源县天然气管道及配套设施建设项目管网路由地形测绘及规划定桩测量项目（招标代理服务费：12000.00元）；（2）乳源县天然气管道及配套设施建设项目地下管线普查项目（招标代理服务费：8000.00元）', NULL, '2022-08-15', 20000.00, 20000.00, '已核，总公司先行垫付，后期从工程款里面扣留。', 13, NULL, 7, 2, '同意拨付。', NULL, NULL, NULL, NULL, 14, NULL, NULL, '2022-08-16', '2022-08-16', '2022-08-16', NULL, NULL, '2022-08-16');

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-03-05 17:18:12
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-09 16:41:10
+ * @LastEditTime: 2024-07-16 17:50:08
  */
 import request from '@/utils/request'
 
@@ -49,6 +49,15 @@ export function updateDevice(data) {
   })
 }
 
+// 修改cmc设备成本
+export function updateDayCost(data) {
+  return request({
+    url: '/oa/device/dayCost',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除cmc设备信息
 export function delDevice(deviceId) {
   return request({

oa-ui/src/api/system/notice.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询公告列表
+// 查询通知列表
 export function listNotice(query) {
   return request({
     url: '/system/notice/list',
@@ -9,7 +9,7 @@ export function listNotice(query) {
   })
 }
 
-// 查询公告详细
+// 查询通知详细
 export function getNotice(noticeId) {
   return request({
     url: '/system/notice/' + noticeId,
@@ -17,7 +17,7 @@ export function getNotice(noticeId) {
   })
 }
 
-// 新增公告
+// 新增通知
 export function addNotice(data) {
   return request({
     url: '/system/notice',
@@ -26,7 +26,7 @@ export function addNotice(data) {
   })
 }
 
-// 修改公告
+// 修改通知
 export function updateNotice(data) {
   return request({
     url: '/system/notice',
@@ -35,7 +35,7 @@ export function updateNotice(data) {
   })
 }
 
-// 删除公告
+// 删除通知
 export function delNotice(noticeId) {
   return request({
     url: '/system/notice/' + noticeId,

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

@@ -1 +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="1718768852536" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6100" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M729.6 1024a281.6 281.6 0 1 1 281.6-281.6A281.6 281.6 0 0 1 729.6 1024z m0-499.243A217.643 217.643 0 1 0 947.26 742.4 217.655 217.655 0 0 0 729.6 524.757z m64.375 170.71h10.292a27.733 27.733 0 0 1 0 55.466H755.2v21.334h49.067a27.733 27.733 0 0 1 0 55.466H755.2v44.8a27.733 27.733 0 0 1-55.467 0v-44.8h-49.066a27.733 27.733 0 0 1 0-55.466h49.066v-21.334h-49.066a27.733 27.733 0 0 1 0-55.466h14.114l-39.305-39.296A27.733 27.733 0 0 1 664.7 616.96l65.122 65.11 64-64a27.405 27.405 0 0 1 38.775 38.74zM800 409.6a32 32 0 0 1-32-32c0-0.725 0.166-1.408 0.213-2.133H768V106.624a42.667 42.667 0 0 0-42.667-42.667H119.467A42.667 42.667 0 0 0 76.8 106.624v742.4a42.667 42.667 0 0 0 42.667 42.667h243.2v0.256c0.716-0.043 1.403-0.214 2.133-0.214a32 32 0 0 1 0 64c-0.73 0-1.417-0.17-2.133-0.213v0.213H76.8a64 64 0 0 1-64-64V64a64 64 0 0 1 64-64H768a64 64 0 0 1 64 64v311.467h-0.213c0.047 0.725 0.213 1.408 0.213 2.133a32 32 0 0 1-32 32zM251.733 648.533h102.4a34.133 34.133 0 0 1 0 68.267h-102.4a34.133 34.133 0 0 1 0-68.267zM217.6 273.067a34.133 34.133 0 0 1 34.133-34.134h341.334a34.133 34.133 0 0 1 0 68.267H251.733a34.133 34.133 0 0 1-34.133-34.133zM439.467 512H251.733a34.133 34.133 0 0 1 0-68.267h187.734a34.133 34.133 0 0 1 0 68.267z" p-id="6101" fill="#ffffff"></path></svg>
+<?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="1718768852536" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6100" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M729.6 1024a281.6 281.6 0 1 1 281.6-281.6A281.6 281.6 0 0 1 729.6 1024z m0-499.243A217.643 217.643 0 1 0 947.26 742.4 217.655 217.655 0 0 0 729.6 524.757z m64.375 170.71h10.292a27.733 27.733 0 0 1 0 55.466H755.2v21.334h49.067a27.733 27.733 0 0 1 0 55.466H755.2v44.8a27.733 27.733 0 0 1-55.467 0v-44.8h-49.066a27.733 27.733 0 0 1 0-55.466h49.066v-21.334h-49.066a27.733 27.733 0 0 1 0-55.466h14.114l-39.305-39.296A27.733 27.733 0 0 1 664.7 616.96l65.122 65.11 64-64a27.405 27.405 0 0 1 38.775 38.74zM800 409.6a32 32 0 0 1-32-32c0-0.725 0.166-1.408 0.213-2.133H768V106.624a42.667 42.667 0 0 0-42.667-42.667H119.467A42.667 42.667 0 0 0 76.8 106.624v742.4a42.667 42.667 0 0 0 42.667 42.667h243.2v0.256c0.716-0.043 1.403-0.214 2.133-0.214a32 32 0 0 1 0 64c-0.73 0-1.417-0.17-2.133-0.213v0.213H76.8a64 64 0 0 1-64-64V64a64 64 0 0 1 64-64H768a64 64 0 0 1 64 64v311.467h-0.213c0.047 0.725 0.213 1.408 0.213 2.133a32 32 0 0 1-32 32zM251.733 648.533h102.4a34.133 34.133 0 0 1 0 68.267h-102.4a34.133 34.133 0 0 1 0-68.267zM217.6 273.067a34.133 34.133 0 0 1 34.133-34.134h341.334a34.133 34.133 0 0 1 0 68.267H251.733a34.133 34.133 0 0 1-34.133-34.133zM439.467 512H251.733a34.133 34.133 0 0 1 0-68.267h187.734a34.133 34.133 0 0 1 0 68.267z" p-id="6101"></path></svg>

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-07-16 15:17:54
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-16 15:20:45
 -->
 
 <template>
@@ -63,12 +63,12 @@
         <div class="notice-content">
           <el-table v-loading="noticeLoading" :data="noticeList" height="320px">
             <!-- <el-table-column label="序号" align="center" prop="noticeId" width="100" /> -->
-            <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
+            <el-table-column label="类型" align="center" prop="noticeType" width="100">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType" />
               </template>
             </el-table-column>
-            <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+            <el-table-column label="标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
             <el-table-column label="创建者" align="center" prop="createBy" width="100" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="100">
               <template slot-scope="scope">
@@ -137,7 +137,7 @@ export default {
       post: [],
       noticeData: [],
       projectData: [],
-      noticeList: [],// 公告表格数据
+      noticeList: [],// 数据
       noticeTotal: 0,
       clickNotice: {},
       noticeLoading: true,
@@ -291,7 +291,7 @@ export default {
         this.finish = response.data.total;
       })
     },
-    // 获取公告列表
+    // 获取列表
     getNotice() {
       listNotice(this.noticeQueryParams).then(response => {
         this.noticeList = response.rows;

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

@@ -34,11 +34,11 @@
         <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-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> -->
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">

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

@@ -84,7 +84,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc车辆信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="车牌号" prop="licensePlate">
           <el-input v-model="form.licensePlate" placeholder="请输入车牌号" />
@@ -125,7 +125,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.isRent == '1'" label="单日成本" prop="dayCost">
-          <el-input style="width:130px;margin-right:10px;" v-model="form.dayCost" placeholder="请输入金额" />
+          <el-input style="width:400px;margin-right:10px;" v-model="form.dayCost" placeholder="若不填写，将以残值5%，采用年度总和法计提单日成本"/>
           <span>元</span>
         </el-form-item>
       </el-form>

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

@@ -47,6 +47,10 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:device:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleUpdateDayCost"
+          v-hasPermi="['oa:device:edit']">修改成本</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -95,8 +99,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="出厂编号" prop="code">
-              <el-input v-model="form.code" placeholder="请输入出厂编号" />
+            <el-form-item label="设备品牌" prop="brand">
+              <el-input v-model="form.brand" placeholder="请输入设备品牌" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -107,10 +111,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="购置时间" prop="acquisitionTime">
-              <el-date-picker clearable v-model="form.acquisitionTime" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择购置时间">
-              </el-date-picker>
+            <el-form-item label="设备类别" prop="place">
+              <el-input v-model="form.type" placeholder="请输入设备类别" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -121,39 +123,43 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="预计使用年限" prop="expectLife">
-              <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
-              <span>年</span>
+            <el-form-item label="购置时间" prop="acquisitionTime">
+              <el-date-picker clearable v-model="form.acquisitionTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择购置时间">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="购买价格" prop="cost">
-              <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
-              <span>元</span>
+            <el-form-item label="存放地点" prop="place">
+              <el-input v-model="form.place" placeholder="请输入存放地点" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="设备品牌" prop="brand">
-              <el-input v-model="form.brand" placeholder="请输入设备品牌" />
+            <el-form-item label="购买价格" prop="cost">
+              <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
+              <span>元</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单日成本" prop="dayCost">
-              <el-input v-model="form.dayCost" placeholder="请输入单日成本" />
+            <el-form-item label="预计使用年限" prop="expectLife">
+              <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
+              <span>年</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="存放地点" prop="place">
-              <el-input v-model="form.place" placeholder="请输入存放地点" />
+            <el-form-item label="出厂编号" prop="code">
+              <el-input type="textarea" :rows="2" v-model="form.code" placeholder="请输入出厂编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="设备类别" prop="place">
-              <el-input v-model="form.type" placeholder="请输入设备类别" />
+            <el-form-item label="单日成本" prop="dayCost">
+              <el-input type="textarea" :rows="2" style="width:230px;margin-right:10px;" v-model="form.dayCost"
+                placeholder="若不填写，将以残值5%，采用年度总和法计提单日成本" />
+              <span>元</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -193,7 +199,7 @@
 </template>
 
 <script>
-import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/oa/device/device";
+import { listDevice, getDevice, delDevice, addDevice, updateDevice, updateDayCost } from "@/api/oa/device/device";
 import { listDept } from '@/api/system/dept'
 
 export default {
@@ -215,7 +221,7 @@ export default {
       // cmc设备信息表格数据
       deviceList: [],
       deptList: [],
-      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }],
+      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }, { id: '4', name: '已报废' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -317,6 +323,15 @@ export default {
         this.title = "修改设备信息";
       });
     },
+    /** 修改成本按钮操作 */
+    handleUpdateDayCost() {
+      this.reset();
+      updateDayCost(this.form).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

oa-ui/src/views/system/notice/index.vue

@@ -1,10 +1,10 @@
 <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="noticeTitle">
+      <el-form-item label="标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
-          placeholder="请输入公告标题"
+          placeholder="请输入标题"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
+        <el-select v-model="queryParams.noticeType" placeholder="类型" clearable>
           <el-option
             v-for="dict in dict.type.sys_notice_type"
             :key="dict.value"
@@ -73,12 +73,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
-        label="公告标题"
+        label="标题"
         align="center"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
+      <el-table-column label="类型" align="center" prop="noticeType" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
         </template>
@@ -122,18 +122,18 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改公告对话框 -->
+    <!-- 添加或修改通知对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
+            <el-form-item label="标题" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入标题" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型">
+            <el-form-item label="类型" prop="noticeType">
+              <el-select v-model="form.noticeType" placeholder="请选择类型">
                 <el-option
                   v-for="dict in dict.type.sys_notice_type"
                   :key="dict.value"
@@ -189,7 +189,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 公告表格数据
+      // 通知表格数据
       noticeList: [],
       // 弹出层标题
       title: "",
@@ -208,10 +208,10 @@ export default {
       // 表单校验
       rules: {
         noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          { required: true, message: "标题不能为空", trigger: "blur" }
         ],
         noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
+          { required: true, message: "类型不能为空", trigger: "change" }
         ]
       }
     };
@@ -220,7 +220,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询公告列表 */
+    /** 查询通知列表 */
     getList() {
       this.loading = true;
       listNotice(this.queryParams).then(response => {
@@ -265,7 +265,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加公告";
+      this.title = "添加通知公示";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -274,7 +274,7 @@ export default {
       getNotice(noticeId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改公告";
+        this.title = "修改通知公示";
       });
     },
     /** 提交按钮 */
@@ -300,7 +300,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const noticeIds = row.noticeId || this.ids
-      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除通知公示编号为"' + noticeIds + '"的数据项？').then(function() {
         return delNotice(noticeIds);
       }).then(() => {
         this.getList();