Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/CbSceneExpenseConstants.java

+package com.dsk.cscec.constant;
+
+/**
+ * 二期项目常量信息
+ *
+ * @author sxk
+ * @date 2024.02.05
+ * @time 15:29
+ */
+public interface CbSceneExpenseConstants {
+    /**
+     * 菜单来源:文件表
+     */
+    Integer MENU_SOURCE_FILE_TABLE = 0;
+    /**
+     * 菜单来源:财务一体化系统
+     */
+    Integer MENU_SOURCE_FINANCE_SYSTEM = 1;
+    /**
+     * 菜单层级一级(顶级)
+     */
+    Integer MENU_LEVEL1 = 1;
+    /**
+     * 菜单层级二级
+     */
+    Integer MENU_LEVEL2 = 2;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbCostMeasureController.java

@@ -17,6 +17,7 @@ import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.common.utils.redis.RedisUtils;
 import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
@@ -24,6 +25,7 @@ import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresImportVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
 import com.dsk.cscec.listener.ProjectCostMeasureImportListener;
+import com.dsk.cscec.service.CbProjectExpenseSummaryService;
 import com.dsk.cscec.service.ICbCostMeasureService;
 import com.dsk.system.domain.vo.SysUserImportVo;
 import com.dsk.system.listener.SysUserImportListener;
@@ -38,8 +40,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 措施费导入
@@ -55,6 +59,10 @@ public class CbCostMeasureController {
     private ICbCostMeasureService cbCostMeasureService;
 
 
+    @Autowired
+    private CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
+
+
     /**
      * 措施费一级大类
      * 根据项目查询措施费一级大类
@@ -150,7 +158,22 @@ public class CbCostMeasureController {
 //    @SaCheckPermission("system:user:import")
     @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
-        cbCostMeasureService.importExcelData(file,projectId);
+        String name = file.getOriginalFilename();
+        cbCostMeasureService.importExcelData(file.getInputStream(),name,null,projectId);
+        return R.ok();
+    }
+
+
+    /**
+     * 措施费导入数据
+     *
+     * @param projectId     项目id
+     */
+    @SaIgnore
+    @Log(title = "措施费导入", businessType = BusinessType.IMPORT)
+    @PostMapping(value = "/parseCbCostMeasureFile")
+    public R<Void> parseCbCostMeasureFile(Long projectId) throws Exception {
+        cbCostMeasureService.parseCbCostMeasureFile(projectId);
         return R.ok();
     }
 
@@ -168,11 +191,23 @@ public class CbCostMeasureController {
     @PostMapping(value = "/summary/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importSummaryData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
         Integer dataType=2;
-        cbCostMeasureService.importExcelSummaryData(file,projectId,dataType);
+        cbCostMeasureService.importExcelSummaryData(file.getInputStream(),projectId,null,dataType);
         return R.ok();
     }
 
 
+    @SaIgnore
+    @Log(title = "措施费汇总获取")
+//    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/summary/data")
+    public R<List<CbProjectExpenseSummary>> summaryData(Long projectId) throws Exception {
+        Integer dataType=2;
+        List<CbProjectExpenseSummary> cbProjectExpenseSummaries = cbProjectExpenseSummaryService.queryCbSceneExpenseSummaryDataByType(projectId, dataType);
+        return R.ok(cbProjectExpenseSummaries);
+    }
+
+
+
     public static void main(String[] args) throws FileNotFoundException {
         List list =new ArrayList<>();
 
@@ -180,7 +215,7 @@ public class CbCostMeasureController {
         FileInputStream inputStream=new FileInputStream(file);
 
 
-        ExcelResult<CbCostMeasuresImportVo> result = ExcelUtil.importExcel(inputStream, CbCostMeasuresImportVo.class, new ProjectCostMeasureImportListener(1L,1));
+        ExcelResult<CbCostMeasuresImportVo> result = ExcelUtil.importExcel(inputStream, CbCostMeasuresImportVo.class, new ProjectCostMeasureImportListener(1L));
         String analysis = result.getAnalysis();
         List<CbCostMeasuresImportVo> list1 = result.getList();
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectOtherController.java

@@ -58,9 +58,9 @@ public class CbProjectOtherController {
     public R<List<CbProjectExpenseSummary>> statistics(@PathVariable Long projectId) {
         CbProjectExpenseSummary expenseSummary = new CbProjectExpenseSummary();
         expenseSummary.setProjectId(projectId);
-        expenseSummary.setDataType(2);
+        expenseSummary.setDataType(3);
         QueryWrapper<CbProjectExpenseSummary> queryWrapper = Wrappers.query(expenseSummary);
-        queryWrapper.select("id","expense_name as expenseName","expense_value as expenseValue");
+        queryWrapper.select("id","expense_name as expenseName","expense_value as expenseValue","proportion");
         queryWrapper.orderByAsc("id");
         List<CbProjectExpenseSummary> expenseSummaryList = this.cbProjectExpenseSummaryService.list(queryWrapper);
         if (ObjectUtil.isEmpty(expenseSummaryList)) {

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbSceneExpenseChildrenController.java

 package com.dsk.cscec.controller;
 
 import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.helper.LoginHelper;
+import com.dsk.cscec.domain.CbSceneExpenseChildren;
+import com.dsk.cscec.domain.bo.CbSceneExpenseChildrenDataBo;
+import com.dsk.cscec.domain.vo.CbSceneExpenseMenuVo;
 import com.dsk.cscec.service.CbSceneExpenseChildrenService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 现场经费-工资统筹、其他费用、现场管理费表(CbSceneExpenseChildren)表控制层
@@ -22,6 +30,29 @@ public class CbSceneExpenseChildrenController extends BaseController {
     @Resource
     private CbSceneExpenseChildrenService baseService;
 
+    /**
+     * 获取现场经费菜单
+     */
+    @GetMapping("/getMenuList/{projectId}")
+    public R<List<CbSceneExpenseMenuVo>> getMenuList(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
+        return R.ok(baseService.getMenuList(projectId));
+    }
 
-}
+    /**
+     * 现场经费二级分类数据解析
+     */
+    @GetMapping("/parseChildrenData/{projectId}")
+    public R<Void> parseSceneExpenseChildrenData(@PathVariable Long projectId) throws Exception {
+        String username = Objects.requireNonNull(LoginHelper.getLoginUser()).getUsername();
+        baseService.parseSceneExpenseChildrenData(projectId, 1, username);
+        return R.ok();
+    }
 
+    /**
+     * 获取现场经费二级分类数据
+     */
+    @GetMapping("/getChildrenData")
+    public R<List<CbSceneExpenseChildren>> getChildrenData(@Validated @RequestBody CbSceneExpenseChildrenDataBo childrenDataBo) {
+        return R.ok(baseService.getChildrenData(childrenDataBo));
+    }
+}
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbCostMeasure.java

@@ -28,7 +28,7 @@ public class CbCostMeasure {
     /**
     * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
     */
-    private Integer cbStage;
+    private Long projectFileId;
 
     /**
     * 父项id

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectFile.java

 package com.dsk.cscec.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.io.Serializable;
 
@@ -54,6 +57,7 @@ public class CbProjectFile extends BaseEntity implements Serializable {
     /**
      * 失败备注
      */
+    @TableField(value = "fail_remark", updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
     private String failRemark;
     /**
      * 删除状态(0:否、1:待删除、2:是)

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbSceneExpenseChildren.java

 package com.dsk.cscec.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.dsk.common.core.domain.BaseEntity;
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 现场经费-工资统筹、其他费用、现场管理费表(CbSceneExpenseChildren)实体类
@@ -14,9 +16,8 @@ import java.io.Serializable;
  * @author sxk
  * @since 2024-02-22 09:59:00
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class CbSceneExpenseChildren extends BaseEntity implements Serializable {
+public class CbSceneExpenseChildren implements Serializable {
     private static final long serialVersionUID = 895279707061984760L;
     /**
      * 主键ID
@@ -28,64 +29,73 @@ public class CbSceneExpenseChildren extends BaseEntity implements Serializable {
      */
     private Long projectId;
     /**
-     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     * 项目文件ID
      */
-    private Integer cbStage;
-    /**
-     * 父级ID
-     */
-    private Long parentId;
+    private Long projectFileId;
     /**
      * 序号
      */
+    @Excel(name = "序号")
     private String number;
-    /**
-     * 排序
-     */
-    private Integer sort;
-    /**
-     * 数据类型(0:工资统筹、1:现场管理费、2:其他费用)
-     */
-    private Integer dataType;
     /**
      * 名称
      */
+    @Excel(name = "名称")
     private String expenseName;
     /**
      * 单位
      */
+    @Excel(name = "单位")
     private String unit;
     /**
      * 成本数量-工资统筹表
      */
-    private Integer cbCount;
+    @Excel(name = "成本数量")
+    private String cbCount;
     /**
      * 使用时间-其他费用表
      */
-    private Integer useTime;
+    @Excel(name = "使用时间")
+    private String useTime;
     /**
      * 工程量-现场管理费表
      */
+    @Excel(name = "工程量")
     private String engineeringVolume;
+    /**
+     * 增值税税率-现场管理费表
+     */
+    @Excel(name = "增值税税率")
+    private String addedTaxRate;
     /**
      * 公司单价/不含税单价
      */
+    @Excel(name = "公司单价")
     private String unitPrice;
     /**
      * 目标成本合价(不含税)/不含税合价
      */
-    private String excludeTaxSumPrice;
+    @Excel(name = "目标成本合价(不含税)")
+    private String targetCbSumPriceExcludeTax;
     /**
      * 目标成本合价(含税)/含税合价
      */
-    private String includeTaxSumPrice;
+    @Excel(name = "目标成本合价(含税)")
+    private String targetCbSumPriceIncludeTax;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
     /**
      * 成本科目
      */
+    @Excel(name = "成本科目")
     private String cbSubject;
     /**
      * 税金类型
      */
+    @Excel(name = "税金类型")
     private String taxType;
     /**
      * 删除状态(0:否、2:是)
@@ -93,7 +103,13 @@ public class CbSceneExpenseChildren extends BaseEntity implements Serializable {
     @TableLogic(value = "0", delval = "2")
     private Integer delFlag;
     /**
-     * 备注
+     * 创建者
      */
-    private String remark;
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSceneExpenseChildrenDataBo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.22
+ * @time 15:22
+ */
+@Data
+public class CbSceneExpenseChildrenDataBo {
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+    /**
+     * 项目文件ID
+     */
+    @NotNull(message = "文件ID不能为空")
+    private Long fileId;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSceneExpenseChildrenImportBo.java

+package com.dsk.cscec.domain.bo;
+
+import com.dsk.common.annotation.Excel;
+import com.dsk.cscec.domain.CbSceneExpenseChildren;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author sxk
+ * @date 2024.02.26
+ * @time 16:38
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CbSceneExpenseChildrenImportBo extends CbSceneExpenseChildren {
+    /**
+     * 公司单价/不含税单价
+     */
+    @Excel(name = "不含税单价（元）")
+    private String excludeTaxUnitPrice;
+    /**
+     * 目标成本合价(不含税)/不含税合价
+     */
+    @Excel(name = "不含税合价（元）")
+    private String excludeTaxSumPrice;
+    /**
+     * 目标成本合价(含税)/含税合价
+     */
+    @Excel(name = "含税合价（元）")
+    private String includeTaxSumPrice;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/ProjectCostMeasureImportListener.java

@@ -32,14 +32,12 @@ import java.util.regex.Pattern;
 public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCostMeasuresImportVo> implements ExcelListener<CbCostMeasuresImportVo> {
 
     private final CbCostMeasureServiceImpl cbCostMeasureService;
-//
-//    private final String password;
-
     private final Long projectId;
-    private final Integer cbStage;
 
     private List<CbCostMeasuresImportVo> dataList = new ArrayList<>();
 
+    private List<String> errList = new ArrayList<>();
+
 //    private final String operName;
 
     private int successNum = 0;
@@ -47,10 +45,8 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
     private final StringBuilder successMsg = new StringBuilder();
     private final StringBuilder failureMsg = new StringBuilder();
 
-    public ProjectCostMeasureImportListener(Long projectId, Integer cbStage) {
-//        String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
+    public ProjectCostMeasureImportListener(Long projectId) {
         this.cbCostMeasureService = SpringUtils.getBean(CbCostMeasureServiceImpl.class);
-        this.cbStage = cbStage;
         this.projectId = projectId;
 //        this.operName = LoginHelper.getUsername();
     }
@@ -62,11 +58,14 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
         if (StrUtil.isEmpty(importVo.getItemContent())) {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空");
+            errList.add(failureMsg.toString());
+            return;
         }
         String number = importVo.getNumber();
         if (StrUtil.isEmpty(number)) {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
+            errList.add(failureMsg.toString());
         }
 
         Boolean numberMatch = false;
@@ -79,6 +78,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
         } else {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号格式错误");
+            errList.add(failureMsg.toString());
         }
 
 
@@ -186,7 +186,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
             public String getAnalysis() {
                 if (failureNum > 0) {
                     failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-                    throw new ServiceException(failureMsg.toString());
+//                    throw new ServiceException(failureMsg.toString());
                 } else {
                     successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
                 }
@@ -200,7 +200,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
 
             @Override
             public List<String> getErrorList() {
-                return null;
+                return errList;
             }
         };
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/ProjectCostMeasureSummaryImportListener.java

@@ -35,10 +35,11 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
 //    private final String password;
 
     private final Long projectId;
-    private final Integer cbStage;
+    private final Long fileId;
     private final Integer dataType;
 
     private List<CbProjectExpenseSummaryImportVo> dataList = new ArrayList<>();
+    private List<String> errorList = new ArrayList<>();
 
 //    private final String operName;
 
@@ -47,9 +48,9 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
     private final StringBuilder successMsg = new StringBuilder();
     private final StringBuilder failureMsg = new StringBuilder();
 
-    public ProjectCostMeasureSummaryImportListener(Long projectId, Integer cbStage,Integer dataType) {
+    public ProjectCostMeasureSummaryImportListener(Long projectId, Long fileId,Integer dataType) {
         this.cbProjectExpenseSummaryService = SpringUtils.getBean(CbProjectExpenseSummaryService.class);
-        this.cbStage = cbStage;
+        this.fileId = fileId;
         this.projectId = projectId;
         this.dataType=dataType;
     }
@@ -60,10 +61,17 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
         CbProjectExpenseSummary cbProjectExpenseSummary=new CbProjectExpenseSummary();
         BeanUtil.copyProperties(importVo,cbProjectExpenseSummary);
         cbProjectExpenseSummary.setProjectId(projectId);
-        cbProjectExpenseSummary.setCbStage(cbStage);
+        cbProjectExpenseSummary.setProjectFileId(fileId);
         cbProjectExpenseSummary.setDataType(dataType);
-        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
-        cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);
+//        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
+        boolean save = cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);
+        if(!save){
+            String errmsg = context.readRowHolder().getRowIndex() + " error";
+            log.debug("ProjectCostMeasureSummaryImportListener.invoke() "+errmsg);
+            errorList.add(errmsg);
+        }
+        successNum+=1;
+        dataList.add(importVo);
 
     }
 
@@ -94,7 +102,7 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
 
             @Override
             public List<String> getErrorList() {
-                return null;
+                return errorList;
             }
         };
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbSummaryMapper.java

@@ -65,7 +65,7 @@ public interface CbSummaryMapper extends BaseMapper<CbSummary> {
 
     CbGainLossAnalysisListVo getGainLossAnalysisById(@Param("id") Long id, @Param("expenseDate") String expenseDate);
 
-    List<CbGainLossAnalysisListVo> getGainLossAnalysisByParentId(@Param("id") Long parentId, @Param("expenseDate") String expenseDate);
+    List<CbGainLossAnalysisListVo> getGainLossAnalysisByParentId(@Param("parentId") Long parentId, @Param("expenseDate") String expenseDate);
 
 
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectExpenseSummaryService.java

@@ -22,4 +22,7 @@ public interface CbProjectExpenseSummaryService extends IService<CbProjectExpens
      * @return 现场经费汇总数据
      */
     List<CbProjectExpenseSummary> getCbSceneExpenseSummaryData(Long projectId);
+
+
+    List<CbProjectExpenseSummary> queryCbSceneExpenseSummaryDataByType(Long projectId,Integer dataType);
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectFileService.java

@@ -56,4 +56,15 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
      */
     List<CbProjectFile> selectAnalysisList(Long projectId, Integer cbType, Integer cbStage);
 
+
+    /**
+     * 更新项目文件状态
+     *
+     * @param projectId 项目ID
+     * @param cbType    CB型
+     * @param fileId    文件ID文件ID
+     * @param errmsg    RMSG
+     * @return boolean
+     */
+    boolean UpdateProjectFileStatus(Long fileId,String errmsg,Integer status);
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbSceneExpenseChildrenService.java

@@ -2,6 +2,10 @@ package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.CbSceneExpenseChildren;
+import com.dsk.cscec.domain.bo.CbSceneExpenseChildrenDataBo;
+import com.dsk.cscec.domain.vo.CbSceneExpenseMenuVo;
+
+import java.util.List;
 
 /**
  * 现场经费-工资统筹、其他费用、现场管理费表(CbSceneExpenseChildren)表服务接口
@@ -10,5 +14,28 @@ import com.dsk.cscec.domain.CbSceneExpenseChildren;
  * @since 2024-02-22 09:59:01
  */
 public interface CbSceneExpenseChildrenService extends IService<CbSceneExpenseChildren> {
+    /**
+     * 获取现场经费菜单
+     *
+     * @param projectId 项目ID
+     * @return 菜单
+     */
+    List<CbSceneExpenseMenuVo> getMenuList(Long projectId);
+
+    /**
+     * 现场经费二级分类数据解析
+     *
+     * @param projectId 项目ID
+     * @param cbStage 成本阶段
+     * @param username 用户名
+     */
+    void parseSceneExpenseChildrenData(Long projectId, Integer cbStage, String username) throws Exception;
 
+    /**
+     * 获取现场经费二级分类数据
+     *
+     * @param childrenDataBo 查询体
+     * @return 现场经费二级分类数据
+     */
+    List<CbSceneExpenseChildren> getChildrenData(CbSceneExpenseChildrenDataBo childrenDataBo);
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbSummaryActualLockService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbSummaryActualLock;
+
+/**
+ * 成本汇总-每月成本锁定(CbSummaryActualLock)表服务接口
+ *
+ * @author makejava
+ * @since 2024-02-27 16:16:09
+ */
+public interface CbSummaryActualLockService extends IService<CbSummaryActualLock> {
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ICbCostMeasureService.java

@@ -5,6 +5,7 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
@@ -12,6 +13,7 @@ import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +25,7 @@ import java.util.Map;
  */
 public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
-    void importExcelData(MultipartFile file, Long projectId);
+    void importExcelData(InputStream inputStream, String fileName,Long fileId, Long projectId);
 
     List<Map<String, Object>> listByLevel(Long projectId, int i);
 
@@ -33,6 +35,10 @@ public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
     void pushCostMeasureActual(CbCostMeasureActualPushBo pushBo);
 
-    void importExcelSummaryData(MultipartFile file, Long projectId,Integer dataType);
+    List<String> importExcelSummaryData(InputStream inputStream, Long projectId,Long fileId, Integer dataType);
+
+    void parseCbCostMeasureFile(Long projectId);
+
+    boolean reparseCbCostMeasureFile(Long projectId,Long projectFileId);
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectExpenseSummaryServiceImpl.java

@@ -139,6 +139,16 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                 .eq(CbProjectExpenseSummary::getDataType, CbProjectConstants.CB_TYPE_SCENE_EXPENSE));
     }
 
+    @Override
+    public List<CbProjectExpenseSummary> queryCbSceneExpenseSummaryDataByType(Long projectId, Integer dataType) {
+        //校验项目是否存在
+        this.checkProjectExist(projectId);
+
+        return baseMapper.selectList(new LambdaQueryWrapper<CbProjectExpenseSummary>()
+                .eq(CbProjectExpenseSummary::getProjectId, projectId)
+                .eq(CbProjectExpenseSummary::getDataType, dataType));
+    }
+
     /**
      * 校验项目是否存在
      *

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectFileServiceImpl.java

@@ -167,6 +167,16 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
         return baseMapper.selectAnalysisList(projectId, cbType, cbStage);
     }
 
+    @Override
+    public boolean UpdateProjectFileStatus(Long fileId, String errmsg,Integer status) {
+        CbProjectFile cbProjectFile=new CbProjectFile();
+        cbProjectFile.setId(fileId);
+        cbProjectFile.setFailRemark(errmsg);
+        cbProjectFile.setFileParseStatus(status);
+        boolean b = this.updateById(cbProjectFile);
+        return b;
+    }
+
     /**
      * 校验项目是否存在
      *

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -22,10 +22,7 @@ import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
-import com.dsk.cscec.service.CbProjectExpenseSummaryService;
-import com.dsk.cscec.service.CbProjectOtherService;
-import com.dsk.cscec.service.CbProjectRecordService;
-import com.dsk.cscec.service.CbSummaryService;
+import com.dsk.cscec.service.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,7 +51,11 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     @Resource
     private CbProjectExpenseSummaryService projectExpenseSummaryService;
     @Resource
+    private CbSceneExpenseChildrenService sceneExpenseChildrenService;
+    @Resource
     private CbProjectOtherService projectOtherService;
+    @Resource
+    private ICbCostMeasureService costMeasureService;
 
     /**
      * 新增项目
@@ -118,7 +119,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         baseMapper.updateById(projectRecord);
         //修改所有该项目的项目文件状态:解析中
         CbProjectFileServiceImpl projectFileService = new CbProjectFileServiceImpl();
-        projectFileService.updateBatchById(projectFileList.stream().peek(projectFile -> projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING)).collect(Collectors.toList()));
+        projectFileService.updateBatchById(projectFileList.stream().peek(projectFile -> {
+            projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
+            projectFile.setFailRemark(null);
+        }).collect(Collectors.toList()));
 
         //TODO:调各个成本类型的解析文件方法
         Integer cbStage = projectRecord.getCbStage();
@@ -130,10 +134,12 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         projectBaseBo.setCbStage(cbStage);
         dataAnalysisComponent.quantitySummaryDataAnalysis(projectBaseBo);
         //措施项目
+        costMeasureService.parseCbCostMeasureFile(projectId);
         //其他项目
         projectOtherService.projectOtherDataAnalysis(projectBaseBo);
         //现场经费
         projectExpenseSummaryService.parseSceneExpenseSummaryData(projectId, cbStage, username);
+        sceneExpenseChildrenService.parseSceneExpenseChildrenData(projectId, cbStage, username);
         //成本汇总
         cbSummaryService.importCbSummary(projectId);
     }
@@ -149,8 +155,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         List<CbProjectFile> projectFileList = projectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
                 .eq(CbProjectFile::getProjectId, projectId)
                 .eq(CbProjectFile::getCbType, cbType)
-                //项目文件状态:准备中
-                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING));
+                //项目文件状态:准备中or解析失败
+                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                .or()
+                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL));
         Assert.isFalse(projectFileList.isEmpty(), cbTypeName + "至少需要上传1个文件");
         return projectFileList;
     }
@@ -169,7 +177,9 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
             searchVo.setHasChildren(baseMapper.selectCount(new LambdaQueryWrapper<CbProjectRecord>()
-                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())) > 1);
+                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())
+                    .ne(CbProjectRecord::getProjectFileStatus,CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)) > 1
+            );
 
             //关键字标红
             if (StringUtils.isNotBlank(searchBo.getProjectName())) {
@@ -345,7 +355,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
             //不允许删除正在解析中的项目
             Assert.isFalse(projectRecord.getProjectFileStatus().equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSING)
                     , "存在解析中的项目,删除失败");
-            //TODO:各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
+
+            //各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
 
             //删除项目文件记录
             flag = projectFileMapper.delete(new LambdaQueryWrapper<CbProjectFile>()

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSceneExpenseChildrenServiceImpl.java

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.excel.ExcelUtils;
+import com.dsk.common.utils.StringUtils;
+import com.dsk.cscec.constant.CbProjectConstants;
+import com.dsk.cscec.constant.CbSceneExpenseConstants;
+import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.CbSceneExpenseChildren;
+import com.dsk.cscec.domain.bo.CbSceneExpenseChildrenDataBo;
+import com.dsk.cscec.domain.bo.CbSceneExpenseChildrenImportBo;
+import com.dsk.cscec.domain.vo.CbSceneExpenseMenuVo;
+import com.dsk.cscec.mapper.CbProjectFileMapper;
+import com.dsk.cscec.mapper.CbProjectRecordMapper;
 import com.dsk.cscec.mapper.CbSceneExpenseChildrenMapper;
 import com.dsk.cscec.service.CbSceneExpenseChildrenService;
+import com.dsk.system.service.ISysOssService;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.annotation.Resource;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 现场经费-工资统筹、其他费用、现场管理费表(CbSceneExpenseChildren)表服务实现类
@@ -18,5 +41,167 @@ import javax.annotation.Resource;
 public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpenseChildrenMapper, CbSceneExpenseChildren> implements CbSceneExpenseChildrenService {
     @Resource
     private CbSceneExpenseChildrenMapper baseMapper;
+    @Resource
+    private CbProjectRecordMapper projectRecordMapper;
+    @Resource
+    private CbProjectFileMapper projectFileMapper;
+    @Resource
+    private ISysOssService ossService;
+    @Resource
+    private TransactionTemplate transactionTemplate;
+
+    /**
+     * 获取现场经费菜单
+     *
+     * @param projectId 项目ID
+     * @return 菜单
+     */
+    @Override
+    public List<CbSceneExpenseMenuVo> getMenuList(Long projectId) {
+        //校验项目是否存在
+        this.checkProjectExist(projectId);
+
+        //TODO:菜单来源分为两部分,1、导入的文件,2、财务一体化系统
+        //从导入文件获取菜单
+        List<CbSceneExpenseMenuVo> menuList = projectFileMapper.getSceneExpenseMenuFromFile(projectId, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.CB_TYPE_SCENE_EXPENSE, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+        menuList.forEach(menu -> {
+            //菜单名称去除文件格式尾缀
+            menu.setMenuName(menu.getMenuName().substring(0, menu.getMenuName().lastIndexOf(".")));
+            //若是现场经费汇总,则是一级,否则均为二级
+
+            if (CbProjectConstants.CB_TYPE_SCENE_EXPENSE_NAME.equals(menu.getMenuName())) {
+                menu.setMenuLevel(CbSceneExpenseConstants.MENU_LEVEL1);
+            } else {
+                menu.setMenuLevel(CbSceneExpenseConstants.MENU_LEVEL2);
+            }
+            //菜单来源
+            menu.setMenuSource(CbSceneExpenseConstants.MENU_SOURCE_FILE_TABLE);
+        });
+        //TODO:从财务一体化系统获取菜单
+        return menuList;
+    }
+
+    /**
+     * 现场经费二级分类数据解析
+     *
+     * @param projectId 项目ID
+     * @param cbStage   成本阶段
+     * @param username  用户名
+     */
+    @Override
+    @Async
+    public void parseSceneExpenseChildrenData(Long projectId, Integer cbStage, String username) throws Exception {
+        //查找该项目下所有相关文件
+        List<CbProjectFile> projectFileList = projectFileMapper.selectAnalysisList(projectId, CbProjectConstants.CB_TYPE_SCENE_EXPENSE, cbStage);
+        //待解析文件
+        List<CbProjectFile> waitParseList = new ArrayList<>();
+        //提取非现场经费汇总文件
+        projectFileList.forEach(projectFile -> {
+            if (!CbProjectConstants.CB_TYPE_SCENE_EXPENSE_NAME.equals(projectFile.getFileName().substring(0, projectFile.getFileName().lastIndexOf(".")))) {
+                //待解析文件
+                waitParseList.add(projectFile);
+            }
+        });
+
+        //处理待解析文件
+        for (CbProjectFile projectFile : waitParseList) {
+            if (ObjectUtil.isNull(projectFile)) {
+                continue;
+            }
+
+            //文件下载
+            InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
+            if (ObjectUtil.isNull(inputStream)) {
+                projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                projectFile.setFailRemark("文件数据不存在");
+                projectFileMapper.updateById(projectFile);
+                continue;
+            }
+            //解析数据
+            List<CbSceneExpenseChildrenImportBo> importList = new ExcelUtils<>(CbSceneExpenseChildrenImportBo.class).importExcelAllSheet(inputStream, 0);
+            if (importList.isEmpty()) {
+                projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                projectFile.setFailRemark("表格中不存在待导入数据");
+                projectFileMapper.updateById(projectFile);
+                continue;
+            }
+
+            //筛选有效数据
+            List<CbSceneExpenseChildrenImportBo> summaryList = importList.stream().parallel()
+                    //筛选名称列不为空数据
+                    .filter(item -> StringUtils.isNotBlank(item.getExpenseName()))
+                    .peek(item -> {
+                        item.setProjectId(projectId);
+                        item.setProjectFileId(projectFile.getId());
+
+                        //因为现场管理费Excel表中字段名称不一样,所以做以下单独映射
+                        //公司单价/不含税单价
+                        if (StringUtils.isNotBlank(item.getExcludeTaxUnitPrice())) {
+                            item.setUnitPrice(item.getExcludeTaxUnitPrice());
+                        }
+                        //目标成本合价(不含税)/不含税合价
+                        if (StringUtils.isNotBlank(item.getExcludeTaxSumPrice())) {
+                            item.setTargetCbSumPriceExcludeTax(item.getExcludeTaxSumPrice());
+                        }
+                        //目标成本合价(含税)/含税合价
+                        if (StringUtils.isNotBlank(item.getIncludeTaxSumPrice())) {
+                            item.setTargetCbSumPriceIncludeTax(item.getIncludeTaxSumPrice());
+                        }
+
+                        item.setCreateBy(username);
+                        item.setCreateTime(new Date());
+                    })
+                    .collect(Collectors.toList());
+            if (summaryList.size() != importList.size()) {
+                projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
+                projectFileMapper.updateById(projectFile);
+                continue;
+            }
+            transactionTemplate.execute(status -> {
+                try {
+                    //批量插入数据
+                    CbSceneExpenseChildrenServiceImpl impl = new CbSceneExpenseChildrenServiceImpl();
+                    Assert.isTrue(impl.saveBatch(BeanUtil.copyToList(summaryList, CbSceneExpenseChildren.class)), "数据插入失败");
+                    //更新文件状态
+                    projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+                    Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                    projectFile.setFailRemark(e.getMessage());
+                    projectFileMapper.updateById(projectFile);
+                }
+                return Boolean.TRUE;
+            });
+        }
+    }
+
+    /**
+     * 获取现场经费二级分类数据
+     *
+     * @param childrenDataBo 查询体
+     * @return 现场经费二级分类数据
+     */
+    @Override
+    public List<CbSceneExpenseChildren> getChildrenData(CbSceneExpenseChildrenDataBo childrenDataBo) {
+        //校验项目是否存在
+        this.checkProjectExist(childrenDataBo.getProjectId());
+
+        return baseMapper.selectList(new LambdaQueryWrapper<CbSceneExpenseChildren>()
+                .eq(CbSceneExpenseChildren::getProjectId, childrenDataBo.getProjectId())
+                .eq(CbSceneExpenseChildren::getProjectFileId, childrenDataBo.getFileId()));
+    }
 
+    /**
+     * 校验项目是否存在
+     *
+     * @param projectId 项目ID
+     * @return 项目实体
+     */
+    private CbProjectRecord checkProjectExist(Long projectId) {
+        CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
+        Assert.notNull(projectRecord, "该项目不存在");
+        return projectRecord;
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryActualLockServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.CbSummaryActualLock;
+import com.dsk.cscec.mapper.CbSummaryActualLockMapper;
+import com.dsk.cscec.service.CbSummaryActualLockService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 成本汇总-每月成本锁定(CbSummaryActualLock)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-02-27 16:16:09
+ */
+@Service
+public class CbSummaryActualLockServiceImpl extends ServiceImpl<CbSummaryActualLockMapper, CbSummaryActualLock> implements CbSummaryActualLockService {
+
+}

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbCostMeasureMapper.xml

@@ -6,7 +6,7 @@
     <!--@Table cb_cost_measure-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
-    <result column="cb_stage" jdbcType="INTEGER" property="cbStage" />
+    <result column="cb_stage" jdbcType="INTEGER" property="projectFileId" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <result column="level" jdbcType="INTEGER" property="level" />
     <result column="number" jdbcType="VARCHAR" property="number" />
@@ -47,11 +47,9 @@
         inner JOIN cb_cost_measure_actual t1 ON t1.plan_measure_id=t.id
         WHERE
             t.project_id=#{projectId}
-        AND t.cb_stage=#{cbStage}
         AND t1.`month`=#{month}) t1 ON t1.plan_measure_id=t.id
     WHERE
       t.project_id=#{projectId}
-      AND t.cb_stage=#{cbStage}
       AND t.`level`!=0
       AND t.`no` like concat(#{id},'.%')
     ORDER BY id ASC

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectFileMapper.xml

@@ -17,7 +17,7 @@
         id, project_id, cb_stage, cb_type, file_name, file_oss_id, file_oss_url, file_parse_status, fail_remark,
         del_flag, create_by, create_time, update_by, update_time
         FROM cb_project_file
-        WHERE (del_flag = 0 and file_parse_status in (1,3)
+        WHERE (del_flag = 0 and file_parse_status = 1
         and project_id=#{projectId}
         <if test="cbStage != null">
             and cb_stage =#{cbStage}

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -106,6 +106,15 @@ export function getProjectList(data) {
   });
 }
 
+//查询当前项目可删除成本阶段
+export function getProjectHistoryInfo(data) {
+  return request({
+    url: '/cbProjectRecord/getProjectHistoryInfo',
+    method: 'get',
+    params: data
+  });
+}
+
 //盈亏分析对比 左侧菜单
 export const getProfitLossMenuTreeApi = (params = {}) => request({
   url: "/cbSummary/cbNameList",
@@ -113,6 +122,39 @@ export const getProfitLossMenuTreeApi = (params = {}) => request({
   params
 });
 
+//盈亏分析对比 数据列表
+export function getAnalysislist(data) {
+  return request({
+    url: '/cb/gain/loss/analysis/list',
+    method: 'get',
+    params: data
+  });
+}
+// 措施项目 左侧菜单
+export function getMeasureslist(projectId) {
+  return request({
+    url: '/cb/cost/measures/type/' + projectId,
+    method: 'get',
+  });
+}
+//措施费列表
+export function getCostMeasureslist(data) {
+  return request({
+    url: '/cb/cost/measures/list',
+    method: 'get',
+    params: data
+  });
+}
+
+//措施费汇总
+export function getSummarydata(data) {
+  return request({
+    url: '/cb/cost/measures/summary/data',
+    method: 'post',
+    data: data
+  });
+}
+
 
 // 工料汇总
 
@@ -141,6 +183,18 @@ export const getFeedSummaryListApi = (params = {}) => request({
   url: "/cb/quantity/summary/subjectList",
   method: "get",
   params
-})
+});
+
+// 其他项目
 
+//其他项目左侧菜单
+export const getProjectOtherMenuTreeApi = (relatedId) => request({
+  url: '/cb/projectOther/type/' + relatedId,
+  method: "get",
+});
 
+//其他费用-费用汇总
+export const getProjectOtherStatistics = (relatedId) => request({
+  url: '/cb/projectOther/statistics/' + relatedId,
+  method: "get",
+});

dsk-operate-ui/src/components/FileUpload/index.vue

@@ -61,7 +61,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["xlsx","docx","doc", "xls", "ppt", "txt", "pdf"],
     },
     // 是否显示提示
     isShowTip: {

dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue

@@ -2,42 +2,20 @@
   <div class="directCost-container">
     <div class="directCost-main">
       <div class="search">
-        <el-select v-model="date" placeholder="请选择" clearable>
+        <el-select v-model="date" placeholder="请选择">
           <el-option v-for="(item,index) in datelist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
         </el-select>
       </div>
       <div class="directCost-cont">
         <div class="left">
-          <!--<div class="left-menu">-->
-            <!--<el-menu class="project-menu-instance">-->
-              <!--&lt;!&ndash;<el-submenu index="1" class="project-sub-menu-item">&ndash;&gt;-->
-              <!--&lt;!&ndash;<template slot="title">&ndash;&gt;-->
-              <!--&lt;!&ndash;<i class="el-icon-location icon"></i>&ndash;&gt;-->
-              <!--&lt;!&ndash;<span>宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程</span>&ndash;&gt;-->
-              <!--&lt;!&ndash;</template>&ndash;&gt;-->
-              <!--&lt;!&ndash;</el-submenu>&ndash;&gt;-->
-              <!--<template v-for="(el,index) in menuList">-->
-                <!--&lt;!&ndash; 一级标题无子菜单 &ndash;&gt;-->
-                <!--<el-menu-item v-if="!el.children" :index="el.path" :key="el.id">-->
-                  <!--<template slot="title">-->
-                    <!--<i class="el-icon-location icon"></i>-->
-                    <!--<span>{{el.name}}</span>-->
-                  <!--</template>-->
-                <!--</el-menu-item>-->
-                <!--&lt;!&ndash; 一级标题有子菜单 &ndash;&gt;-->
-                <!--<el-submenu v-else :index="'index' + index" :key="el.id" class="project-sub-menu-item">-->
-                  <!--<template slot="title">-->
-                    <!--<i class="el-icon-location icon"></i>-->
-                    <!--<span>{{el.name}}</span>-->
-                  <!--</template>-->
-                  <!--&lt;!&ndash; 二级标题 &ndash;&gt;-->
-                  <!--<el-menu-item :index="children.path" v-for="children in el.children" :key="children.id">-->
-                    <!--{{children.name}}-->
-                  <!--</el-menu-item>-->
-                <!--</el-submenu>-->
-              <!--</template>-->
-            <!--</el-menu>-->
-          <!--</div>-->
+          <div class="left-side-menu">
+            <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive">
+              <template slot="宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程-1">
+                <img src="@/assets/images/projectCostLedger/icon_cost_detail_1.svg" alt="">
+                <div class="project-sub-menu-title-text">宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程</div>
+              </template>
+            </project-side-menu>
+          </div>
         </div>
         <div class="right-table">
           <div class="table-item">
@@ -114,9 +92,10 @@
   </div>
 </template>
 <script>
+  import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
 export default {
   name: "directCost",
-  components: {},
+  components: {ProjectSideMenu},
   data() {
     return {
       date:'2023年11月',
@@ -201,38 +180,55 @@ export default {
         dj:{ required: true, message: '单价不能为空', trigger: 'blur' }, // 限制必填
       },
       dialogVisible:false,
-      menuList:[
+      defaultActive: "",
+      menuTreeList: [
         {
+          nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
+          id: "1",
           children: [
             {
-              href: "暂无",
-              id: "2",
-              name: "测试2",
-              parentId: "1",
+              nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
+              id: "1-1",
               children: [
                 {
-                  href: "暂无",
-                  id: "3",
-                  name: "测试3",
-                  parentId: "2",
+                  nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程劳务",
+                  id: "1-1-1",
+                },
+                {
+                  nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程劳务",
+                  id: "1-2-1",
+                },
+                {
+                  nodeName: "拆除、修缮、清理、改造劳...",
+                  id: "1-3-1",
                   children: [
                     {
-                      href: "暂无",
-                      id: "4",
-                      name: "测试4",
-                      parentId: "3",
-                      children: [],
-                    },
-                  ],
-                },
-              ],
+                      nodeName: "拆除、修缮、清理、改造劳...",
+                      id: "1-3-1",
+                    }
+                  ]
+                }
+              ]
             },
-          ],
-          id: "1",
-          name: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
-          parentId: "0",
+            {
+              nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
+              id: "2-1",
+            },
+            {
+              nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
+              id: "3-1",
+            },
+            {
+              nodeName: "宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程",
+              id: "4-1",
+            },
+          ]
         },
       ],
+      menuOptions: {
+        nodeName: "nodeName",
+        nodeValue: "nodeName",
+      },
     };
   },
   //可访问data属性
@@ -310,50 +306,10 @@ export default {
       height: 100%;
     }
     .left{
-      width: 220px;
-      height: 100%;
-      .left-menu{
-        width: 100%;
+      .left-side-menu {
+        width: 220px;
+        min-width: 220px;
         height: 100%;
-        overflow: auto;
-        ::v-deep .project-menu-instance {
-          width: 100%;
-          height: 100%;
-          padding-top: 16px;
-          border-right: 1px solid #eeeeee;
-          overflow: auto;
-          .project-sub-menu-item {
-            & > .el-submenu__title,.el-menu-item {
-              height: 32px;
-              line-height: 32px;
-              &:hover {
-                background-color: unset;
-                background: linear-gradient( 91deg, rgba(0, 129, 255, 0.1) 0%, rgba(0, 129, 255, 0) 100%);
-              }
-            }
-          }
-          .is-opened{
-            .el-submenu__title{
-              color:#0081FF;
-            }
-          }
-          .el-submenu__title{
-            padding: 0 14px !important;
-            span{
-              width: 160px;
-              display: inline-block;
-              white-space: nowrap; /* 不换行 */
-              overflow: hidden; /* 超出部分隐藏 */
-              text-overflow: ellipsis; /* 显示省略号 */
-            }
-            .icon{
-              width: 16px;
-            }
-          }
-          .el-submenu__icon-arrow{
-            right: 14px;
-          }
-        }
       }
     }
     .right-table{
@@ -373,7 +329,14 @@ export default {
   }
   .dialogVisible{
     ::v-deep .el-dialog {
+      position:absolute;
+      top:50%;
+      left:50%;
+      transform:translate(-50%,-50%);
+      margin-top:0 !important;
       .el-dialog__body{
+        flex:1;
+        overflow: auto;
         padding:24px 20px 0 20px;
         border-top: 1px solid #EEEEEE;
         border-bottom: 1px solid #EEEEEE;

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

+<template>
+  <div class="feed-summary-container">
+    <div class="feed-summary-inner">
+      <div class="left-side-menu">
+        <project-side-menu ref="profitloss" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive" @select="select">
+          <template slot="措施费-1">
+            <img src="@/assets/images/projectCostLedger/icon_cost_detail_4.svg" alt="">
+            <div class="project-sub-menu-title-text">措施费</div>
+          </template>
+        </project-side-menu>
+      </div>
+      <div class="profitloss">
+        <div class="search">
+          <el-date-picker size="small" style="width: 140px"
+            v-model="expenseDate"
+            type="month"
+            placeholder="选择月" @change="changetime"
+            :picker-options="pickerOptions">
+          </el-date-picker>
+        </div>
+        <div class="table-item">
+          <el-table
+            element-loading-text="Loading"
+            :data="tableData"
+            row-key="id"
+            v-horizontal-scroll="'hover'"
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            border
+            highlight-current-row
+          >
+            <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
+            <el-table-column label="清单内容" width="130" prop="itemContent" fixed="left">
+              <template slot-scope="scope">{{scope.row.itemContent || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="工作内容、做法/规格型号/施工现场配置说明" width="300" prop="workContent">
+              <template slot-scope="scope">{{scope.row.workContent || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="单位" width="130" prop="unit">
+              <template slot-scope="scope">{{scope.row.unit || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="工程量" width="130" prop="quantity">
+              <template slot-scope="scope">{{scope.row.quantity || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="不含税单价" width="130" prop="unitPriceExcludingTax">
+              <template slot-scope="scope">{{scope.row.unitPriceExcludingTax || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="使用时间" width="130" prop="usageTime">
+              <template slot-scope="scope">{{scope.row.usageTime || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="不含税合价" width="130" prop="amountExcludingTax">
+              <template slot-scope="scope">{{scope.row.amountExcludingTax || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税率（%）" width="130" prop="taxRate">
+              <template slot-scope="scope">{{scope.row.taxRate || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="含税合价" width="130" prop="amountIncludingTax">
+              <template slot-scope="scope">{{scope.row.amountIncludingTax || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销比例（%）" width="130" prop="amortizationRatio">
+              <template slot-scope="scope">{{scope.row.amortizationRatio || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销后不含税合价" width="130" prop="amountExcludeTaxAmortized">
+              <template slot-scope="scope">{{scope.row.amountExcludeTaxAmortized || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销后含税合价" width="130" prop="amountIncludeTaxAmortized">
+              <template slot-scope="scope">{{scope.row.amountIncludeTaxAmortized || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税金（元）" width="130" prop="taxAmount">
+              <template slot-scope="scope">{{scope.row.taxAmount || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="成本科目" width="130" prop="costSubject">
+              <template slot-scope="scope">{{scope.row.costSubject || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税金类型" width="130" prop="taxType">
+              <template slot-scope="scope">{{scope.row.taxType || '--'}}</template>
+            </el-table-column>
+
+
+            <el-table-column label="本月发生成本比例" width="130" prop="monthCostRate">
+              <template slot-scope="scope">{{scope.row.monthCostRate || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="成本合价" width="130" prop="costEffective">
+              <template slot-scope="scope">{{scope.row.costEffective || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="截止本月工程量" width="130" prop="currentProjectVolume">
+              <template slot-scope="scope">{{scope.row.currentProjectVolume || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="推送工作量" width="130" prop="submitProjectVolume">
+              <template slot-scope="scope">{{scope.row.submitProjectVolume || '--'}}</template>
+            </el-table-column>
+
+
+            <el-table-column label="备注" width="130" prop="remarks">
+              <template slot-scope="scope">{{scope.row.remarks || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="是否推送" width="130">
+              <template slot-scope="scope">{{scope.row.pushTime?"是":"否"}}</template>
+            </el-table-column>
+            <el-table-column label="操作" width="130" fixed="right">
+              <span class="wordprimary">推送工程量</span>
+            </el-table-column>
+          </el-table>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
+  import { getMeasureslist,getCostMeasureslist ,getSummarydata} from "@/api/projectCostLedger";
+  export default {
+    name: "MeasureItems",
+    props: {
+      // 项目ID
+      projectId: {
+        type: String,
+        required: true,
+        default: ""
+      },
+      // 详情信息
+      projectDetailInfo: {
+        type: Object,
+        default: () => ({})
+      }
+    },
+    watch: {
+      projectDetailInfo: {
+        handler(newValue) {
+          this.comProjectDetailInfo = newValue ? newValue : {};
+          this.init(this.projectId);
+        },
+        deep: true,
+        immediate: true
+      },
+      projectId: {
+        handler(newValue) {
+          this.comProjectId = newValue;
+        },
+        immediate: true
+      }
+    },
+    components: {
+      ProjectSideMenu
+    },
+    data() {
+      return {
+        pickerOptions: {
+          disabledDate(time) {
+            let istrue = true
+            let month = new Date().getMonth()+1
+            let year = new Date().getFullYear()
+            let times = (year+5)+'-'+ month + '-01 ' + '00:00:00'
+            istrue =  new Date().getTime() < time.getTime() && time.getTime() < new Date(times).getTime()
+            return !istrue
+          },
+        },
+        menuOptions: {
+          nodeName: "itemContent",
+          nodeValue: "id",
+        },
+        comProjectDetailInfo: {},
+        comProjectId: "",
+        defaultActive: "",
+        menuTreeList: [
+        ],
+        id: 0,
+        expenseDate:'',
+        tableData:[],
+      };
+    },
+    //可访问data属性
+    created() {
+      let month = new Date().getMonth() +1
+      let year = new Date().getFullYear()
+      this.expenseDate = year + '-' + (month>= 9? month:'0'+ month)
+
+    },
+    //计算集
+    computed: {
+
+    },
+    //方法集
+    methods: {
+      select(menuPath){
+        this.id = menuPath
+        let month = this.expenseDate.replace('-', "");
+        let param = {
+          projectId:this.projectId,
+          id:this.id,
+          month:month
+        }
+        getCostMeasureslist(param).then(res=>{
+          this.tableData = res.data
+        })
+      },
+      async init(detail = '') {
+        try {
+          const  projectId = detail;
+          if (!projectId) return;
+          await this.getFeedSummaryMenuTree(projectId);
+        } catch (error) {
+
+        }
+      },
+      async getFeedSummaryMenuTree(params) {
+        try {
+          const result = await getMeasureslist(params);
+          if (result.code == 200) {
+            let arr = {}
+            arr.itemContent = '措施费'
+            arr.id = 0
+            arr.children = result.data
+            const _tempArray = [arr];
+            this.menuTreeList = _tempArray;
+            await this.$nextTick()
+            this.$refs['profitloss'].$refs['customElMenu'].open(_tempArray[0].id)
+            this.defaultActive = result.data[0].id
+            this.select(result.data[0].id)
+          }
+        } catch (error) {
+          console.log(error)
+        }
+      },
+      changetime(){
+        this.select(this.id)
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .feed-summary-container {
+    width: 100%;
+    height: 100%;
+
+    .feed-summary-inner {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+
+      .left-side-menu {
+        width: 220px;
+        min-width: 220px;
+        height: 100%;
+      }
+      .profitloss{
+        width: calc(100% - 220px);
+        height: 100%;
+        background: #fff;
+        padding: 16px;
+        .table-item{
+          margin-top: 16px;
+        }
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/OtherProjects/index.vue

@@ -2,12 +2,37 @@
   <div class="otherProjects-container">
     <div class="otherProjects-cont">
       <div class="left">
-        <div class="left-menu">
-
+        <div class="left-side-menu">
+          <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive">
+            <template slot="其他费-1">
+              <img src="@/assets/images/projectCostLedger/icon_cost_detail_5.svg" alt="">
+              <div class="project-sub-menu-title-text">其他费</div>
+            </template>
+          </project-side-menu>
         </div>
       </div>
       <div class="right-table">
-        <div class="table-item">
+        <div class="table-item" v-if="defaultActive ==='费用汇总'">
+          <tables
+            v-if="!isSkeleton"
+            :tableLoading="tableLoading"
+            :tableData="tableData"
+            :forData="forData"
+            :MaxPage=500
+            :tableDataTotal="tableDataTotal"
+            :queryParams="queryParams"
+            @handle-current-change="handleCurrentChange"
+            @sort-change="sortChange"
+          >
+            <template slot="number" slot-scope="scope">
+              <div>{{scope.row.number || '--'}}</div>
+            </template>
+            <template slot="proportion" slot-scope="scope">
+              <div>{{scope.row.proportion || '--'}}</div>
+            </template>
+          </tables>
+        </div>
+        <div class="table-item" v-else>
           <tables
             v-if="!isSkeleton"
             :tableLoading="tableLoading"
@@ -23,38 +48,86 @@
               <div>{{scope.row.number || '--'}}</div>
             </template>
             <template slot="proportion" slot-scope="scope">
-              <div>{{scope.row.proportion || '--'}}{{scope.row.proportion ?  '%':''}}</div>
+              <div>{{scope.row.proportion || '--'}}</div>
             </template>
           </tables>
         </div>
       </div>
     </div>
+
+    <el-dialog :visible.sync="dialogVisible" width="720px" append-to-body class="dialogVisible" title="单位换算">
+      <el-tabs v-model="currentList">
+        <el-tab-pane
+          :key="index"
+          v-for="(item, index) in toggleTabs"
+          :label="item.name"
+          :name="item.value"
+        >
+          {{item.content}}
+        </el-tab-pane>
+        <div class="detail-cont-tab">
+          <div class="select">
+            <el-select v-model="type1" placeholder="请选择">
+              <el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+            </el-select>
+            <i class="el-icon-sort icon"></i>
+            <el-select v-model="type1" placeholder="请选择">
+              <el-option v-for="(item,index) in typeList1" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+            </el-select>
+          </div>
+          <el-table
+            :data="tableData1"
+            default-expand-all
+            border
+            highlight-current-row
+          >
+            <el-table-column
+              type="selection"
+              width="50">
+            </el-table-column>
+            <el-table-column label="序号" width="50" align="left">
+              <template slot-scope="scope">
+                <span>{{scope.$index + 1}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="成本科目" width="190" prop="cbkm"></el-table-column>
+            <el-table-column label="物料验收系统本月用料" width="195" prop="wlyl"></el-table-column>
+            <el-table-column label="换算后本月用料" prop="hsyl"></el-table-column>
+          </el-table>
+        </div>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible=false">取消</el-button>
+        <el-button type="primary">保存结果</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
   import Tables from "../../../../component/Tables"
+  import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
+  import { getProjectOtherMenuTreeApi,getProjectOtherStatistics } from "@/api/projectCostLedger";
 export default {
   name: "directCost",
   components: {
-    Tables,
+    Tables,ProjectSideMenu
+  },
+  props: {
+    // // 项目ID
+    // projectId: {
+    //   type: String,
+    //   required: true,
+    //   default: ""
+    // },
+    // // 详情信息
+    // projectDetailInfo: {
+    //   type: Object,
+    //   default: () => ({})
+    // }
   },
   data() {
     return {
-      data:[
-        {
-          label: '一级 1',
-          children: [{
-            label: '二级 1-1',
-            children: [{
-              label: '三级 1-1-1'
-            }]
-          }]
-        }
-      ],
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
+      comProjectId:'',
       isSkeleton:false,
       tableLoading:false,
       tableData:[
@@ -70,8 +143,8 @@ export default {
         },
       ],
       forData: [
-        {label: '其他项目费用', prop: 'name'},
-        {label: '数量', prop: 'number',slot: true},
+        {label: '其他项目费用', prop: 'expenseName'},
+        {label: '数量', prop: 'expenseValue'},
         {label: '占比', prop: 'proportion', slot: true},
       ],
       forData1: [
@@ -92,11 +165,90 @@ export default {
         pageSize:10,
       },
       tableDataTotal:2,
+      defaultActive: "费用汇总",
+      menuTreeList: [
+        {
+          id: "1",
+          itemContent:"其他费",
+          children: []
+        }
+      ],
+      menuOptions: {
+        nodeName: "itemContent",
+        nodeValue: "itemContent",
+      },
+      dialogVisible:false,
+      currentList: "type1",
+      toggleTabs:[
+        {
+          value: "type1",
+          name: "长度",
+        },
+        {
+          value: "type2",
+          name: "面积",
+        },
+        {
+          value: "type3",
+          name: "体积",
+        },
+        {
+          value: "type4",
+          name: "质量",
+        },
+        {
+          value: "type5",
+          name: "密度",
+        },
+      ],
+      tableData1:[
+        {
+          cbkm:'标前成本',
+          wlyl:'42000KG',
+          hsyl:'42T'
+        },
+        {
+          cbkm:'标前成本',
+          wlyl:'42000KG',
+          hsyl:'42T'
+        },
+        {
+          cbkm:'标前成本',
+          wlyl:'42000KG',
+          hsyl:'42T'
+        },
+        {
+          cbkm:'标前成本',
+          wlyl:'42000KG',
+          hsyl:'42T'
+        },
+      ],
+      type1:'',
+      type2:'',
+      typeList:[],
+      typeList1:[],
     };
   },
+  watch: {
+    // projectDetailInfo: {
+    //   handler(newValue) {
+    //     this.comProjectDetailInfo = newValue ? newValue : {};
+    //     // this.init(this.comProjectDetailInfo);
+    //   },
+    //   deep: true,
+    //   immediate: true
+    // },
+    // projectId: {
+    //   handler(newValue) {
+    //     this.comProjectId = newValue;
+    //   },
+    //   immediate: true
+    // }
+  },
   //可访问data属性
   created() {
-
+    this.getProjectOtherMenuTreeApi('1762014527685136385')
+    this.getProjectOtherStatistics('1762014527685136385')
   },
   //计算集
   computed: {
@@ -104,14 +256,33 @@ export default {
   },
   //方法集
   methods: {
-    handleNodeClick(data) {
-      console.log(data);
+    async getProjectOtherStatistics(params) {
+      try {
+        const result = await getProjectOtherStatistics(params);
+        if (result.code == 200) {
+          const _dataArray = result.data;
+          this.tableData = _dataArray;
+        }
+      } catch (error) {
+
+      }
     },
-    handleOpen(key, keyPath) {
-      console.log(key, keyPath);
+    async getProjectOtherMenuTreeApi(params) {
+      try {
+        const result = await getProjectOtherMenuTreeApi(params);
+        if (result.code == 200) {
+          const _tempArray = result.data;
+
+          _tempArray.unshift({id:"11",itemContent:"费用汇总"});
+          this.menuTreeList[0].children = _tempArray;
+        }
+      } catch (error) {
+
+      }
     },
-    handleClose(key, keyPath) {
-      console.log(key, keyPath);
+    open(menuPath, menuPathArray){
+      console.log(menuPath)
+      console.log(menuPathArray)
     },
     //分页
     handleCurrentChange(e){
@@ -139,21 +310,54 @@ export default {
       height: 100%;
     }
     .left{
-      width: 220px;
-      height: 100%;
-      .left-menu{
-        width: 100%;
+      .left-side-menu {
+        width: 220px;
+        min-width: 220px;
         height: 100%;
-        border-right: 1px solid #eeeeee;
-        overflow: auto;
       }
-      white-space: nowrap; /* 不换行 */
-      overflow: hidden; /* 超出部分隐藏 */
-      text-overflow: ellipsis; /* 显示省略号 */
     }
     .right-table{
       width: calc(100% - 220px);
       padding: 16px;
     }
   }
+  .dialogVisible{
+    ::v-deep .el-dialog {
+      position:absolute;
+      top:50%;
+      left:50%;
+      transform:translate(-50%,-50%);
+      margin-top:0 !important;
+      .el-dialog__body{
+        flex:1;
+        overflow: auto;
+        padding:0;
+        border-top: 1px solid #EEEEEE;
+        border-bottom: 1px solid #EEEEEE;
+        .select{
+          margin-bottom: 16px;
+        }
+        .el-input{
+          width: 316px !important;
+        }
+        .el-tabs__nav-wrap{
+          padding: 0 16px;
+        }
+        .el-tabs__header{
+          margin: 0;
+        }
+        .detail-cont-tab{
+          padding: 24px 20px;
+          .icon{
+            transform: rotate(90deg);
+            color:#0081FF;
+            margin: 0 16px;
+          }
+        }
+      }
+      .el-dialog__footer{
+        padding: 16px 20px;
+      }
+    }
+  }
 </style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectSideMenu/index.vue

@@ -123,7 +123,7 @@ export default {
     // 初始化树形结构
     initMenuTree(array = []) {
       if (array?.length) {
-        // 合并默认配置 
+        // 合并默认配置
         const _options = this.mergeMenuOptions(JSON.parse(JSON.stringify(this.menuOptions)));
         this.tempMenuOptions = _options;
         // 映射配置

dsk-operate-ui/src/views/projectCostLedger/detail/index.vue

@@ -17,11 +17,14 @@
         <!-- 工料汇总 -->
         <feed-summary v-if="current == 'feedSummary'" :project-id="projectID" :project-detail-info="detailInfo"></feed-summary>
 
+        <!--措施项目-->
+        <measure-items v-if="current == 'measureItem'" :project-id="projectID" :project-detail-info="detailInfo"></measure-items>
+
         <!-- 其他项目 -->
         <other-projects v-if="current == 'otherItems'"></other-projects>
 
         <!-- 盈亏分析对比 -->
-        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectID"></profit-Loss>
+        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectID" :project-detail-info="detailInfo"></profit-Loss>
 
       </div>
     </div>
@@ -36,6 +39,8 @@ import EngineeringInformation from "@/views/projectCostLedger/detail/components/
 import DirectCost from "@/views/projectCostLedger/detail/components/DirectCost";
 // 工料汇总
 import FeedSummary from "@/views/projectCostLedger/detail/components/FeedSummary";
+// 措施费用
+import MeasureItems from "@/views/projectCostLedger/detail/components/MeasureItems";
 // 其他项目
 import OtherProjects from "@/views/projectCostLedger/detail/components/OtherProjects";
 // 盈亏分析对比
@@ -52,7 +57,8 @@ export default {
     EngineeringInformation,
     DirectCost,
     OtherProjects,
-    ProfitLoss
+    ProfitLoss,
+    MeasureItems
   },
   data() {
     return {
@@ -61,7 +67,8 @@ export default {
       // 详情信息变量
       detailInfo: {
         projectId: "1754425038355890177",
-        cbStage: 0
+        cbStage: 0,
+        cbType:1
       },
       toggleTabs: [
         {

dsk-operate-ui/src/views/projectCostLedger/index.vue

@@ -53,9 +53,13 @@
             <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                       v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
                       :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
-                      ref="theOwnerListTable" :row-key="'customerKey'">
+                      ref="theOwnerListTable" :row-key="'customerKey'"
+                      lazy
+                      row-key="id"
+                      :load="load"
+                      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
 
-              <el-table-column type="index" label="序号" width="60" :resizable="false">
+              <el-table-column type="index" label="序号" width="60">
                 <template slot-scope="scope">
                   <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
                 </template>
@@ -246,7 +250,7 @@
     checkProjectCodeExist,
     deleteDraft,
     editProjectInfo,
-    getDraftDialogList,getProjectCbStageNotDraft,getProjectList,batchDeleteProject
+    getDraftDialogList,getProjectCbStageNotDraft,getProjectList,batchDeleteProject,getProjectHistoryInfo
   } from '@/api/projectCostLedger/index'
   import { getDicts } from '@/api/system/dict/data'
   import proupload from '@/views/projectCostLedger/upload/index'
@@ -302,7 +306,6 @@
   },
   //可访问data属性
   created() {
-    // this.isupload = true
     //成本阶段
     getDicts('pro_cbstage').then(res=>{
       this.cbStagelist = res.data
@@ -322,6 +325,16 @@
   },
   //方法集
   methods: {
+    //树形懒加载
+    load(tree, treeNode, resolve) {
+      let param = JSON.parse(JSON.stringify(this.formdata))
+      param.projectId = tree.id
+      setTimeout(() => {
+        getProjectHistoryInfo(param).then(res => {
+          resolve(res.data)
+        })
+      }, 1000)
+    },
     //获取台账列表
     getlist(){
       getProjectList(this.formdata).then(res=>{
@@ -412,6 +425,7 @@
     //返回列表
     colsepro(){
       this.isupload = false
+      this.dialogVisible = false
       this.getCGXlist()
       this.getlist()
     },
@@ -524,27 +538,27 @@
       })
     },
     deletecg(id){
-      this.$confirm('是否确定删除此项目，删除后无法找回。', '提示', {
-        confirmButtonText: '确定删除',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteDraft(id).then(res=>{
-          if(res.code == 200){
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getCGXlist(1)
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+        this.$confirm('是否确定删除此项目，删除后无法找回。', '提示', {
+          confirmButtonText: '确定删除',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDraft(id).then(res=>{
+            if(res.code == 200){
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+              this.getCGXlist(1)
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
         });
-      });
-    },
+      },
   },
 }
 </script>
@@ -555,6 +569,9 @@
     box-sizing: border-box;
     padding: 16px 24px;
     overflow: auto;
+    ::v-deep .table-item .el-table td .cell{
+      display: flex;
+    }
     .project-cost-ledger-inner {
       width: 100%;
       /*height: 100%;*/

dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue

@@ -27,31 +27,31 @@
               <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="年度" width="120" :resizable="false">
+          <el-table-column label="年度" width="120" prop="name1" :resizable="false">
           </el-table-column>
-          <el-table-column label="使用公司" :resizable="false">
+          <el-table-column label="使用公司" :resizable="false" width="250">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name2||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="使用项目" :resizable="false">
+          <el-table-column label="使用项目" width="250" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name3||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="项目考评" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name4||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司考评分" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name5||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="汇总分" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name6||"--"}}
             </template>
           </el-table-column>
         </el-table>
@@ -78,10 +78,11 @@
       return{
         encodeStr,
         tableData:[
-          {name:'测试',legalPerson:'AAAA'}
+          {name1:'2021年度',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
+          {name1:'2021年度',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
         ],
         isSkeleton:false,
-        total:100,
+        total:2,
         pageSize:50,
         pageNum:1,
       }

dsk-operate-ui/src/views/supplier/supplierlist/disposal.vue

@@ -27,56 +27,56 @@
               <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="使用项目" width="320" :fixed="tableColumnFixed"  :resizable="false">
+          <el-table-column label="使用项目" width="350" :fixed="tableColumnFixed" prop="name1" :resizable="false">
           </el-table-column>
-          <el-table-column label="使用单位" :min-width="200" :resizable="false">
+          <el-table-column label="使用单位" :min-width="260" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name2||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="公司名称" :min-width="200" :resizable="false">
+          <el-table-column label="公司名称" :min-width="300" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name3||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="处置时间" :min-width="180" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name4||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="年度" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name5||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="处置前状态" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name6||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="处置后状态" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name7||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="处置前等级" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name8||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="处置后等级" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name9||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="预警原因" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name10||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="不合格原因" :min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.name11||"--"}}
             </template>
           </el-table-column>
         </el-table>
@@ -103,10 +103,11 @@
       return{
         encodeStr,
         tableData:[
-          {name:'测试',legalPerson:'AAAA'}
+          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'2023年11月25日',name5:'2023',name6:'-',name7:'涉诉禁用',name8:'A',name9:'B',name10:'-',name11:'-'},
+          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-',name7:'-',name8:'-',name9:'-',name10:'-',name11:'-'}
         ],
         isSkeleton:false,
-        total:100,
+        total:2,
         pageSize:50,
         pageNum:1,
         // table列是否悬浮

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -54,9 +54,9 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="涉诉状态">
-              <!--<el-select multiple placeholder="请选择" :collapse-tags="true" clearable>-->
-                <!--<el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>-->
-              <!--</el-select>-->
+              <el-select multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+              </el-select>
             </el-form-item>
           </el-row>
           <el-divider></el-divider>

dsk-operate-ui/vue.config.js

@@ -35,14 +35,13 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://47.104.91.229:9099/prod-api`,//测试-旧
         target: `http://111.204.34.146:9099/prod-api`,//测试
         // target: `http://192.168.60.5:9098`,//陈跃方
         // target: `http://192.168.60.27:9098`,//邓
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施-无线
         // target: `http://192.168.60.46:9098`,//施-有线
-        // target: `http://192.168.60.6:9098`,//谭
+        // target: `http://192.168.60.90:9098`,//谭
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''