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

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

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

@@ -3,6 +3,7 @@ package com.dsk.cscec.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -83,9 +84,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
 //                cbProjectFileMapper.removeById(cbProjectFile.getId());
 //            } else {
                 try {
-                    if (cbProjectFile.getFileName().equals("成本汇总项目结构汇总")) {
+                    if (FileNameUtil.getPrefix(cbProjectFile.getFileName()).equals("成本汇总项目结构汇总")) {
                         saveCbSummaryProject(projectId, cbProjectFile);
-                    } else if (cbProjectFile.getFileName().equals("成本汇总按成本科目")) {
+                    } else if (FileNameUtil.getPrefix(cbProjectFile.getFileName()).equals("成本汇总按成本科目")) {
                         saveCbSummaryCostAccount(projectId, cbProjectFile);
                     } else {
                         throw new ServiceException("文件名错误");

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

@@ -262,6 +262,17 @@ export const updateFeedSummaryRowsApi = (data) => request({
   data
 });
 
+/**
+ * 推送工程用量
+ * @param {*} data 
+ * @returns 
+ */
+export const pushFeedSummaryRowsApi = (data) => request({
+  url: "/cb/quantity/summary/pushData",
+  method: "put",
+  data
+});
+
 
 
 //工程项目信息

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

@@ -315,10 +315,11 @@ export default {
         .el-table__fixed-right-patch {
           width: 16px !important;
           z-index: 9;
+          top: 0px;
           background: #f0f3fa;
           border: 1px solid #e6eaf1;
           border-left: unset;
-          border-bottom: unset;
+          border-top: unset;
         }
         // 自动适配下 减去滚动条高度
         .el-table__fixed {

dsk-operate-ui/src/utils/decimal.js

@@ -6,12 +6,13 @@ import Decimal from "decimal.js";
  * @param {*} num2 
  * @returns 
  */
-export const add = (num1, num2) => {
+export const add = (num1, num2, digit = 9, omit = false) => {
   const flag = (!parseFloat(num1) && parseFloat(num1) != "0") || (!parseFloat(num2) && parseFloat(num2) != "0");
   if (flag) throw new Error("传入参数错误，参数不为number");
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
-  return decimal1.plus(decimal2).toString();
+  const result = decimal1.plus(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -20,11 +21,13 @@ export const add = (num1, num2) => {
  * @param {*} num2 
  * @returns 
  */
-export const subtract = (num1, num2) => {
+export const subtract = (num1, num2, digit = 9, omit = false) => {
   const flag = (!parseFloat(num1) && parseFloat(num1) != "0") || (!parseFloat(num2) && parseFloat(num2) != "0");
+  if (flag) throw new Error("传入参数错误，参数不为number");
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
-  return decimal1.minus(decimal2).toString();
+  const result = decimal1.minus(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -33,11 +36,13 @@ export const subtract = (num1, num2) => {
  * @param {*} num2 
  * @returns 
  */
-export const multiply = (num1, num2) => {
+export const multiply = (num1, num2, digit = 9, omit = false) => {
   const flag = (!parseFloat(num1) && parseFloat(num1) != "0") || (!parseFloat(num2) && parseFloat(num2) != "0");
+  if (flag) throw new Error("传入参数错误，参数不为number");
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
-  return decimal1.times(decimal2).toString();
+  const result = decimal1.times(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -46,9 +51,11 @@ export const multiply = (num1, num2) => {
  * @param {*} num2 
  * @returns 
  */
-export const divide = (num1, num2) => {
+export const divide = (num1, num2, digit = 9, omit = false) => {
   const flag = (!parseFloat(num1) && parseFloat(num1) != "0") || (!parseFloat(num2) && parseFloat(num2) != "0");
+  if (flag) throw new Error("传入参数错误，参数不为number");
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
-  return decimal1.dividedBy(decimal2).toString();
+  const result = decimal1.dividedBy(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };

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

@@ -142,6 +142,7 @@ export default {
       this.$emit("close", menuPath, menuPathArray);
     },
     menuSelect(menuPath) {
+      if (this.comDefaultActive == menuPath) return;
       const result = this.getCurrentData(menuPath);
       this.$emit("select", menuPath, result);
     },

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

@@ -198,8 +198,6 @@ export default {
         const detail = await getProjectDetailApi(projectId);
         if (detail.code == 200 && detail.data) {
           if (detail.data.id) detail.data["projectId"] = detail.data.id;
-          // detail.data["projectId"] = "1754425038355890177";
-          // detail.data["cbStage"] = 0;
           this.detailInfo = detail.data;
         }
       } catch (error) {