Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

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

@@ -61,7 +61,7 @@ public class CbDirectExpenseController extends BaseController {
         return toAjax(baseService.addExpense(addBo));
     }
 
-    /***
+    /**
      * 删除直接费费用项
      */
     @DeleteMapping("/deleteExpense/{id}")

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

 package com.dsk.cscec.controller;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
 import com.dsk.cscec.domain.vo.CbProjectHeadInfoVo;
@@ -13,10 +19,12 @@ 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;
+import com.dsk.search.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.List;
@@ -42,12 +50,25 @@ public class CbProjectRecordController extends BaseController {
      * 校验项目编码是否存在
      */
     @GetMapping("/checkProjectCodeExist")
-    public R<Boolean> checkProjectCodeExist(@Validated CbCheckProjectCodeExistBo checkBo) {
-        if (dProjectService.checkProjectCodeExist(checkBo)) {
-            return R.ok(true);
-        } else {
-            return R.fail("IPM项目编码无效", false);
+    public R<String> checkProjectCodeExist(@Validated CbCheckProjectCodeExistBo checkBo) {
+        return R.ok(dProjectService.checkProjectCodeExist(checkBo));
     }
+
+    /**
+     * 根据项目名称模糊查询项目列表
+     */
+    @GetMapping("/queryProjectNameList/projectName")
+    public R<List<DProject>> queryProjectNameList(@RequestParam @NotBlank(message = "项目名称不能为空") String projectName) {
+        return R.ok(dProjectService.queryProjectNameList(projectName));
+    }
+
+    /**
+     * 校验项目名称是否存在
+     */
+    @GetMapping("/checkProjectNameExist/projectName")
+    public R<CbProjectRecord> checkProjectNameExist(@RequestParam @NotBlank(message = "项目名称不能为空") String projectName) {
+        CbProjectRecord projectRecord = baseService.checkProjectNameExist(projectName);
+        return R.ok(ObjectUtil.isNotNull(projectRecord) ? "已存在相同名称项目,是否继续创建该项目的新阶段?" : "操作成功", projectRecord);
     }
 
     /**

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.math.BigDecimal;
 import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -55,6 +57,12 @@ public class CbCostMeasureActual {
     @TableField(value = "submit_project_volume")
     private BigDecimal submitProjectVolume;
 
+    /**
+     * 本月差值
+     */
+    @TableField(value = "difference")
+    private BigDecimal difference;
+
     /**
      * 年月
      */

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

@@ -119,6 +119,18 @@ public class CbDirectExpense extends BaseEntity implements Serializable {
      */
     @Excel(name = "含税成本合价")
     private String includeTaxCbSumPrice;
+    /**
+     * 规格型号
+     */
+    private String specificationModel;
+    /**
+     * 计算规则
+     */
+    private String calculateRule;
+    /**
+     * 甲供材料
+     */
+    private String supplierMaterial;
     /**
      * 合价偏差
      */

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

 package com.dsk.cscec.domain.bo;
 
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -32,13 +33,37 @@ public class AddCbDirectExpenseBo {
      */
     @NotBlank(message = "单位不能为空")
     private String unit;
+    /**
+     * 招标控制价单价
+     */
+    @NotBlank(message = "招标控制价单价不能为空")
+    private String tenderControlUnitPrice;
     /**
      * 不含税成本单价
      */
     @NotBlank(message = "不含税成本单价不能为空")
     private String excludeTaxCbUnitPrice;
+    /**
+     * 含税成本单价
+     */
+    @NotBlank(message = "含税成本单价不能为空")
+    private String includeTaxCbUnitPrice;
+    /**
+     * 规格型号
+     */
+    @NotBlank(message = "规格型号不能为空")
+    private String specificationModel;
     /**
      * 特征描述
      */
+    @NotBlank(message = "特征描述不能为空")
     private String projectFeature;
+    /**
+     * 计算规则
+     */
+    private String calculateRule;
+    /**
+     * 甲供材料
+     */
+    private String supplierMaterial;
 }
\ No newline at end of file

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

@@ -54,6 +54,11 @@ public class CbCostMeasureActualSaveBo {
      */
     private BigDecimal submitProjectVolume;
 
+    /**
+     * 本月差值
+     */
+    private BigDecimal difference;
+
     /**
      * 年月
      */

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

@@ -140,6 +140,16 @@ public class CbCostMeasureActualVo {
      */
     private BigDecimal submitProjectVolume;
 
+    /**
+     * 本月差值
+     */
+    private BigDecimal difference;
+
+    /**
+     * 截止本月差值
+     */
+    private BigDecimal sumDifference;
+
     /**
      * 年月
      */

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

@@ -121,9 +121,13 @@ public class CbQuantitySummaryListVo {
      */
     private String actualId;
     /**
-     * 推送工程量
+     * 推送工程量(本月差值)
      */
     private Double pushQuantities;
+    /**
+     * 累计差值
+     */
+    private Double cumulativeDifference;
     /**
      * IPM项目编码
      */

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

@@ -6,6 +6,7 @@ import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
 import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import org.apache.ibatis.annotations.Param;
+import org.ehcache.javadoc.PrivateApi;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -24,4 +25,6 @@ public interface CbCostMeasureActualMapper extends BaseMapper<CbCostMeasureActua
     BigDecimal selectSumData(CbCostMeasureActualSaveBo bo);
 
     BigDecimal selectMonthProjectVolumeByLevel(@Param("level") Integer level,@Param("projectId") Long projectId,@Param("month") String month);
+
+    BigDecimal calculateSumDifference(@Param("item") CbCostMeasureActualVo item);
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
 import com.dsk.cscec.domain.vo.CbProjectHeadInfoVo;
@@ -18,6 +19,14 @@ import java.util.List;
  * @since 2024-02-05 11:37:53
  */
 public interface CbProjectRecordService extends IService<CbProjectRecord> {
+    /**
+     * 校验项目名称是否存在
+     *
+     * @param projectName 项目名称
+     * @return 项目实体
+     */
+    CbProjectRecord checkProjectNameExist(String projectName);
+
     /**
      * 新增项目
      *

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

@@ -61,7 +61,7 @@ public interface IDProjectService extends IService<DProject> {
      * @param checkBo 待校验信息
      * @return 校验结果
      */
-    Boolean checkProjectCodeExist(CbCheckProjectCodeExistBo checkBo);
+    String checkProjectCodeExist(CbCheckProjectCodeExistBo checkBo);
 
     /**
      * 获取工程项目信息
@@ -70,5 +70,13 @@ public interface IDProjectService extends IService<DProject> {
      * @return 工程项目信息
      */
     CbProjectInfoVo getCbProjectInfo(Long projectId);
+
+    /**
+     * 根据项目名称模糊查询项目列表
+     *
+     * @param projectName 项目名称
+     * @return 项目列表
+     */
+    List<DProject> queryProjectNameList(String projectName);
 }
 

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

@@ -7,10 +7,12 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,6 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.excel.ExcelResult;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.JsonUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.common.utils.poi.ExcelUtil;
@@ -32,7 +36,9 @@ import com.dsk.cscec.domain.vo.CbProjectExpenseSummaryImportVo;
 import com.dsk.cscec.domain.vo.CbProjectExpenseSummaryVo;
 import com.dsk.cscec.listener.ProjectCostMeasureImportListener;
 import com.dsk.cscec.listener.ProjectCostMeasureSummaryImportListener;
+import com.dsk.cscec.mapper.CbCostMeasureActualMapper;
 import com.dsk.cscec.service.*;
+import com.sun.org.apache.bcel.internal.generic.IFNULL;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +46,7 @@ import org.springframework.stereotype.Service;
 import com.dsk.cscec.mapper.CbCostMeasureMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -60,15 +67,12 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
 
     @Autowired
     private CbProjectRecordService cbProjectRecordService;
-
-
     @Autowired
     private ICbCostMeasureActualService cbCostMeasureActualService;
-
+    @Resource
+    private CbCostMeasureActualMapper cbCostMeasureActualMapper;
     @Autowired
     private CbProjectFileService cbProjectFileService;
-
-
     @Autowired
     private CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
 
@@ -184,6 +188,10 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
         //查询项目某项措施费所有计划成本
         dataList = baseMapper.selectListByProjectAndNo(costMeasureActualBo);
 
+        //统计截止本月差值
+        dataList.forEach(item -> {
+            item.setSumDifference(cbCostMeasureActualMapper.calculateSumDifference(item));
+        });
 //配置类
         TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
         treeNodeConfig.setIdKey("id");
@@ -218,6 +226,8 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
             treeNode.putExtra("projectVolume", object.getProjectVolume());
             treeNode.putExtra("currentProjectVolume", object.getCurrentProjectVolume());
             treeNode.putExtra("submitProjectVolume", object.getSubmitProjectVolume());
+            treeNode.putExtra("difference", object.getDifference());
+            treeNode.putExtra("sumDifference", object.getSumDifference());
             treeNode.putExtra("month", object.getMonth());
             treeNode.putExtra("pushTime", object.getPushTime());
             treeNode.putExtra("pushDataJson", object.getPushDataJson());
@@ -230,7 +240,25 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
     @Override
     public void saveBatchCostMeasureActual(List<CbCostMeasureActualSaveBo> boList) {
         //递归
-        this.recursionSaveBatchCostMeasureActual(boList, boList.get(0).getId(), null);
+        //this.recursionSaveBatchCostMeasureActual(boList, boList.get(0).getId(), null);
+        Assert.isTrue(ObjectUtil.isNotEmpty(boList), "数据不能为空");
+        boList.forEach(item -> {
+            CbCostMeasureActual actual = BeanUtil.toBean(item, CbCostMeasureActual.class);
+            Assert.notNull(actual.getPlanMeasureId(), "基础数据id不能为空");
+            Assert.notNull(actual.getMonth(), "填写月份不能为空");
+            actual.setId(ObjectUtil.isNull(actual.getId()) ? IdUtil.getSnowflakeNextId() : actual.getId());
+            // 查询计划成本累积实际成本
+            BigDecimal bigDecimal = cbCostMeasureActualService.selectSumData(item);
+            actual.setCurrentProjectVolume(NumberUtil.add(bigDecimal, actual.getProjectVolume()));
+            actual.setUpdateUser(Objects.requireNonNull(LoginHelper.getUsername()));
+            actual.setUpdateId(Objects.requireNonNull(LoginHelper.getUserId()));
+            actual.setDelFlag(0);
+            boolean b = cbCostMeasureActualService.saveOrUpdate(actual);
+            if (!b) {
+                log.error("CbQuantitySummaryServiceImpl.updateActual() data insert error! data:" + JSONUtil.toJsonStr(actual));
+                throw new ServiceException("数据添加错误！");
+            }
+        });
     }
 
     /**
@@ -246,6 +274,7 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
         for (CbCostMeasureActualSaveBo cbCostMeasureActualSaveBo : boList) {
             CbCostMeasureActual cbCostMeasureActual = new CbCostMeasureActual();
             BeanUtil.copyProperties(cbCostMeasureActualSaveBo, cbCostMeasureActual);
+
             if (ObjectUtil.isNotNull(planMeasureId)) {
                 cbCostMeasureActual.setPlanMeasureId(planMeasureIdTemp++);
             }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.helper.LoginHelper;
@@ -17,12 +18,14 @@ import com.dsk.component.DataAnalysisComponent;
 import com.dsk.cscec.constant.CbProjectConstants;
 import com.dsk.cscec.domain.CbProjectFile;
 import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
 import com.dsk.cscec.domain.vo.CbProjectHeadInfoVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
+import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.cscec.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
@@ -31,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -62,6 +66,26 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     private ICbCostMeasureService costMeasureService;
     @Resource
     private CbDirectExpenseService directExpenseService;
+    @Resource
+    private DProjectMapper dProjectMapper;
+
+    /**
+     * 校验项目名称是否存在
+     *
+     * @param projectName 项目名称
+     * @return 项目实体
+     */
+    @Override
+    public CbProjectRecord checkProjectNameExist(String projectName) {
+        if (StringUtils.isNotBlank(projectName)) {
+            return baseMapper.selectOne(new LambdaQueryWrapper<CbProjectRecord>()
+                    .eq(CbProjectRecord::getProjectName, projectName)
+                    .eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST)
+                    .orderByDesc(CbProjectRecord::getCbStage)
+                    .last("LIMIT 1"));
+        }
+        return null;
+    }
 
     /**
      * 新增项目
@@ -72,6 +96,16 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CbProjectRecord addProject(AddCbProjectBo addCbProjectBo) {
+        //仅管理员可创建IPM系统中不存在的项目
+        Objects.requireNonNull(LoginHelper.getLoginUser()).getRolePermission().forEach(permission -> {
+            if (!TenantConstants.SUPER_ADMIN_ROLE_KEY.equals(permission) &&
+                    !TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY.equals(permission) &&
+                    !TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(permission)) {
+                Assert.isTrue(dProjectMapper.exists(new LambdaQueryWrapper<DProject>()
+                        .eq(DProject::getProjectName, addCbProjectBo.getProjectName())), "IPM系统中不存在该项目,请重新选择");
+            }
+        });
+
         CbProjectRecord projectRecord = BeanUtil.toBean(addCbProjectBo, CbProjectRecord.class);
 
         //生成唯一关联ID
@@ -245,7 +279,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         projectRecordList.forEach(record -> {
             //关键字标红
             if (StringUtils.isNotBlank(searchBo.getProjectName())) {
-                record.setProjectName(StringUtils.markInRed(record.getProjectFileName(), searchBo.getProjectName()));
+                record.setProjectName(StringUtils.markInRed(record.getProjectName(), searchBo.getProjectName()));
             }
             //补充更新时间、更新人
             CbProjectFile projectFile = projectFileMapper.selectOne(new LambdaQueryWrapper<CbProjectFile>()

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.domain.AdvisoryBody;
@@ -35,10 +36,12 @@ import com.dsk.jsk.domain.EnterpriseInfoHeaderBody;
 import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.poi.ss.formula.functions.DProduct;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 咨询机构管理
@@ -261,16 +264,13 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
      * @return 校验结果
      */
     @Override
-    public Boolean checkProjectCodeExist(CbCheckProjectCodeExistBo checkBo) {
+    public String checkProjectCodeExist(CbCheckProjectCodeExistBo checkBo) {
         Long projectId = checkBo.getProjectId();
         String projectCode = checkBo.getProjectCode();
 
         //新增全新项目时,直接校验IPM编码是否重复和是否存在
         if (ObjectUtil.isNull(projectId)) {
-            Assert.isFalse(projectRecordMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
-                    .eq(CbProjectRecord::getIpmProjectNo, projectCode)), "项目台账列表中已存在相同IPM编码的项目");
-            return baseMapper.exists(new LambdaQueryWrapper<DProject>()
-                    .eq(DProject::getProjectCode, projectCode));
+            return this.treatProjectCodeExist(projectCode);
         } else {
             CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
             ////未做任何改动时
@@ -278,14 +278,22 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             //修改项目信息or新增新阶段项目时
             if (projectCode.equals(projectRecord.getIpmProjectNo())
                     && projectRecord.getIsGetProjectDetail()) {
-                return true;
+                return projectRecord.getProjectName();
             } else {
+                return this.treatProjectCodeExist(projectCode);
+            }
+        }
+    }
+
+    private String treatProjectCodeExist(String projectCode) {
         Assert.isFalse(projectRecordMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
                 .eq(CbProjectRecord::getIpmProjectNo, projectCode)), "项目台账列表中已存在相同IPM编码的项目");
-                return baseMapper.exists(new LambdaQueryWrapper<DProject>()
+        DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectCode, projectCode));
+        if (ObjectUtil.isNotNull(dProject)) {
+            return dProject.getProjectName();
         }
-        }
+        throw new ServiceException("IPM项目编码无效");
     }
 
     /**
@@ -303,5 +311,20 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         return BeanUtil.toBean(baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectCode, projectRecord.getIpmProjectNo())), CbProjectInfoVo.class);
     }
+
+    /**
+     * 根据项目名称模糊查询项目列表
+     *
+     * @param projectName 项目名称
+     * @return 项目列表
+     */
+    @Override
+    public List<DProject> queryProjectNameList(String projectName) {
+        return baseMapper.selectList(new LambdaQueryWrapper<DProject>()
+                .select(DProject::getProjectName, DProject::getProjectCode)
+                .like(StringUtils.isNotBlank(projectName), DProject::getProjectName, projectName)).stream().peek(item -> {
+            item.setProjectName(StringUtils.markInRed(item.getProjectName(), projectName));
+        }).collect(Collectors.toList());
+    }
 }
 

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

@@ -200,4 +200,11 @@
     AND t1.level=#{level}
     AND t.`month`=#{month}
   </select>
+
+  <select id="calculateSumDifference" resultType="java.math.BigDecimal">
+      select ifnull(sum(ccma.difference), 0) sumDifference
+      from cb_cost_measure_actual ccma
+      where ccma.plan_measure_id = #{item.id}
+        and ccma.month &lt;= #{item.month}
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -41,9 +41,9 @@
 
 
   <select id="selectListByProjectAndNo" resultType="com.dsk.cscec.domain.vo.CbCostMeasureActualVo">
-    SELECT t.*,t1.actualId,t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective,  t1.project_volume,t1.current_project_volume,t1.submit_project_volume,t1.`month`,t1.push_time FROM cb_cost_measure t
+    SELECT t.*,t1.actualId,t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective,  t1.project_volume,t1.current_project_volume,t1.submit_project_volume,t1.difference,t1.`month`,t1.push_time FROM cb_cost_measure t
     left JOIN (
-        SELECT t.id actualId,t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective,t1.project_volume, t1.current_project_volume,t1.submit_project_volume,t1.`month`,t1.push_time FROM cb_cost_measure t
+        SELECT t1.id actualId,t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective,t1.project_volume, t1.current_project_volume,t1.submit_project_volume,t1.difference,t1.`month`,t1.push_time FROM cb_cost_measure t
         inner JOIN cb_cost_measure_actual t1 ON t1.plan_measure_id=t.id
         WHERE
             t.project_id=#{projectId}

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

@@ -91,7 +91,7 @@
             cqs.combined_price, cqs.combined_price_tax, cqs.brand_name, cqs.bid_source, cqs.remark, cqs.`number`, cqsa.quantities,
             cqsa.quantities_unit, cqsa.conversion_quantities, cqsa.conversion_unit, cqsa.purchase_unit_price, cqsa.create_time,
             cqsa.id actualId, cqsa.ipm_project_code, cqsa.ipm_contract_code, cqsa.ipm_biz_code, cqsa.push_quantities,
-            ifnull(sum(cqsa1.quantities),0) totalQuantities
+            ifnull(sum(cqsa1.quantities),0) totalQuantities,ifnull(sum(cqsa1.push_quantities),0) cumulativeDifference
         from cb_quantity_summary cqs
         left join cb_quantity_summary_actual cqsa on (cqs.id = cqsa.cb_quantity_summary_id and cqsa.record_date = #{recordDate} )
         left join cb_quantity_summary_actual cqsa1 on (cqs.id = cqsa1.cb_quantity_summary_id and cqsa1.record_date <= #{recordDate} )

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

@@ -11,6 +11,22 @@ export const getProjectDetailApi = (projectId) => request({
   params: {}
 });
 
+//项目名称模糊查询
+export function queryProjectNameListProjectName(data) {
+  return request({
+    url: '/cbProjectRecord/queryProjectNameList/projectName',
+    method: 'get',
+    params: data,
+  });
+}
+//校验项目名称是否有相同
+export function checkProjectNameExistProjectName(data) {
+  return request({
+    url: '/cbProjectRecord/checkProjectNameExist/projectName',
+    method: 'get',
+    params: data,
+  });
+}
 //校验项目编码是否存在
 export function checkProjectCodeExist(data) {
   return request({

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

@@ -11,7 +11,7 @@
 
         <!-- 列二次封装 -->
         <template v-for="(item,index) of formColum">
-          <table-list-column v-if="item.use !== false" :key="item.uid" :tableData="tableData" :item="item">
+          <table-list-column v-if="item.use !== false" :key="item.uid" :tableData="tableData" :item="item" :queryParams="queryParams">
             <!-- 根据透传属性创建插槽 -->
             <template v-for="(fn, slotName) in $slots" :slot="slotName">
               <slot :name="slotName"></slot>

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

@@ -13,7 +13,7 @@
         </el-table-column>
         <!-- 列二次封装 -->
         <template v-for="(item,index) of formColum">
-          <table-list-column v-if="item.use !== false" :key="item.uid ? item.uid : index" :tableData="tableData" :item="item">
+          <table-list-column v-if="item.use !== false" :key="item.uid ? item.uid : index" :tableData="tableData" :item="item" :queryParams="queryParams">
             <!-- 根据透传属性创建插槽 -->
             <template v-for="(index, name) in $slots" :slot="name">
               <slot :name="name" />

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -71,7 +71,7 @@
       <skeleton v-if="tableLoading"></skeleton>
       <!-- table 列表 -->
       <table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
-        v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
+        v-else-if="!tableLoading" :maxHeight="false" @handle-current-change="handleCurrentChange">
         <!-- 项目列表 -->
         <template slot="projectName" slot-scope="{data,row}">
           <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName" @click="viewProjectDetail(row)">{{row.projectName}}</div>

dsk-operate-ui/src/views/consultingOrgManagement/enterpriseList.vue

@@ -68,8 +68,8 @@ export default {
   .default-layout-container-inner {
     .cooperation-desk-account-project,
     .cooperation-desk-account-enterprise {
-      overflow: hidden;
-      height: calc(100%);
+      /*overflow: hidden;*/
+      /*height: calc(100%);*/
     }
   }
   .title_wrap{

dsk-operate-ui/src/views/consultingOrgManagement/projectList.vue

@@ -63,8 +63,8 @@ export default {
   .default-layout-container-inner {
     .cooperation-desk-account-project,
     .cooperation-desk-account-enterprise {
-      overflow: hidden;
-      height: calc(100%);
+      /*overflow: hidden;*/
+      /*height: calc(100%);*/
     }
   }
   .title_wrap{

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -100,6 +100,7 @@ export default {
             {
               title: '企业概要', pathName: '', children: [
                 { title: '企业速览', pathName: 'overview' },
+                { title: '资质资格', pathName: 'qualification' },
                 { title: '工商信息', pathName: 'businfo' },
                 { title: '股东信息', pathName: 'holderinfo' },
                 { title: '高管信息', pathName: 'execuinfo' },
@@ -144,7 +145,8 @@ export default {
             //   ]
             // },
             {
-              title: '风险信息', pathName: '', children: [
+              title: '信用行为', pathName: '', children: [
+                { title: '信用中国', pathName: 'credit' },
                 { title: '行政处罚', pathName: 'punish' },
                 { title: '经营异常', pathName: 'businessAnomaly' },
                 { title: '被执行人', pathName: 'ifThePerson' },
@@ -200,6 +202,7 @@ export default {
             {
               title: '企业概要', pathName: '', children: [
                 { title: '企业速览', pathName: 'overview' },
+                { title: '资质资格', pathName: 'qualification' },
                 { title: '工商信息', pathName: 'businfo' },
                 { title: '股东信息', pathName: 'holderinfo' },
                 { title: '高管信息', pathName: 'execuinfo' },
@@ -244,7 +247,8 @@ export default {
             //   ]
             // },
             {
-              title: '风险信息', pathName: '', children: [
+              title: '信用行为', pathName: '', children: [
+                { title: '信用中国', pathName: 'credit' },
                 { title: '行政处罚', pathName: 'punish' },
                 { title: '经营异常', pathName: 'businessAnomaly' },
                 { title: '被执行人', pathName: 'ifThePerson' },

dsk-operate-ui/src/views/detail/party-a/credit/credit.vue

+<template>
+    <div>
+      信用中国
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "credit"
+    }
+</script>
+
+<style scoped>
+
+</style>

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -14,6 +14,7 @@
           <template v-if="isCompany">
             <!-- 企业概览 -->
             <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
+            <Qualification v-if="currentPath.pathName=='qualification'" :company-id="companyId" />
             <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
             <Holderinfo v-if="currentPath.pathName=='holderinfo'" :company-id="companyId" />
             <Execuinfo v-if="currentPath.pathName=='execuinfo'" :company-id="companyId" />
@@ -48,6 +49,7 @@
             <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" :company-id="companyId" />
             <SameRegion v-if="currentPath.pathName=='sameRegion'" :company-id="companyId" :companyInfo="companyInfo" />
             <!-- 风险信息 -->
+            <Credit v-if="currentPath.pathName=='credit'" :company-id="companyId" />
             <Punish v-if="currentPath.pathName=='punish'" :company-id="companyId" />
             <BusinessAnomaly v-if="currentPath.pathName=='businessAnomaly'" :company-id="companyId" />
             <IfThePerson v-if="currentPath.pathName=='ifThePerson'" :company-id="companyId" />
@@ -118,6 +120,7 @@ import elementResizeDetectorMaker from "element-resize-detector";
 import Header from "./component/Header";
 import SideBar from "./component/Sidebar";
 import Overview from "./overview/overview";  //企业概览-企业速览
+import Qualification from "./qualification/qualification";  //企业概览-资质资格
 import Businfo from "./overview/businfo";   //企业概览-工商信息
 import Holderinfo from "./overview/holderinfo";   //企业概览-股东信息
 import Execuinfo from "./overview/execuinfo";   //企业概览-高管信息
@@ -145,6 +148,7 @@ import LandAcquisition from "./urbanLnvestment/landAcquisition"; //投诚分析-
 import RegionalEconomies from "./urbanLnvestment/regionalEconomies"; //投诚分析-区域经济
 import SameRegion from "./urbanLnvestment/sameRegion"; //投诚分析-同地区城投
 import Punish from "./riskInformation/punish"; //风险信息-行政处罚
+import Credit from "./credit/credit"; //风险信息-信用中国
 import BusinessAnomaly from "./riskInformation/businessAnomaly"; //风险信息-经营异常
 import IfThePerson from "./riskInformation/ifThePerson"; //风险信息-被执行人
 import Dishonesty from "./riskInformation/dishonesty"; //风险信息-失信被执行
@@ -189,6 +193,7 @@ export default {
     Header,
     SideBar,
     Overview,
+    Qualification,
     Businfo,
     Holderinfo,
     Execuinfo,
@@ -212,6 +217,7 @@ export default {
     LandAcquisition,
     RegionalEconomies,
     SameRegion,
+    Credit,
     Punish,
     BusinessAnomaly,
     IfThePerson,

dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue

@@ -65,9 +65,9 @@ export default {
         { label: '联系电话', prop: 'projectManagerPhone', width: '102' },
         { label: '资源平台类型', prop: 'projectType2', width: '98' },
         { label: '合同签订日期', prop: 'signDate', width: '149' },
-        { label: '合同总价', prop: 'subcontractValue', width: '79' },
-        { label: '结算总价', prop: 'settleValue', width: '79' },
-        { label: '分包内容', prop: 'jobScope', width: '126' },
+        { label: '合同总价', prop: 'subcontractValue', width: '100' },
+        { label: '结算总价', prop: 'settleValue', width: '100' },
+        { label: '分包内容', prop: 'jobScope', width: '400' },
         { label: '工程类型', prop: 'projectType2', width: '78' },
         { label: '队伍完工评价', prop: '', minWidth: '98' },
         { label: '合同完工评价', prop: '', minWidth: '98' },

dsk-operate-ui/src/views/detail/party-a/qualification/qualification.vue

+<template>
+  <div class="qualification-container">
+    <div class="title_wrap">
+      <div class="enterprise_title">
+        资质资格
+      </div>
+    </div>
+    <div class="label-item">
+      <span class="color">建筑业企业资质 31</span>
+      <span>工程设计资质 31</span>
+    </div>
+    <div class="table-item">
+      <el-table
+        v-if="!isSkeleton"
+        element-loading-text="Loading"
+        :data="tableData"
+        row-key="id"
+        :span-method="objectSpanMethod"
+        default-expand-all
+        border
+        highlight-current-row
+      >
+        <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
+        <el-table-column label="资质编号" width="150" prop="code"></el-table-column>
+        <el-table-column label="资质名称" min-width="200" prop="expenseName"></el-table-column>
+        <el-table-column label="发证日期" width="150" prop="date"></el-table-column>
+        <el-table-column label="有效期" width="150" prop="time"></el-table-column>
+        <el-table-column label="发证机关" min-width="200" prop="fzjg"></el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import skeleton from '../component/skeleton';
+  export default {
+    name: "qualification",
+    components: {
+      skeleton,
+    },
+    data() {
+      return {
+        tableData:[
+          {
+            code:'D123456489',
+            expenseName:'冶金工程施工总承包一级',
+            date:'2020-08-01',
+            time:'2020-08-01',
+            fzjg:'住房和城乡建设部',
+          },
+          {
+            code:'D123456489',
+            expenseName:'冶金工程施工总承包二级',
+            date:'2020-08-01',
+            time:'2020-08-01',
+            fzjg:'住房和城乡建设部',
+          },
+          {
+            code:'D123456489',
+            expenseName:'冶金工程施工总承包san级',
+            date:'2020-08-01',
+            time:'2020-08-01',
+            fzjg:'住房和城乡建设部',
+          },
+          {
+            code:'D323156489',
+            expenseName:'冶金工程施工总承包san级',
+            date:'2020-08-01',
+            time:'2020-08-01',
+            fzjg:'住房和城乡建设部',
+          },
+        ],
+        isSkeleton:false,
+      }
+    },
+    created() {
+
+    },
+    //计算集
+    computed: {
+
+    },
+    //方法集
+    methods: {
+      handleSearch(){
+
+      },
+      flitterData(arr) {
+        let spanOneArr = []
+        let concatOne = 0
+        arr.forEach((item, index) => {
+          if (index === 0) {
+            spanOneArr.push(1)
+          } else {
+            if (item.code === arr[index - 1].code) {
+              spanOneArr[concatOne] += 1
+              spanOneArr.push(0)
+            } else {
+              spanOneArr.push(1)
+              concatOne = index
+            }
+          }
+        })
+        return {
+          one: spanOneArr
+        }
+      },
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          const _row = this.flitterData(this.tableData).one[rowIndex]
+          console.log(_row,"||||||||")
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .qualification-container{
+    .title_wrap{
+      border-bottom: 0;
+    }
+    .label-item{
+      padding: 0 16px;
+      span{
+        display: inline-block;
+        height: 38px;
+        border-radius: 4px;
+        line-height: 38px;
+        border: 1px solid #DCDFE6;
+        color: #232323;
+        font-size: 14px;
+        margin-right: 8px;
+        padding: 0 12px;
+      }
+      .color{
+        background: rgba(0, 129, 255, 0.1);
+        color: #0081FF;
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -231,7 +231,6 @@
         selectList:[],
         selectList1:[],
         sffx:[],
-        gsfx:[],
         queryParams:{
           pageNum:1,
           pageSize:50,
@@ -348,29 +347,15 @@
         }else {
           delete params.condition.riskLevel
         }
-        let sffx = this.sffx
+        let sffx = this.sffx;
         if(sffx.indexOf('不限')>-1){
           sffx = []
         }
-        let gsfx = this.gsfx
-        if(gsfx.indexOf('不限')>-1){
-          gsfx = []
-        }
-        if(sffx.length > 0 && gsfx.length > 0){
-          params.condition.riskType='司法风险,工商风险'
-          params.condition.dimension=this.sffx.concat(this.gsfx)
-        }
-        if(sffx.length > 0 && gsfx.length === 0){
-          params.condition.riskType='司法风险'
-          params.condition.dimension=this.sffx
-        }
-        if(sffx.length === 0 && gsfx.length > 0){
-          params.condition.riskType='工商风险'
-          params.condition.dimension=this.gsfx
-        }
-        if(sffx.length === 0 && gsfx.length === 0){
-          delete params.condition.riskType
-          delete params.condition.dimension
+        if(sffx.length > 0){
+          params.condition.parentDimension=['司法风险']
+          params.condition.dimension=this.sffx;
+        }else {
+          params.condition.parentDimension=['司法风险']
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;
@@ -420,21 +405,6 @@
         this.queryParams.pageSize=10
         this.querySubmit()
       },
-      changeGsfx(val) {
-        if(val == '不限')
-          this.gsfx = ['不限']
-        else if(this.gsfx.indexOf('不限')>-1){
-          this.gsfx.splice(this.gsfx.indexOf('不限'),1)
-        }
-        // if (this.gsfx.indexOf(val.dimensionName) == -1) {
-        //   this.gsfx.push(val.dimensionName)
-        // } else {
-        //   this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
-        // }
-        this.queryParams.pageNum=1
-        this.queryParams.pageSize=10
-        this.querySubmit()
-      },
       checkFxjbBtn(val) {
         this.fxjbType = [];
         this.checkFx = true;
@@ -724,7 +694,7 @@
       .main-right {
         width: calc(100% - 112px);
         .select-popper {
-          text-align: center;
+          /*text-align: center;*/
           display: inline-block;
           position: relative;
           color: #333333;

dsk-operate-ui/src/views/monitoring/MonitoringDynamicsgs.vue

@@ -229,7 +229,6 @@
         ],
         selectList:[],
         selectList1:[],
-        sffx:[],
         gsfx:[],
         queryParams:{
           pageNum:1,
@@ -347,29 +346,15 @@
         }else {
           delete params.condition.riskLevel
         }
-        let sffx = this.sffx
-        if(sffx.indexOf('不限')>-1){
-          sffx = []
-        }
         let gsfx = this.gsfx
         if(gsfx.indexOf('不限')>-1){
           gsfx = []
         }
-        if(sffx.length > 0 && gsfx.length > 0){
-          params.condition.riskType='司法风险,工商风险'
-          params.condition.dimension=this.sffx.concat(this.gsfx)
-        }
-        if(sffx.length > 0 && gsfx.length === 0){
-          params.condition.riskType='司法风险'
-          params.condition.dimension=this.sffx
-        }
-        if(sffx.length === 0 && gsfx.length > 0){
-          params.condition.riskType='工商风险'
-          params.condition.dimension=this.gsfx
-        }
-        if(sffx.length === 0 && gsfx.length === 0){
-          delete params.condition.riskType
-          delete params.condition.dimension
+        if(gsfx.length > 0){
+          params.condition.parentDimension=['工商风险']
+          params.condition.dimension=this.gsfx;
+        }else {
+          params.condition.parentDimension=['工商风险']
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;
@@ -404,21 +389,6 @@
           this.detail=res.data;
         })
       },
-      changeSffx(val) {
-        if(val == '不限')
-          this.sffx = ['不限']
-        else if(this.sffx.indexOf('不限')>-1){
-          this.sffx.splice(this.sffx.indexOf('不限'),1)
-        }
-        // if (this.sffx.indexOf(val.dimensionName) == -1) {
-        //   this.sffx.push(val.dimensionName)
-        // } else {
-        //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
-        // }
-        this.queryParams.pageNum=1
-        this.queryParams.pageSize=10
-        this.querySubmit()
-      },
       changeGsfx(val) {
         if(val == '不限')
           this.gsfx = ['不限']
@@ -723,7 +693,7 @@
       .main-right {
         width: calc(100% - 112px);
         .select-popper {
-          text-align: center;
+          /*text-align: center;*/
           display: inline-block;
           position: relative;
           color: #333333;

dsk-operate-ui/src/views/monitoring/MonitoringReport/daily.vue

@@ -67,7 +67,7 @@
   import { reportPage } from '@/api/monitoring/monitoring'
   import skeleton from '../../component/skeleton'
   export default {
-    name: 'MonitoringReport',
+    name: 'daily',
     components: {
       skeleton
     },
@@ -93,6 +93,7 @@
     },
     created() {
       this.querySubmit()
+      console.log("111111")
     },
     methods: {
       async querySubmit() {
@@ -126,6 +127,20 @@
 
 <style lang="scss" scoped>
   .MonitoringReport{
+    .title_wrap{
+      padding: 20px;
+      background-color: #FFFFFF;
+      border-bottom: 1px solid #e0e0e0;
+    }
+    .enterprise_title{
+      border-left: 2px solid #445781;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+    }
     /*background: #ffffff;*/
     .header{
       justify-content: space-between;

dsk-operate-ui/src/views/monitoring/MonitoringReport/monthlyReport.vue

@@ -67,7 +67,7 @@
   import { reportPage } from '@/api/monitoring/monitoring'
   import skeleton from '../../component/skeleton'
   export default {
-    name: 'MonitoringReport',
+    name: 'monthlyReport',
     components: {
       skeleton
     },
@@ -127,6 +127,22 @@
 <style lang="scss" scoped>
   .MonitoringReport{
     /*background: #ffffff;*/
+
+    .title_wrap{
+      padding: 20px;
+      background-color: #FFFFFF;
+      border-bottom: 1px solid #e0e0e0;
+    }
+    .enterprise_title{
+      border-left: 2px solid #445781;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+    }
+
     .header{
       justify-content: space-between;
       height: 48px;

dsk-operate-ui/src/views/monitoring/MonitoringReport/weekly.vue

@@ -67,7 +67,7 @@
   import { reportPage } from '@/api/monitoring/monitoring'
   import skeleton from '../../component/skeleton'
   export default {
-    name: 'MonitoringReport',
+    name: 'weekly',
     components: {
       skeleton
     },
@@ -127,6 +127,22 @@
 <style lang="scss" scoped>
   .MonitoringReport{
     /*background: #ffffff;*/
+
+    .title_wrap{
+      padding: 20px;
+      background-color: #FFFFFF;
+      border-bottom: 1px solid #e0e0e0;
+    }
+    .enterprise_title{
+      border-left: 2px solid #445781;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+    }
+
     .header{
       justify-content: space-between;
       height: 48px;

dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue

@@ -64,6 +64,17 @@
             </div>
           </div>
         </div>
+        <div class="search-item">
+          <div class="label">经营风险</div>
+          <div class="main-right">
+            <div class="select-popper">
+              <el-checkbox-group v-model="jyfx">
+                <el-checkbox label="不限" @change="changeJyfx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList2" :key="index" :label="i.dimensionName" @change="changeJyfx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+        </div>
         <div class="search-item" style="line-height: 16px;">
           <div class="label">时间筛选</div>
           <div class="checkbox">
@@ -169,6 +180,13 @@
               </template>
             </info-table>
           </template>
+          <template v-if="title=='行政处罚详情'">
+            <info-table class="info-tab" :list="defaultList6" :obj="detail" :labelWidth="labelWidth">
+              <template v-slot:dataSource="row">
+                <span v-for="i in row.data.dataSource">{{i.web}}</span>
+              </template>
+            </info-table>
+          </template>
         </div>
       </el-dialog>
     </div>
@@ -231,8 +249,11 @@
         fxlxType:[],
         selectList:[],
         selectList1:[],
+        selectList2:[],
         sffx:[],
         gsfx:[],
+        jyfx:[],
+        dimension:[],
         queryParams:{
           pageNum:1,
           pageSize:10,
@@ -314,6 +335,19 @@
           { name: '判决日期', prop: 'date'},
           { name: '判决结果', prop: 'judgeresult',style: true},
         ],
+        //行政处罚详情
+        defaultList6:[
+          { name: '企业名称', prop: 'companyName'},
+          { name: '相关人员', prop: 'personName' },
+          { name: '决定文书号', prop: 'fileNum'},
+          { name: '处罚类型', prop: 'punishType'},
+          { name: '处罚开始日期', prop: 'punishBegin'},
+          { name: '处罚结束日期', prop: 'punishEnd'},
+          { name: '处罚机关', prop: 'office',style: true},
+          { name: '处罚内容（原因）', prop: 'punishReason',style: true},
+          { name: '处罚结果', prop: 'punishResult',style: true},
+          { name: '来源', prop: 'dataSource',style: true,slot: true},
+        ],
         title:'开庭公告详情',
         detail:{}
       }
@@ -321,7 +355,6 @@
     created() {
       this.getPlaceholder()
       this.querySubmit()
-      console.log(this.$route.params)
       rulesSelect().then(res => {
         this.selectList=res.data;
         for(let i in res.data){
@@ -331,6 +364,9 @@
           if(res.data[i].dimensionName === '工商风险'){
             this.selectList1=res.data[i].children
           }
+          if(res.data[i].dimensionName === '经营风险'){
+            this.selectList2=res.data[i].children
+          }
         }
       })
     },
@@ -346,6 +382,7 @@
         // } else {
         //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
         // }
+
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
@@ -365,6 +402,16 @@
         this.queryParams.pageSize=10
         this.querySubmit()
       },
+      changeJyfx(val) {
+        if(val == '不限')
+          this.jyfx = ['不限']
+        else if(this.jyfx.indexOf('不限')>-1){
+          this.jyfx.splice(this.jyfx.indexOf('不限'),1)
+        }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
       async querySubmit() {
         let endTime = new Date()
         let params={
@@ -392,22 +439,37 @@
         if(gsfx.indexOf('不限')>-1){
           gsfx = []
         }
-        if(sffx.length > 0 && gsfx.length > 0){
-          params.condition.riskType='司法风险,工商风险'
-          params.condition.dimension=this.sffx.concat(this.gsfx)
-        }
-        if(sffx.length > 0 && gsfx.length === 0){
-          params.condition.riskType='司法风险'
-          params.condition.dimension=this.sffx
+        let jyfx = this.jyfx
+        if(jyfx.indexOf('不限')>-1){
+          jyfx = []
         }
-        if(sffx.length === 0 && gsfx.length > 0){
-          params.condition.riskType='工商风险'
-          params.condition.dimension=this.gsfx
-        }
-        if(sffx.length === 0 && gsfx.length === 0){
-          delete params.condition.riskType
-          delete params.condition.dimension
+
+        let arr=[
+          ...sffx,
+          ...gsfx,
+          ...jyfx,
+        ]
+
+        if(arr.length > 0){
+          params.condition.dimension=arr
         }
+
+        // if(sffx.length > 0 && gsfx.length > 0 && jyfx.length > 0){
+        //   // params.condition.riskType='司法风险,工商风险'
+        //   params.condition.dimension=this.sffx.concat(this.gsfx)
+        // }
+        // if(sffx.length > 0 && gsfx.length === 0){
+        //   // params.condition.riskType='司法风险'
+        //   params.condition.dimension=this.sffx
+        // }
+        // if(sffx.length === 0 && gsfx.length > 0){
+        //   // params.condition.riskType='工商风险'
+        //   params.condition.dimension=this.gsfx
+        // }
+        // if(sffx.length === 0 && gsfx.length === 0){
+        //   // delete params.condition.riskType
+        //   delete params.condition.dimension
+        // }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;
           this.object=res.object;
@@ -477,6 +539,10 @@
             this.title='股权冻结详情'
             this.getDetail(item.dimensionName,item.sourceId)
             break;
+          case '新增行政处罚':
+            this.title='行政处罚详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
           default:
             this.$message.success("暂无详情");
             break;
@@ -671,6 +737,7 @@
       border-radius: 4px;
       .enterprise{
         border-bottom: 1px solid #EEEEEE;
+        margin-bottom: 18px;
         .name{
           img{
             width: 28px;
@@ -711,7 +778,7 @@
       .main-right {
         width: calc(100% - 112px);
         .select-popper {
-          text-align: center;
+          /*text-align: center;*/
           display: inline-block;
           position: relative;
           color: #333333;

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

@@ -33,49 +33,52 @@
               highlight-current-row
             >
               <el-table-column label="序号" width="60" align="left" prop="index" fixed="left"></el-table-column>
-              <el-table-column label="编码" width="130" prop="code"></el-table-column>
-              <el-table-column label="名称" width="230" prop="expenseName"></el-table-column>
-              <el-table-column label="清单" width="110" prop="expenseCategoryTag"></el-table-column>
-              <el-table-column label="项目特征" width="340" prop="projectFeature"></el-table-column>
-              <el-table-column label="单位" width="110" prop="unit"></el-table-column>
+              <el-table-column label="编码" width="130" prop="code" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="名称" width="230" prop="expenseName" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="清单" width="110" prop="expenseCategoryTag" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="项目特征" width="340" prop="projectFeature" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="单位" width="110" prop="unit" :formatter="formatStatus"></el-table-column>
               <el-table-column label="计划成本" align="center">
-                <el-table-column prop="engineeringVolumeExpression" label="工程表达式" width="120"></el-table-column>
-                <el-table-column prop="engineeringVolume" label="工程量" width="120"></el-table-column>
-                <el-table-column prop="cbSubject" label="成本科目" width="130"></el-table-column>
-                <el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120"></el-table-column>
-                <el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120"></el-table-column>
-                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122">
+                <el-table-column prop="engineeringVolumeExpression" label="工程表达式" width="120" :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="engineeringVolume" label="工程量" width="120" :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="cbSubject" label="成本科目" width="130" :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120" :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120" :formatter="formatStatus"></el-table-column>
+                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122" :formatter="formatStatus">
 
                 </el-table-column>
-                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122">
+                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122" :formatter="formatStatus">
                   <template slot-scope="scope">
                     {{$decimalFormat(scope.row.excludeTaxCbSumPrice)}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120">
+                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120" :formatter="formatStatus">
                   <template slot-scope="scope">
                     {{$decimalFormat(scope.row.cbTaxSum)}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120">
+                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120" :formatter="formatStatus">
                   <template slot-scope="scope">
                     {{$decimalFormat(scope.row.includeTaxCbUnitPrice)}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120">
+                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120" :formatter="formatStatus">
                   <template slot-scope="scope">
                     {{$decimalFormat(scope.row.includeTaxCbSumPrice)}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120">
+                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120" :formatter="formatStatus">
                   <template slot-scope="scope">
                     {{$decimalFormat(scope.row.sumPriceDeviation)}}
                   </template>
                 </el-table-column>
               </el-table-column>
-              <el-table-column label="盈亏率" width="100" prop="profitLossRatio"></el-table-column>
-              <el-table-column label="标准费用项" width="100" prop="standardCbItem"></el-table-column>
-              <el-table-column label="备注" width="120" prop="remark"></el-table-column>
+              <el-table-column label="盈亏率" width="100" prop="profitLossRatio" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="标准费用项" width="100" prop="standardCbItem" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="规格型号" width="100" prop="specificationModel" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="计算规则" width="100" prop="calculateRule" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="甲供材料" width="150" prop="supplierMaterial" :formatter="formatStatus"></el-table-column>
+              <el-table-column label="备注" width="120" prop="remark" :formatter="formatStatus"></el-table-column>
               <el-table-column label="操作" min-width="120" fixed="right">
                 <template slot-scope="scope">
                   <span v-if="scope.row.expenseCategoryTag ==='清'" style="color:#0081FF;font-size: 14px;cursor: pointer;" @click="handleDialogVisible(scope.row)">增加费用项</span>
@@ -110,7 +113,16 @@
         <el-form-item label="含税成本单价" prop="includeTaxCbUnitPrice">
           <el-input v-model="ruleForm.includeTaxCbUnitPrice" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入含税成本单价"></el-input>
         </el-form-item>
-        <el-form-item label="特征描述">
+        <el-form-item label="规格型号" prop="specificationModel">
+          <el-input v-model="ruleForm.specificationModel" placeholder="请输入规格型号"></el-input>
+        </el-form-item>
+        <el-form-item label="计算规则">
+          <el-input v-model="ruleForm.calculateRule" placeholder="请输入计算规则"></el-input>
+        </el-form-item>
+        <el-form-item label="甲供材料">
+          <el-input v-model="ruleForm.supplierMaterial" placeholder="请输入甲供材料"></el-input>
+        </el-form-item>
+        <el-form-item label="特征描述" prop="projectFeature">
           <el-input type="textarea" v-model="ruleForm.projectFeature" placeholder="请输入特征描述"></el-input>
         </el-form-item>
       </el-form>
@@ -172,10 +184,11 @@ export default {
         expenseName:{ required: true, message: '项目名称不能为空', trigger: 'blur' }, // 限制必填
         // jsgz:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填
         unit:{ required: true, message: '单位不能为空', trigger: 'blur' }, // 限制必填
-        tenderControlUnitPrice:{ required: true, message: '招标控制价单价', trigger: 'blur' }, // 限制必填
-        excludeTaxCbUnitPrice:{ required: true, message: '不含税成本单价', trigger: 'blur' }, // 限制必填
-        includeTaxCbUnitPrice:{ required: true, message: '含税成本单价', trigger: 'blur' }, // 限制必填
-        // projectFeature:{ required: true, message: '特征描述', trigger: 'blur' }, // 限制必填
+        tenderControlUnitPrice:{ required: true, message: '招标控制价单价不能为空', trigger: 'blur' }, // 限制必填
+        excludeTaxCbUnitPrice:{ required: true, message: '不含税成本单价不能为空', trigger: 'blur' }, // 限制必填
+        includeTaxCbUnitPrice:{ required: true, message: '含税成本单价不能为空', trigger: 'blur' }, // 限制必填
+        specificationModel:{ required: true, message: '规格型号不能为空', trigger: 'blur' }, // 限制必填
+        calculateRule:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填
       },
       dialogVisible:false,
       defaultActive: "",
@@ -276,7 +289,6 @@ export default {
       this.detailsId=row.id;
     },
     handleAdd(){
-
       this.ruleForm.qingId = this.detailsId
       cbDirectExpenseAdd(JSON.stringify(this.ruleForm)).then(res=>{
         if(res.code == 200){
@@ -323,8 +335,10 @@ export default {
     async maxHeightInit() {
       const divHeight = this.$refs.rightTable.clientHeight-32;
       this.maxHeight=divHeight;
-      console.log('DIV的高度是：', divHeight);
-    }
+    },
+    formatStatus: function(row, column, cellValue) {
+      return cellValue? cellValue : '-'
+    },
   },
 }
 </script>

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

@@ -44,8 +44,8 @@
             <custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false" v-if="total > 0 && !tableLoading"
                           :header-cell-class-name="headerCellClassName" :cell-class-name="cellClassName">
               <template slot="action-field-bar" slot-scope="scope">
-                <div class="project-action-field-bar">
-                  <span class="push-project-use" @click="pushProjectUse(scope.row)" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改工程量</span>
+                <div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">
+                  <span class="push-project-use" @click="!rowHasLastPush(scope.rowIndex) ? pushProjectUse(scope.row) :''" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改本月差值</span>
                 </div>
                 <!--<div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">-->
                   <!--<span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"-->
@@ -273,11 +273,11 @@ export default {
       total: 0,
       // 列表表头
       formColum: [
-        { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: false, uid: v4() },
-        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
+        { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: true, uid: v4() },
+        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), fixed: true },
+        { label: '名称', prop: "cbName", width: "232", uid: v4(), fixed: true },
         { label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
         { label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
-        { label: '名称', prop: "cbName", width: "232", uid: v4() },
         { label: '工作内容', prop: "jobContent", width: "341", uid: v4() },
         { label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
         { label: '单位', prop: "unit", width: "57", uid: v4() },
@@ -303,18 +303,19 @@ export default {
             { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
           ]
         },
-        { label: '修改后工程量', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
+        { label: '本月差值', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
+        { label: '累计差值', prop: "cumulativeDifference", width: "110", uid: v4(), slot: true },
         { label: '备注', prop: "remark", width: "115", uid: v4(), slot: true },
-        { label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" },
+        { label: '操作', prop: "action-field-bar", width: "120", uid: v4(), fixed: "right" },
       ],
       // 实体工程材料表头
       entityMaterialsFormColum: [
         { label: '多选', prop: "staticSerialNumber", type: "selection", lock: true, width: "53", fixed: "left", uid: v4() },
         { label: '序号', prop: "staticIndexNumber", type: "index", lock: true, width: "53", fixed: "left", uid: v4() },
-        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
+        { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), fixed: "left" },
+        { label: '名称', prop: "cbName", width: "232", uid: v4(), fixed: "left" },
         { label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
         { label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
-        { label: '名称', prop: "cbName", width: "232", uid: v4() },
         { label: '工作内容', prop: "jobContent", width: "341", uid: v4() },
         { label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
         { label: '单位', prop: "unit", width: "57", uid: v4() },
@@ -340,7 +341,7 @@ export default {
             { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
           ]
         },
-        { label: '操作', prop: "action-field-bar", width: "120", uid: v4(), fixed: "right" },
+        { label: '操作', prop: "action-field-bar", width: "140", uid: v4(), fixed: "right" },
       ],
       // 已记录月份集合
       monthList: [],
@@ -372,9 +373,9 @@ export default {
       lastScrollTop: 0,
       // 推送工程量弹窗
       pushProjectUseDialog: false,
-      //修改工程量弹窗
+      //修改本月差值弹窗
       editDialog: false,
-      // 修改工程量数据缓存
+      // 修改本月差值数据缓存
       pushProjectUseTemp: {
         id: "",
         pushQuantities: "",
@@ -786,7 +787,6 @@ export default {
     },
     // 修改工程用量
     pushProjectUse(row) {
-      console.log(row)
       if (!row.actualId) return;
       // 打开推送推送弹窗
       const _temp = {
@@ -824,9 +824,9 @@ export default {
     async submitEditData(pushForm) {
       try {
         const result = await editEngineeringQuantityApi(pushForm);
-        console.log(result)
         if(result.code === 200){
-          this.editDialog=false
+          this.editDialog=false;
+          this.init(this.comProjectDetailInfo);
         }
       } catch (error) {
 

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

@@ -121,9 +121,12 @@
                 <template v-else>{{scope.row.costEffective || '--'}}</template>
               </template>
             </el-table-column>
-            <!--<el-table-column label="本月推送工程量" width="130" prop="submitProjectVolume">-->
-              <!--<template slot-scope="scope">{{scope.row.submitProjectVolume || '&#45;&#45;'}}</template>-->
-            <!--</el-table-column>-->
+            <el-table-column label="本月差值" width="130" prop="difference">
+              <template slot-scope="scope">{{$decimalFormat(scope.row.difference)}}</template>
+            </el-table-column>
+            <el-table-column label="截止本月差值" width="130" prop="sumDifference">
+              <template slot-scope="scope">{{$decimalFormat(scope.row.sumDifference)}}</template>
+            </el-table-column>
 
             <el-table-column label="备注" width="130" prop="remarks">
               <template slot-scope="scope">{{scope.row.remarks || '--'}}</template>
@@ -217,6 +220,14 @@
   } from '@/api/projectCostLedger'
   import { cloneDeep } from 'lodash-es'
   import DskSkeleton from "@/components/DskSkeleton";
+
+  // 可编辑字段
+  const editPropNames = [
+    "projectVolume",
+    "monthCostRate",
+    "costEffective",
+  ];
+
   export default {
   name: "MeasureItems",
   props: {
@@ -276,6 +287,7 @@
       id: 0,
       expenseDate: '',
       tableData: [],
+      originTableDataList: [],  //源数据列表
       isall: true,//是否汇总
       dialogVisible: false,
       queryParam: {},//推送工程量数据
@@ -389,8 +401,10 @@
           if(item == thismonth){
             hasmonth = true
           }
+          if(item){
             let li = {value:item,label:item.substring(0, 4) + '-' + item.substring(4, 6)}
             arr.push(li)
+          }
         });
         if(!hasmonth){
           let li = {value:thismonth,label:thismonth.substring(0, 4) + '-' + thismonth.substring(4, 6)}
@@ -431,7 +445,8 @@
           // this.tableData = res.data;
         }
         const res = await getCostMeasureslist(param);
-        this.tableData = res.data;
+        this.tableData = cloneDeep(res.data);
+        this.originTableDataList =cloneDeep(res.data);
         this.isinput = false
         // await this.$nextTick()
         this.$nextTick(()=>{
@@ -445,6 +460,16 @@
         this.tableLoading = false;
       }
     },
+    async getListData(menuPath){
+      let param = {
+        projectId: this.projectId,
+        id: this.id,
+        month: this.expenseDate
+      };
+      const res = await getCostMeasureslist(param);
+      this.tableData = cloneDeep(res.data);
+      this.originTableDataList =cloneDeep(res.data);
+    },
     async init(detail = '') {
       try {
         const projectId = detail;
@@ -525,23 +550,62 @@
     addcost() {
       this.cbVisible = true
     },
+    // 差异化比对
+    differentCompare() {
+      const originData = this.originTableDataList;
+      /**
+       * @type {Array<object>}
+       */
+      let data = cloneDeep(this.tableData);
+      // 差异数据
+      const different = this.getDeepDifferentData(data, originData);
+      return cloneDeep(different);
+    },
+      // 深度差异化对比
+    getDeepDifferentData(data = [], originData = [], tempArray = []) {
+        const len = data.length;
+        for (let index = 0; index < len; index++) {
+          const item = data[index];
+          // 源数据
+          const originItem = originData[index];
+          // 查看可编辑字段是否存在任意一处 数据不同
+          const hasDifferent = editPropNames.some(prop => {
+            // 两个皆为无效值 返回false
+            if (!parseFloat(item[prop]) && !parseFloat(originItem[prop])) return false;
+            return item[prop] != originItem[prop];
+          });
+          console.log(hasDifferent,"hasDifferenthasDifferenthasDifferent")
+          // 浅层级
+          if (hasDifferent) {
+            tempArray.push({
+              ...item,
+              id: item.actualId,
+              planMeasureId: item.id,
+              monthCostRate: item.monthCostRate?parseInt(item.monthCostRate.replace('%','')):null,
+              month: this.expenseDate
+            });
+          }
+          // 递归深层级
+          if (item?.children?.length) {
+            this.getDeepDifferentData(item.children, originItem.children, tempArray);
+          }
+        }
+        return tempArray;
+      },
     addinputs(){
-      let tables = JSON.parse(JSON.stringify(this.tableData))
-      tables.forEach(item=>{
-        item.planMeasureId = item.id
-        item.actualId = item.id
-        item.month = this.expenseDate
-        item.monthCostRate = item.monthCostRate?parseInt(item.monthCostRate.replace('%','')):null
-      })
-      saveBatch(JSON.stringify(tables)).then(res=>{
+      let resultData = this.differentCompare();
+      // 有差异
+      if (resultData.length) {
+        saveBatch(resultData).then(res=>{
           if(res.code == 200){
             this.$message.success(res.msg)
             this.isinput = false
-          this.getDatas(this.id)
+            this.getDatas(this.id);
           }else{
             this.$message.error(res.msg)
           }
         })
+      }
     },
     changeDate(){
       let choseDate = this.chooseDate.replace('-','')
@@ -557,6 +621,7 @@
         this.expenseDate = choseDate
         //   arr.unshift(li)
       }
+      this.getListData(this.id);
     },
     inputnum(){
       this.cbVisible = false

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

@@ -134,8 +134,8 @@
               <el-table-column label="操作" min-width="260" :resizable="false" fixed="right">
                 <template slot-scope="scope">
                   <span class="wordprimary tabs" @click="editpro(scope.row)">修改项目信息</span>
-                  <span class="wordprimary tabs" @click="detailpro(scope.row)" v-if="scope.row.cbStage !=3">查看导入进度</span>
-                  <span style="color:#eee;" class="wordprimary tabs" v-if="scope.row.cbStage ===3">查看导入进度</span>
+                  <span class="wordprimary tabs" @click="detailpro(scope.row)" v-if="scope.row.cbStage !=3 || scope.row.cbStage !='3'">查看导入进度</span>
+                  <span style="color:#eee;" class="wordprimary tabs" v-if="scope.row.cbStage ===3 || scope.row.cbStage ==='3'">查看导入进度</span>
                   <span class="worddel tabs" v-if="scope.row.projectFileStatus != 1" @click="deleetpro(scope.row)">删除</span>
                 </template>
               </el-table-column>
@@ -176,14 +176,23 @@
           <span>{{protitle}}</span>
         </div>
         <el-form class="popform" label-width="97px" :model="queryParam" :rules="rules" ref="ruleForm">
-          <el-form-item label="项目名称" class="row" prop="projectName">
-            <el-input type="text" v-model="queryParam.projectName" placeholder="请输入完整的项目名称"></el-input>
-          </el-form-item>
           <el-form-item label="IPM项目编码" class="row">
             <el-input type="text" placeholder="请输入IPM项目编码" v-model="queryParam.ipmProjectNo">
               <template slot="append"><div class="pro-getbtn" @click="getipmProjectNo">获取数据</div></template>
             </el-input>
           </el-form-item>
+          <el-form-item label="项目名称" class="row" prop="projectName">
+            <el-input type="text" v-model="queryParam.projectName" @input="inputProjectName" placeholder="请输入完整的项目名称"></el-input>
+            <div class="projectNameList" v-if="projectNameList.length > 0">
+              <p @click="blurProjectName(item)" v-for="item in projectNameList">
+                <el-tooltip placement="top" v-if="item.projectName.length>26">
+                  <div slot="content"  v-html="item.projectName"></div>
+                  <span v-html="item.projectName"></span>
+                </el-tooltip>
+                <span v-else v-html="item.projectName"></span>
+              </p>
+            </div>
+          </el-form-item>
           <el-form-item label="文件名称" class="row">
             <el-input type="text" placeholder="请输入文件名称" v-model="queryParam.projectFileName"></el-input>
           </el-form-item>
@@ -199,7 +208,8 @@
           <div class="btn btn_primary h32" v-if="isedit && !ischeck" @click="savepro">保存</div>
           <div class="btn btn_primary h32" v-if="!isedit && ischeck  && queryParam.cbStage ==='3'" @click="insertPro1">创建项目</div>
           <div class="btn btn_primary h32" v-if="isedit && ischeck && queryParam.cbStage !=='3'" @click="changepro">下一步，导入数据</div>
-          <div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3'" @click="insertPro" :class="{'btn_disabled':!queryParam.cbStage}" :disabled="!queryParam.cbStage">下一步，导入数据</div>
+          <div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3' && !repeatState" @click="insertPro" :class="{'btn_disabled':!queryParam.cbStage}" :disabled="!queryParam.cbStage">下一步，导入数据</div>
+          <div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3' && repeatState" @click="insertPro" :class="{'btn_disabled':repeatState}" :disabled="repeatState">下一步，导入数据</div>
         </div>
       </el-dialog>
 
@@ -260,6 +270,8 @@
   import {
     addNewStageProject,
     addProject,
+    queryProjectNameListProjectName,
+    checkProjectNameExistProjectName,
     checkProjectCodeExist,
     deleteDraft,
     editProjectInfo,
@@ -316,8 +328,19 @@
         checkAll:false,
         checkds:[],
         allchecks:[],//可以用的项目阶段
+        projectNameList:[],
+        repeatState:false, //当新增项目名称重复的时候下一步按钮状态
       };
     },
+    watch: {
+      dialogVisible: {
+        handler(newValue) {
+          if(!newValue){
+            this.projectNameList=[]
+          }
+        }
+      },
+    },
   //可访问data属性
   created() {
     //成本阶段
@@ -469,17 +492,58 @@
 
       this.getlist()
     },
+    //验证项目名称是否有相同的
+    blurProjectName(item){
+      let pram = {
+        projectName:this.queryParam.projectName
+      }
+      checkProjectNameExistProjectName(pram).then(res=>{
+        if(res.code == 200 && res.data){
+          this.$confirm(res.msg, '提示', {
+            confirmButtonText: '修改项目信息',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.editpro(res.data)
+          }).catch(() => {
+            this.repeatState = true
+          });
+        }else{
+          this.repeatState = false;
+        }
+      })
+      this.queryParam.projectName=item.projectName.replace(/<[^>]+>/g,'');
+      this.projectNameList=[]
+
+    },
+    //模糊查询
+    inputProjectName(){
+      if(!this.queryParam.projectName){
+        this.projectNameList=[]
+        return
+      }
+      let pram = {
+        projectName:this.queryParam.projectName
+      }
+      queryProjectNameListProjectName(pram).then(res=>{
+        if(res.code == 200){
+          this.projectNameList=res.data;
+        }else{
+
+        }
+      })
+    },
     getipmProjectNo(){
       //点击且校验了当前编码有数据才获取
-      console.log(this.queryParam)
       let pram = {
         projectId:this.queryParam.id,
         projectCode:this.queryParam.ipmProjectNo
       }
       checkProjectCodeExist(pram).then(res=>{
-        if(res.code == 200 && res.data == true){
+        if(res.code == 200){
           this.queryParam.isGetProjectDetail = 1
-          this.$message.success(res.msg)
+          this.queryParam.projectName =res.msg;
+          // this.$message.success(res.msg)
         }else{
           this.queryParam.isGetProjectDetail = 0
           this.$message.error(res.msg)
@@ -708,6 +772,34 @@
       .popform {
         padding: 24px 20px 0;
 
+        .projectNameList{
+          width: 342px;
+          height: 176px;
+          border-radius: 4px;
+          background: #ffffff;
+          position: absolute;
+          box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.12);
+          border: 1px solid #E4E7ED;
+          z-index: 9;
+          top:40px;
+          padding-top: 8px;
+          overflow: auto;
+          cursor: pointer;
+          p{
+            height: 32px;
+            line-height: 32px;
+            color:#232323;
+            font-size: 14px;
+            padding-left: 20px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          p:hover{
+            background: #F5F7FA;
+          }
+        }
+
         .row {
           margin-bottom: 16px;
           position: relative;

dsk-operate-ui/vue.config.js

@@ -36,12 +36,12 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://111.204.34.146:9099/prod-api`,//测试
-        target: `http://172.17.0.12:9099//prod-api`,//测试
+        target: `http://172.17.0.12: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.0.9:9098`,//施-无线
+        // target: `http://192.168.60.7:9098`,//施-有线
         // target: `http://192.168.60.90:9098`,//谭
         changeOrigin: true,
         pathRewrite: {