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-admin/src/main/resources/application.yml

@@ -67,6 +67,9 @@ user:
 spring:
   application:
     name: ${ruoyi.name}
+  jpa:
+    open-in-view: false
+
   # 资源信息
   messages:
     # 国际化资源文件路径
@@ -324,14 +327,16 @@ lock4j:
 management:
   endpoints:
     enabled-by-default: false
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
-    logfile:
-      external-file: ./logs/sys-console.log
+
+#  endpoints:
+#    web:
+#      exposure:
+#        include: '*'
+#  endpoint:
+#    health:
+#      show-details: ALWAYS
+#    logfile:
+#      external-file: ./logs/sys-console.log
 gv:
   img-path: D:\dsk\dsk-operate-sys\
 

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

@@ -61,32 +61,32 @@ public interface CbProjectConstants {
     /**
      * 成本类型:直接费成本
      */
-    Integer CB_TYPE_DIRECT_EXPENSE = 0;
+    int CB_TYPE_DIRECT_EXPENSE = 0;
     String CB_TYPE_DIRECT_EXPENSE_NAME = "直接费成本";
     /**
      * 成本类型:工料汇总
      */
-    Integer CB_TYPE_QUANTITY_SUMMARY = 1;
+    int CB_TYPE_QUANTITY_SUMMARY = 1;
     String CB_TYPE_QUANTITY_SUMMARY_NAME = "工料汇总";
     /**
      * 成本类型:措施项目
      */
-    Integer CB_TYPE_MEASURE_PROJECT = 2;
+    int CB_TYPE_MEASURE_PROJECT = 2;
     String CB_TYPE_MEASURE_PROJECT_NAME = "措施项目";
     /**
      * 成本类型:其他项目
      */
-    Integer CB_TYPE_OTHER_PROJECT = 3;
+    int CB_TYPE_OTHER_PROJECT = 3;
     String CB_TYPE_OTHER_PROJECT_NAME = "其他项目";
     /**
      * 成本类型:现场经费
      */
-    Integer CB_TYPE_SCENE_EXPENSE = 4;
+    int CB_TYPE_SCENE_EXPENSE = 4;
     String CB_TYPE_SCENE_EXPENSE_NAME = "现场经费";
     /**
      * 成本类型:成本汇总
      */
-    Integer CB_TYPE_SUMMARY = 5;
+    int CB_TYPE_SUMMARY = 5;
     String CB_TYPE_SUMMARY_NAME = "成本汇总";
 
 }

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

@@ -3,6 +3,7 @@ package com.dsk.cscec.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.dsk.common.annotation.Log;
@@ -24,11 +25,13 @@ import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
 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.domain.vo.CbProjectExpenseSummaryVo;
 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;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -63,6 +66,22 @@ public class CbCostMeasureController {
     private CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
 
 
+    /**
+     * 获取实际月份列表
+     *
+     * @param cbCostMeasureBo CB成本衡量范围
+     * @return {@link R}<{@link List}<{@link String}>>
+     */
+    @SaIgnore
+    @GetMapping(value = "/actual/months")
+    public R<List<String>> actualMonths(CbCostMeasureActualBo cbCostMeasureBo) {
+        List<String> data = cbCostMeasureService.actualMonthList(cbCostMeasureBo);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
     /**
      * 措施费一级大类
      * 根据项目查询措施费一级大类
@@ -91,8 +110,13 @@ public class CbCostMeasureController {
 //    @SaCheckPermission("cb:costmeasures:list")
     @SaIgnore
     @GetMapping("/list")
-    public R<List<CbCostMeasureActualVo>> list(CbCostMeasureActualBo cbCostMeasure) {
-        List<CbCostMeasureActualVo> data= cbCostMeasureService.selectDataList(cbCostMeasure);
+    public R<List> list(CbCostMeasureActualBo cbCostMeasure) {
+        if(ObjectUtil.isNotEmpty(cbCostMeasure)&&cbCostMeasure.getId()==0){
+            Integer dataType=2;
+            List<CbProjectExpenseSummaryVo> dataList = cbCostMeasureService.getSummaryData(cbCostMeasure.getProjectId(),dataType,cbCostMeasure.getMonth());
+            return R.ok(dataList);
+        }
+        List<Tree<Long>> data= cbCostMeasureService.selectDataList(cbCostMeasure);
         if (ObjectUtil.isNull(data)) {
             data = new ArrayList<>();
         }
@@ -133,6 +157,24 @@ public class CbCostMeasureController {
 
 
 
+    /**
+     * 获取上一次推送工程量
+     *
+     * @param measuresId 推送BO
+     * @return {@link R}<{@link List}<{@link CbCostMeasureActualVo}>>
+     */
+//    @SaCheckPermission("cb:costmeasures:actual:push")
+    @SaIgnore
+    @GetMapping("/last/project/volume/{measuresId}")
+    public R<Object> lastProjectVolume(@PathVariable("measuresId") Long measuresId) {
+        Assert.notNull(measuresId,"措施费记录id不能为空！");
+        Object pushJson=  cbCostMeasureService.lastProjectVolume(measuresId);
+        return R.ok("操作成功",pushJson);
+    }
+
+
+
+
 
     /**
      * 获取批量措施费列表
@@ -200,10 +242,10 @@ public class CbCostMeasureController {
     @Log(title = "措施费汇总获取")
 //    @SaCheckPermission("system:user:import")
     @PostMapping(value = "/summary/data")
-    public R<List<CbProjectExpenseSummary>> summaryData(Long projectId) throws Exception {
+    public R<List<CbProjectExpenseSummaryVo>> summaryData(Long projectId,String month) throws Exception {
         Integer dataType=2;
-        List<CbProjectExpenseSummary> cbProjectExpenseSummaries = cbProjectExpenseSummaryService.queryCbSceneExpenseSummaryDataByType(projectId, dataType);
-        return R.ok(cbProjectExpenseSummaries);
+      List<CbProjectExpenseSummaryVo> dataList = cbCostMeasureService.getSummaryData(projectId,dataType,month);
+        return R.ok(dataList);
     }
 
 

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

@@ -8,6 +8,7 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
+import com.dsk.cscec.domain.vo.CbProjectInfoVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.service.CbProjectRecordService;
 import com.dsk.cscec.service.IDProjectService;
@@ -76,7 +77,7 @@ public class CbProjectRecordController extends BaseController {
      * 获取项目历史阶段信息(懒加载)
      */
     @GetMapping("/getProjectHistoryInfo")
-    public R<List<CbProjectRecord>> getProjectHistoryInfo(@RequestBody CbProjectHistorySearchBo searchBo) {
+    public R<List<CbProjectRecord>> getProjectHistoryInfo(CbProjectHistorySearchBo searchBo) {
         return R.ok(baseService.getProjectHistoryInfo(searchBo));
     }
 
@@ -136,5 +137,13 @@ public class CbProjectRecordController extends BaseController {
     public R<Void> deleteDraft(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
         return toAjax(baseService.deleteDraft(projectId));
     }
+
+    /**
+     * 获取工程项目信息
+     */
+    @GetMapping("/getCbProjectInfo/{projectId}")
+    public R<CbProjectInfoVo> getCbProjectInfo(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
+        return R.ok(dProjectService.getCbProjectInfo(projectId));
+    }
 }
 

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

 package com.dsk.cscec.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,6 +49,7 @@ public class CbSummaryActual implements Serializable {
     /**
      * 删除状态(0:否、2:是)
      */
+    @TableLogic
     private Integer delFlag;
 
 }

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

@@ -33,7 +33,6 @@ public class DProject implements Serializable {
     /**
      * IPM项目名称
      */
-
     private String projectName;
 
     /**
@@ -49,7 +48,6 @@ public class DProject implements Serializable {
     /**
      * 项目简称
      */
-
     private String projectShortName;
 
     /**

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

@@ -16,33 +16,33 @@ public class CbCostMeasureActualPushBo {
 
 
     /**
-     * 截止本月工程量
+     * 本月实际工程量
+     */
+    private BigDecimal costEffective;
+
+    /**
+     * 本月实际工程量
      */
-    @TableField(value = "current_project_volume")
     private BigDecimal currentProjectVolume;
 
     /**
      * 推送工程量
      */
-    @TableField(value = "submit_project_volume")
     private BigDecimal submitProjectVolume;
 
     /**
      * 年月
      */
-    @TableField(value = "`month`")
     private String month;
 
     /**
      * 推送时间
      */
-    @TableField(value = "push_time")
     private Date pushTime;
 
     /**
      * 推送数据json
      */
-    @TableField(value = "push_data_json")
     private String pushDataJson;
 
     /**

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

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CbCostMeasureActualVo {
@@ -17,6 +18,10 @@ public class CbCostMeasureActualVo {
      */
     private Long id;
 
+
+    private Long parentId;
+
+
     /**
      * 序号
      */
@@ -138,6 +143,9 @@ public class CbCostMeasureActualVo {
     private Date pushTime;
 
 
+    private String pushDataJson;
+
+
     /**
      * 修改人
      */
@@ -162,6 +170,10 @@ public class CbCostMeasureActualVo {
     @TableField(value = "update_time")
     private Date updateTime;
 
+
+    private List<CbCostMeasureActualVo>  childrens;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_PLAN_MEASURE_ID = "plan_measure_id";

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

+package com.dsk.cscec.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.dsk.common.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目费用汇总表
+ */
+@Data
+public class CbProjectExpenseSummaryVo {
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 项目文件ID
+     */
+    private Long projectFileId;
+
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+
+    /**
+     * 序号
+     */
+    private String number;
+
+    /**
+     * 数据类型(2:措施项目、3:其他项目、4:现场经费)
+     */
+    private Integer dataType;
+
+    /**
+     * 名称
+     */
+    private String expenseName;
+
+    /**
+     * 数值
+     */
+    private String expenseValue;
+
+    /**
+     * 占比
+     */
+    private String proportion;
+
+
+    /**
+     * 本月工程量
+     */
+    private BigDecimal monthsProjectQuantity;
+
+
+
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2024.02.28
+ * @time 14:24
+ */
+@Data
+public class CbProjectInfoVo {
+    //项目基本情况↓
+    /**
+     * 工程名称
+     */
+    private String projectName;
+    /**
+     * 区域名称(工程所在地)
+     */
+    private String areaName;
+    /**
+     * 城市名称(工程所在地)
+     */
+    private String cityName;
+    /**
+     * 县市(工程所在地)
+     */
+    private String districtName;
+    /**
+     * 项目地址(工程详细地址)
+     */
+    private String projectAddress;
+    //业态
+    /**
+     * 工程类型上级名称(工程类型)
+     */
+    private String projectType1;
+    //计价模式（清单/定额）
+    //承包形式（EPC/DB/EP/PC）
+    //合同类型
+    //建设单位
+    /**
+     * 设计单位
+     */
+    private String designOrgName;
+    //勘察单位
+    /**
+     * 监理单位
+     */
+    private String supervisorOrgName;
+    //代理公司（或工料测量师）
+    //招标形式
+    //承包方式
+    //预计合同额（万元）
+    /**
+     * 资金来源名称(资金来源)
+     */
+    private String moneySource;
+    //分包标准费用项价格库
+    //材料机械标准费用价格库
+    //专业类别
+    //平台项目名称
+    //核定总人数
+    //折算收入不含税系数（应纳税率）
+    //收入清单增值税率
+
+
+    //项目特征信息↓
+    //地上建筑面积
+    //地下建筑面积
+    //坑底面积
+    //占地面积
+    //结构类型
+    //基础类型
+    //单体个数
+    /**
+     * 地上层数
+     */
+    private String noOfOverfloor;
+    /**
+     * 地下层数
+     */
+    private String noOfUnderfloor;
+    /**
+     * 建筑高度(m)
+     */
+    private String constructHeight;
+    //地下深度
+    //首层(m)
+    //标准层(m)
+    //其他说明
+
+    //项目投标时的要点↓
+    //建筑工程
+    //机电工程
+    //专业工程暂估
+    //装饰工程
+    //配套工程
+    //指定分包
+    //报价方式/合同形式
+    //指定供应
+    //电子标
+    /**
+     * 计划开工日期
+     */
+    private Date planStartDate;
+    /**
+     * 计划竣工日期
+     */
+    private Date planEndDate;
+    /**
+     * 合同总工期(总工期)
+     */
+    private String contractWorkDays;
+    //缺陷责任
+    //质量标准
+    //品牌要求
+    //质量要求
+    //报价中需要注意的其他问题/风险
+
+    //评标办法↓
+    //评标程序
+    //评标原则
+    //招标控制价（如有）
+    //专家组成
+    //定标原则
+    //报价上限（如有）
+
+    //投标各时间节点↓
+    //标前会议（或者领取投标文件的时间）
+    //投标人提出疑问的截止时间
+    //招标人答复疑问的截止时间
+    //现场踏勤时间
+    //招标控制价（如有）
+    //报价上限（如有）
+    //时间
+    //开标时的要求
+    //地点
+    //投标有效期
+}

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

@@ -49,15 +49,17 @@ public class CbSummaryCostAccountImportListener extends AnalysisEventListener<Cb
             int count = StringUtil.count(importVo.getNumber(), "-");
             importVo.setLevel(count + 1);
         } else {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据序号为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据序号为空");
+//            return;
+            throw new ServiceException("表格中存在'序号'列为空数据!");
         }
         //成本科目不能为空
         if (StringUtil.isBlank(importVo.getCbName())) {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据成本科目为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据成本科目为空");
+//            return;
+            throw new ServiceException("表格中存在'成本科目'列为空数据!");
         }
 
         //父级数据处理

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

@@ -45,9 +45,10 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm
     public void invoke(CbSummaryProjectImportVo importVo, AnalysisContext context) {
         //名称不能为空
         if (StringUtil.isBlank(importVo.getCbName())) {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据名称为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据名称为空");
+//            return;
+            throw new ServiceException("表格中存在'名称'列为空数据!");
         }
         //添加父级数据
         if (sort == 0) {
@@ -70,9 +71,10 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm
                     .filter(vo -> StringUtil.isNotBlank(vo.getNumber())).limit(1).map(CbSummaryProjectImportVo::getLevel).toArray();
             //数据序号错误
             if (ObjectUtil.isEmpty(objects)) {
-                failureNum++;
-                failureMsg.append("<br/>").append("第" + sort + "条数据序号错误");
-                return;
+//                failureNum++;
+//                failureMsg.append("<br/>").append("第" + sort + "条数据序号错误");
+//                return;
+                throw new ServiceException("'序号'列数据错误，无法匹配层级!");
             }
 
             Integer lastLevel = (Integer) objects[0];

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

@@ -13,4 +13,6 @@ public interface CbCostMeasureActualMapper extends BaseMapper<CbCostMeasureActua
     int updateByPrimaryKeySelective(CbCostMeasureActual record);
 
     List<CbCostMeasureActualVo> selectDataList(CbCostMeasureActualBo costMeasureActualBo);
+
+    List<CbCostMeasureActualVo> getMonthActualCostList(Long projectId, String month);
 }
\ No newline at end of file

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

@@ -7,10 +7,13 @@ import com.dsk.cscec.domain.CbCostMeasure;
 import com.dsk.cscec.domain.CbQuantitySummary;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface CbCostMeasureMapper extends BaseMapper<CbCostMeasure> {
 
     List<CbCostMeasureActualVo> selectListByProjectAndNo(CbCostMeasureActualBo cbCostMeasure);
+
+    List<String> actualMonthList(CbCostMeasureActualBo cbCostMeasureBo);
 }
\ No newline at end of file

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

@@ -19,5 +19,6 @@ import java.util.Map;
  */
 public interface ICbCostMeasureActualService extends IService<CbCostMeasureActual> {
 
+    List<CbCostMeasureActualVo> getMonthActualCostList(Long projectId, String month);
 }
 

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

 package com.dsk.cscec.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
-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;
 import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
-import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
-import org.springframework.web.multipart.MultipartFile;
+import com.dsk.cscec.domain.vo.CbProjectExpenseSummaryVo;
 
 import java.io.InputStream;
 import java.util.List;
@@ -29,7 +25,7 @@ public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
     List<Map<String, Object>> listByLevel(Long projectId, int i);
 
-    List<CbCostMeasureActualVo> selectDataList(CbCostMeasureActualBo cbCostMeasure);
+    List<Tree<Long>> selectDataList(CbCostMeasureActualBo cbCostMeasure);
 
     void saveBatchCostMeasureActual(List<CbCostMeasureActualSaveBo> boList);
 
@@ -40,5 +36,11 @@ public interface ICbCostMeasureService extends IService<CbCostMeasure> {
     void parseCbCostMeasureFile(Long projectId);
 
     boolean reparseCbCostMeasureFile(Long projectId,Long projectFileId);
+
+    String lastProjectVolume(Long measuresId);
+
+    List<String> actualMonthList(CbCostMeasureActualBo cbCostMeasureBo);
+
+    List<CbProjectExpenseSummaryVo> getSummaryData(Long projectId, Integer dataType,String month);
 }
 

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

@@ -7,6 +7,7 @@ import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.CbProjectInfoVo;
 import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
@@ -60,5 +61,12 @@ public interface IDProjectService extends IService<DProject> {
      * @return 校验结果
      */
     Boolean checkProjectCodeExist(String projectCode);
+
+    /**
+     * 获取工程项目信息
+     * @param projectId 项目ID
+     * @return 工程项目信息
+     */
+    CbProjectInfoVo getCbProjectInfo(Long projectId);
 }
 

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

@@ -72,6 +72,7 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
             InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
             if (ObjectUtil.isNull(inputStream)) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",文件数据不存在");
                 projectFile.setFailRemark("文件数据不存在");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -80,6 +81,7 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
             List<CbProjectExpenseSummary> importList = new ExcelUtils<>(CbProjectExpenseSummary.class).importExcelAllSheet(inputStream, 0);
             if (importList.isEmpty()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",表格中不存在待导入数据");
                 projectFile.setFailRemark("表格中不存在待导入数据!");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -100,7 +102,8 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                     .collect(Collectors.toList());
             if (summaryList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
+                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据!");
+                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }

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

@@ -181,7 +181,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                     file.setFileParseStatus(3);
                     file.setFailRemark("文件数据不存在");
                     projectFileService.updateById(file);
-                    break;
+                    continue;
                 }
 
                 // 文件名称
@@ -191,7 +191,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 Long fileId = file.getId();
                 if ("其他费".equals(name)) {
                     totalDataAnalysis(inputStream, name, file, projectId, cbStage);
-                    break;
+                    continue;
                 }
                 //解析数据
                 ExcelResult<CbProjectOtherImportVo> importVoExcelResult =
@@ -204,7 +204,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                     file.setFileParseStatus(3);
                     file.setFailRemark("表格中不存在待导入数据!");
                     projectFileService.updateById(file);
-                    break;
+                    continue;
                 }
                 log.debug(">>>>" + importVoList.size());
                 CbProjectOther rootProjectOther = new CbProjectOther();

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

@@ -113,6 +113,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
             InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
             if (ObjectUtil.isNull(inputStream)) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",文件数据不存在");
                 projectFile.setFailRemark("文件数据不存在");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -121,6 +122,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
             List<CbSceneExpenseChildrenImportBo> importList = new ExcelUtils<>(CbSceneExpenseChildrenImportBo.class).importExcelAllSheet(inputStream, 0);
             if (importList.isEmpty()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",表格中不存在待导入数据");
                 projectFile.setFailRemark("表格中不存在待导入数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -154,7 +156,8 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
                     .collect(Collectors.toList());
             if (summaryList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
+                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据");
+                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }

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

@@ -71,16 +71,16 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
     @Override
     public void importCbSummary(Long projectId) {
 
-        //获取待解析和待删除文件信息
+        //获取待解析和解析失败文件信息
         List<CbProjectFile> cbProjectFiles = cbProjectFileMapper.selectAnalysisList(projectId, CbProjectConstants.CB_TYPE_SUMMARY, null);
 
         //解析数据
         cbProjectFiles.forEach(cbProjectFile -> {
-            if (cbProjectFile.getDelFlag() == 1) {
-                //根据fileId删除相关基础数据，并删除文件
-                baseMapper.delete(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getCbProjectFileId, cbProjectFile.getId()));
-                cbProjectFileMapper.removeById(cbProjectFile.getId());
-            } else {
+//            if (cbProjectFile.getDelFlag() == 1) {
+//                //根据fileId删除相关基础数据，并删除文件
+//                baseMapper.delete(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getCbProjectFileId, cbProjectFile.getId()));
+//                cbProjectFileMapper.removeById(cbProjectFile.getId());
+//            } else {
                 try {
                     if (cbProjectFile.getFileName().contains("项目")) {
                         saveCbSummaryProject(projectId, cbProjectFile);
@@ -96,7 +96,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     cbProjectFile.setFailRemark("失败原因：" + e.getMessage());
                     cbProjectFileMapper.updateById(cbProjectFile);
                 }
-            }
+//            }
 
         });
 
@@ -152,6 +152,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     CbSummary parent = cbSummaryList.stream().filter(summary -> summary.getSort() < cbSummary.getSort() && summary.getLevel() == parentLevel)
                             .max(Comparator.comparing(CbSummary::getSort)).get();
 
+                    if(ObjectUtil.isNull(parent)){
+                        throw new ServiceException("'序号'列数据错误，无法匹配层级!");
+                    }
                     cbSummary.setParentId(parent.getId());
                 }
 
@@ -224,7 +227,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     Integer parentLevel = cbSummary.getLevel() - 1;
                     CbSummary parent = cbSummaryList.stream().filter(summary -> summary.getSort() < cbSummary.getSort() && summary.getLevel() == parentLevel)
                             .max(Comparator.comparing(CbSummary::getSort)).get();
-
+                    if(ObjectUtil.isNull(parent)){
+                        throw new ServiceException("'序号'列数据错误，无法匹配层级!");
+                    }
                     cbSummary.setParentId(parent.getId());
                 }
 
@@ -290,6 +295,11 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
             children.setTaxExclusiveExpenseTotal(total.get("taxExclusiveExpenseTotal"));
             children.setTaxInclusiveExpenseTotal(total.get("taxInclusiveExpenseTotal"));
         });
+        if (CollectionUtil.isNotEmpty(childrenList)) {
+            cbSummaryActualListVo.setHasChildren(1);
+        } else {
+            cbSummaryActualListVo.setHasChildren(0);
+        }
 
         if (0 == cbSummaryActualListVo.getLevel() && 1 == bo.getCbType()) {
             //项目汇总一级列表

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

@@ -3,11 +3,14 @@ package com.dsk.cscec.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.cscec.domain.CbCostMeasure;
 import com.dsk.cscec.domain.CbCostMeasureActual;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import com.dsk.cscec.mapper.CbCostMeasureActualMapper;
 import com.dsk.cscec.mapper.CbCostMeasureMapper;
 import com.dsk.cscec.service.ICbCostMeasureActualService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author tanyang
  * @create 2024-02-07 9:38
@@ -15,4 +18,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ICbCostMeasureActualServiceImpl extends ServiceImpl<CbCostMeasureActualMapper, CbCostMeasureActual> implements ICbCostMeasureActualService {
 
+    @Override
+    public List<CbCostMeasureActualVo> getMonthActualCostList(Long projectId, String month) {
+        return baseMapper.getMonthActualCostList(projectId,month);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.dsk.cscec.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,15 +16,18 @@ import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.domain.AdvisoryBody;
 import com.dsk.cscec.domain.AdvisoryBodyProject;
+import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.CbProjectInfoVo;
 import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
+import com.dsk.cscec.mapper.CbProjectRecordMapper;
 import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.cscec.service.IDProjectService;
 import com.dsk.jsk.domain.EnterpriseInfoHeaderBody;
@@ -52,6 +56,8 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     private AdvisoryBodyProjectMapper advisoryBodyProjectMapper;
     @Resource
     private DskOpenApiUtil dskOpenApiUtil;
+    @Resource
+    private CbProjectRecordMapper projectRecordMapper;
 
     /**
      * 获取所有项目列表数据
@@ -258,5 +264,19 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         return baseMapper.exists(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectCode, projectCode));
     }
+
+    /**
+     * 获取工程项目信息
+     *
+     * @param projectId 项目ID
+     * @return 工程项目信息
+     */
+    @Override
+    public CbProjectInfoVo getCbProjectInfo(Long projectId) {
+        CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
+        Assert.isTrue(projectRecord.getIsGetProjectDetail(), "请先通过IPM项目编码获取数据,或IPM项目编码无效");
+        return BeanUtil.toBean(baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
+                .eq(DProject::getProjectCode, projectRecord.getIpmProjectNo())), CbProjectInfoVo.class);
+    }
 }
 

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

@@ -174,4 +174,14 @@
       AND t.cb_stage=#{cbStage}
       AND t1.`month`=#{month}
   </select>
+
+  <select id="getMonthActualCostList" resultType="com.dsk.cscec.domain.vo.CbCostMeasureActualVo">
+    SELECT t1.item_content, t.cost_effective
+    FROM cb_cost_measure_actual t
+    inner JOIN cb_cost_measure t1 ON t1.id=t.plan_measure_id
+    WHERE
+      t1.project_id=1
+      AND t1.parent_id=0
+      AND t.`month`='202406'
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -36,7 +36,7 @@
     id, project_id, cb_stage, parent_id, `level`, `number`, `no`,item_content, work_content,
     unit, quantity, unit_price_excluding_tax, usage_time, amount_excluding_tax, tax_rate, 
     amount_including_tax, amortization_ratio, amount_exclude_tax_amortized, amount_include_tax_amortized, 
-    tax_amount, remarks, cost_subject, tax_type, create_time, update_time
+    tax_amount, remarks, cost_subject, tax_type,data_source, create_time, update_time
   </sql>
 
 
@@ -54,4 +54,15 @@
       AND t.`no` like concat(#{id},'.%')
     ORDER BY id ASC
   </select>
+
+  <select id="actualMonthList" resultType="java.lang.String">
+    SELECT
+      t1.`month`
+    FROM cb_cost_measure t
+    inner JOIN cb_cost_measure_actual t1 ON t1.plan_measure_id=t.id
+    WHERE
+      t.project_id=#{projectId}
+      and t1.del_flag=0
+    GROUP  BY  t1.`month` ORDER BY t1.`month` desc
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -74,10 +74,11 @@ export function uploadCbProjectFile(data) {
   });
 }
 //删除文件
-export function deleteCbProjectFile(fileId) {
+export function deleteCbProjectFile(data) {
   return request({
-    url: '/cbProjectFile/deleteCbProjectFile/' + fileId,
+    url: '/cbProjectFile/deleteCbProjectFile',
     method: 'Delete',
+    data: data
   });
 }
 
@@ -154,6 +155,30 @@ export function getSummarydata(data) {
     data: data
   });
 }
+//措施费推送工程量
+export function pushProjectvolume(data) {
+  return request({
+    url: '/cb/cost/measures/push/project/volume',
+    method: 'post',
+    data: data
+  });
+}
+
+//措措施费-获取上一次推送工程量
+export function projectVolume(data) {
+  return request({
+    url: '/cb/cost/measures/last/project/volume/' + data,
+    method: 'GET',
+  });
+}
+
+//措施费-获取实际成本月份列表
+export const getActualMonthsApi = (params = {}) => request({
+  url: '/cb/cost/measures/actual/months',
+  method: 'get',
+  params
+});
+
 
 
 // 工料汇总
@@ -169,6 +194,17 @@ export const getFeedSummaryMenuTreeApi = (params = {}) => request({
   params
 });
 
+/**
+ * 获取已记录月份集合
+ * @param {*} params 
+ * @returns 
+ */
+export const getFeedSummaryMonthListApi = (params = {}) => request({
+  url: "/cb/quantity/summary/monthList",
+  method: "get",
+  params
+});
+
 /**
  * 获取科目月份列表
  * @param {{

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

+<template>
+  <div class="dsk-skeleton-outer-container">
+    <el-skeleton :animated="true" class="dsk-skeleton-inner-container">
+      <template slot="template">
+        <template v-for="item of count">
+          <div :key="item">
+            <el-skeleton-item variant="text" style="width: 60%;" />
+            <el-skeleton-item variant="text" style="width: 100%;" />
+            <el-skeleton-item variant="text" style="width: 100%;" />
+            <el-skeleton-item variant="text" style="width: 100%;" />
+          </div>
+        </template>
+      </template>
+    </el-skeleton>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'dskSkeleton',
+  data() {
+    return {
+      count: 0
+    };
+  },
+  created() {
+    this.getSkeletonCount();
+  },
+  methods: {
+    async getSkeletonCount() {
+      try {
+        await this.$nextTick();
+        const skeletonContainer = this.$el.querySelector(".dsk-skeleton-inner-container");
+        const height = skeletonContainer.offsetHeight;
+        // 160高度为一组
+        const group = Math.round(height / 160);
+        this.count = group;
+      } catch (error) {
+
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dsk-skeleton-outer-container {
+  padding: 0px 16px;
+  background: #fff;
+  z-index: 999;
+
+  .dsk-skeleton-inner-container {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+  }
+}
+
+.el-skeleton__item {
+  height: 20px;
+  border-radius: 0;
+  margin-top: 16px;
+  background: #f0f0f0;
+}
+
+.el-skeleton {
+  .el-skeleton__item:last-of-type {
+    /* margin-bottom: 16px; */
+  }
+}
+</style>

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

@@ -3,11 +3,13 @@
     <!-- tab列表 -->
     <div class="dsk-tab-items-container">
       <div class="dsk-tab-items-container-inner">
-        <div class="dsk-tab-item" v-for="item of tabs" :key="item.id" :class="{'tab-current' : item.value == currentValue}">
-          <div class="dsk-tab-item-name" @click="tabChoose(item)">{{item.name}}</div>
+        <div class="dsk-tab-item" v-for="item of tabs" :key="item.id"
+          :class="{'tab-current' : item.value == currentValue,'tab-is-disabled' : item.disabled || comDisabled}">
+          <div class="dsk-tab-item-name" @click="item.disabled || comDisabled ? '' : tabChoose(item)">{{item.name}}</div>
         </div>
         <!-- 下滑条 -->
-        <div class="dsk-tab-sliding-bar" v-if="tabs.length" :style="{width : `${silidingBarWidth}px`,transform : `translateX(${silidingBarLeft}px)`}">
+        <div class="dsk-tab-sliding-bar" v-if="tabs.length && this.showTabsSlidingbar && !comDisabled"
+          :style="{width : `${silidingBarWidth}px`,transform : `translateX(${silidingBarLeft}px)`}">
         </div>
       </div>
     </div>
@@ -25,6 +27,10 @@ export default {
       required: true,
       type: Array,
       default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -32,6 +38,12 @@ export default {
       handler(newValue) {
         this.initSlidingBar();
       }
+    },
+    // 全部禁用不显示滚动条
+    disabled: {
+      handler(newValue) {
+        this.comDisabled = newValue ? true : false;
+      }
     }
   },
   model: {
@@ -41,7 +53,8 @@ export default {
   data() {
     return {
       silidingBarLeft: 0,
-      silidingBarWidth: 0
+      silidingBarWidth: 0,
+      comDisabled: this.disabled ? true : false
     };
   },
   //可访问data属性
@@ -50,7 +63,13 @@ export default {
   },
   //计算集
   computed: {
-
+    showTabsSlidingbar() {
+      const current = this.tabs.find(item => item.value == this.currentValue);
+      if (current) {
+        return current.disabled ? false : true;
+      }
+      return false;
+    }
   },
   //方法集
   methods: {
@@ -124,6 +143,13 @@ export default {
             font-weight: bold;
           }
         }
+
+        &.tab-is-disabled {
+          .dsk-tab-item-name {
+            color: #eee;
+            cursor: not-allowed;
+          }
+        }
       }
 
       .dsk-tab-sliding-bar {

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

 <template>
-  <div class="dsk-table-header-setting" @click="showHeaderSetting">
-    <svg-icons :icon-class="'table-header-setting-icon'" :class-name="'table-header-setting-icon'"></svg-icons>
-    <div class="table-header-setting-text">表头设置</div>
+  <div class="dsk-table-header-setting">
+    <div class="event-target-container" @click="showHeaderSetting">
+      <svg-icons :icon-class="'table-header-setting-icon'" :class-name="'table-header-setting-icon'"></svg-icons>
+      <div class="table-header-setting-text">表头设置</div>
+    </div>
     <transition appear name="head" mode="out-in">
       <setting-bar v-if="showHeaderSettingStatus" :settingList="settingList" @settingChange="settingChange"
         @settingClose="showHeaderSettingStatus = false"></setting-bar>
@@ -39,6 +41,10 @@ export default {
   //方法集
   methods: {
     showHeaderSetting() {
+      if (this.showHeaderSettingStatus) {
+        this.showHeaderSettingStatus = false;
+        return;
+      };
       this.showHeaderSettingStatus = true;
     },
     settingChange(use) {
@@ -62,6 +68,11 @@ export default {
     }
   }
 
+  .event-target-container {
+    display: flex;
+    align-items: center;
+  }
+
   .table-header-setting-icon {
     cursor: pointer;
   }

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

@@ -15,7 +15,8 @@
             v-model="expenseDate"
             type="month"
             placeholder="选择月" @change="changetime"
-            :picker-options="pickerOptions">
+            value-format="yyyy-MM"
+            >
           </el-date-picker>
         </div>
         <div class="table-item">
@@ -115,14 +116,14 @@
     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
-          },
+          // 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: "cbName",
@@ -216,6 +217,7 @@
           id:this.id,
           expenseDate:this.expenseDate
         }
+        console.log(param)
         getAnalysislist(param).then(res=>{
           this.tableData = res.data
         })
@@ -252,7 +254,7 @@
           console.log(error)
         }
       },
-      changetime(){
+      changetime(val){
         this.select(this.id)
       },
     },

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

@@ -3,7 +3,7 @@
     <template>
       <!-- 有下级菜单 -->
       <template v-if="checkHasChidren">
-        <el-submenu :index="menuItem.nodeValue" ref="projectSubMenuItem" class="project-sub-menu-item"
+        <el-submenu :index="createMenuIndex(menuItem.nodeValue)" ref="projectSubMenuItem" class="project-sub-menu-item"
           :class="`project-sub-menu-item-level-${menuItem.level}`" :disabled="menuItem.originData && menuItem.originData.disabled">
           <template slot="title">
             <!-- 预留插槽 -->
@@ -20,8 +20,8 @@
       </template>
       <!-- 无子集菜单 -->
       <template v-else>
-        <el-menu-item :index="menuItem.nodeValue" class="project-only-menu-item" :class="`project-only-menu-item-level-${menuItem.level}`"
-          :disabled="menuItem.originData && menuItem.originData.disabled">
+        <el-menu-item :index="createMenuIndex(menuItem.nodeValue)" class="project-only-menu-item"
+          :class="`project-only-menu-item-level-${menuItem.level}`" :disabled="menuItem.originData && menuItem.originData.disabled">
           <template slot="title">
             <div class="project-only-menu-title-container">
               <!-- 预留插槽 -->
@@ -79,6 +79,11 @@ export default {
       }
       styles["padding-left"] = `${paddingLeft}px`;
       return styles;
+    },
+    createMenuIndex(index) {
+      if (index || index == "0") {
+        return index.toString();
+      }
     }
   },
 }

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

 <template>
   <div class="project-side-menu-container">
-    <el-menu mode="vertical" class="project-side-menu-instance" :unique-opened="uniqueOpened" :default-active="comDefaultActive" @select="menuSelect"
-      @open="subMenuOpen" @close="subMenuClose" ref="customElMenu">
+    <el-menu mode="vertical" class="project-side-menu-instance" :unique-opened="uniqueOpened" :default-active="createMenuIndex(comDefaultActive)"
+      @select="menuSelect" @open="subMenuOpen" @close="subMenuClose" ref="customElMenu">
       <template v-for="(item,index) of tempMenuTree">
         <project-menu-item :menuItem="item" :key="item.nodeValue">
           <template :slot="`${item.nodeName}-${item.level}`" slot-scope="scope">
@@ -44,7 +44,7 @@ export default {
     },
     // 默认打开的菜单
     defaultActive: {
-      type: String,
+      type: [String, Number],
       default: ""
     }
   },
@@ -101,6 +101,11 @@ export default {
       const result = this.getCurrentData(menuPath);
       this.$emit("select", menuPath, result);
     },
+    createMenuIndex(index) {
+      if (index || index == "0") {
+        return index.toString();
+      }
+    },
     getCurrentData(only) {
       const _tempTree = JSON.parse(JSON.stringify(this.tempMenuTree));
       if (_tempTree) {

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

@@ -3,7 +3,7 @@
     <div class="project-cost-ledger-detail-inner">
       <project-detail-header :current="current" :breadCrumbTree="createProjectBreadCrumbTree"></project-detail-header>
       <!-- tab切换栏 -->
-      <dsk-tab-toggle v-model="current" :tabs="toggleTabs" @tabToggle="tabToggle"></dsk-tab-toggle>
+      <dsk-tab-toggle v-model="current" :tabs="toggleTabs" @tabToggle="tabToggle" :disabled="tabsDisabled"></dsk-tab-toggle>
       <!-- tab切换组件容器 -->
       <div class="project-cost-ledger-detail-module">
         <!-- 放入组件 v-if current == ‘xxxx’ 详情变量 this.detailInfo 需要深度监听-->
@@ -15,16 +15,16 @@
         <direct-cost v-if="current == 'directCost'" :project-detail-info="detailInfo"></direct-cost>
 
         <!-- 工料汇总 -->
-        <feed-summary v-if="current == 'feedSummary'" :project-id="projectID" :project-detail-info="detailInfo"></feed-summary>
+        <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>
+        <measure-items v-if="current == 'measureItem'" :project-id="projectId" :project-detail-info="detailInfo"></measure-items>
 
         <!-- 其他项目 -->
         <other-projects v-if="current == 'otherItems'" :project-detail-info="detailInfo"></other-projects>
 
         <!-- 盈亏分析对比 -->
-        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectID" :project-detail-info="detailInfo"></profit-Loss>
+        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectId" :project-detail-info="detailInfo"></profit-Loss>
 
       </div>
     </div>
@@ -62,14 +62,15 @@ export default {
   },
   data() {
     return {
-      projectID: "",
+      projectId: "",
       current: "",
       // 详情信息变量
       detailInfo: {
         projectId: "1754425038355890177",
         cbStage: 0,
-        cbType:1
+        cbType: 1
       },
+      tabsDisabled: false,
       toggleTabs: [
         {
           value: "basicEngineeringInformation",
@@ -161,21 +162,24 @@ export default {
     },
     async getProjectQuery() {
       try {
+        this.tabsDisabled = true;
         const { query } = this.$route;
-        // if (!query.projectID) return this.$message.error("缺少项目id");
-        this.projectID = query.projectID;
+        // if (!query.projectId) return this.$message.error("缺少项目id");
+        this.projectId = query.projectId;
+        // 获取详情 保证详情获取完毕 再执行tab命中 进行生命周期
+        await this.getProjectDetail(query.projectId);
         if (query.current) {
           this.current = query.current;
         } else {
           // 默认命中工程项目信息
           this.current = "basicEngineeringInformation";
         };
-        await this.getProjectDetail(query.projectID);
+        this.tabsDisabled = false;
       } catch (error) {
         console.log(error);
       }
     },
-    async getProjectDetail(projectID) {
+    async getProjectDetail(projectId) {
       try {
 
       } catch (error) {

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

@@ -68,19 +68,18 @@
               <el-table-column label="工程名称" width="416" :resizable="false">
                 <template slot-scope="scope">
                   <div style="display:flex;align-items:center">
-                    <!--<el-tooltip placement="top" v-if="scope.row.customerText.length>20">-->
-                      <!--<div slot="content">{{scope.row.projectName}}</div>-->
+                    <el-tooltip placement="top" v-if="scope.row.projectText.length>20">
                       <div class="renling">
                         <router-link v-if="scope.row.isGetProjectDetail" :to="`/projectCostLedger/detail?projectID=${scope.row.id}`" tag="a"
                                      class="wordprimary" v-html="scope.row.projectName"></router-link>
                         <span v-else v-html="scope.row.projectName"></span>
                       </div>
-                    <!--</el-tooltip>-->
-                    <!--<div class="renling" v-else>-->
-                      <!--<router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"-->
-                                   <!--class="wordprimary" v-html="scope.row.customerName"></router-link>-->
-                      <!--<span v-else v-html="scope.row.customerName"></span>-->
-                    <!--</div>-->
+                    </el-tooltip>
+                    <div class="renling" v-else>
+                      <router-link v-if="scope.row.isGetProjectDetail" :to="`/projectCostLedger/detail?projectID=${scope.row.id}`" tag="a"
+                                   class="wordprimary" v-html="scope.row.projectName"></router-link>
+                      <span v-else v-html="scope.row.projectName"></span>
+                    </div>
                   </div>
 
                 </template>
@@ -342,6 +341,9 @@
           this.total = res.total
           this.formdata.pageNum = res.currentPage
           this.tableData = res.rows
+          this.tableData.forEach(item=>{
+            item.projectText = item.projectName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
         }else{
           this.total = 0
           this.tableData = []
@@ -379,8 +381,8 @@
     //查看进度
     detailpro(row){
       this.uploadData = row
-      this.uploadData.id = this.uploadData.projectId
       this.prodetail = true
+      this.isupload = true
     },
     //删除项目
     deleetpro(row){

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

@@ -63,7 +63,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,0)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -91,7 +91,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,1)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -119,7 +119,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,2)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -147,7 +147,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,3)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -175,7 +175,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,4)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -203,7 +203,7 @@
                     <div class="cz" v-if="item.fileParseStatus != 1">
                       <div v-if="item.fileParseStatus != 3"><a :href="item.fileOssUrl">下载</a></div>
                       <div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
-                      <div class="i" @click="deletefille(item.id)" v-if="prodetail == false">删除</div>
+                      <div class="i" @click="deletefille(item.id,5)" v-if="prodetail == false">删除</div>
                     </div>
                   </div>
                   <div class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
@@ -283,12 +283,14 @@
         uploadtype:0,//上传的版块类型
         visible:false,
         issub:false,//已填完数据可以开始解析
+        isclick:true,
       }
     },
     created() {
       this.formdata = JSON.parse(JSON.stringify(this.uploadData))
       this.formdata.cbStage = this.formdata.cbStage.toString()
       this.getDetail()
+      console.log(this.formdata )
     },
     methods:{
       importdata(){
@@ -326,18 +328,22 @@
         })
       },
       uplpro(type){
-        if(!this.prodetail){
+        if(!this.prodetail && this.isclick){
           this.uploadtype = type
           this.$refs.uploadpro.$el.querySelector('input').click()
         }
       },
-      deletefille(id){
+      deletefille(id,type){
         this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteCbProjectFile(id).then(res=>{
+          let param = {
+            fileId: id,
+            cbType: type,
+          }
+          deleteCbProjectFile(param).then(res=>{
             if(res.code == 200){
               this.$message({
                 type: 'success',
@@ -354,6 +360,7 @@
         });
       },
       handleFileListChange(file, fileList) {
+        this.isclick = false
         var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
         const extension = testmsg === "xlsx";
         const extension1 = testmsg === "xls";
@@ -403,6 +410,7 @@
               default:
                 break
             }
+            this.isclick = true
           }
         })
       },