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-operate-ui/src/utils/decimal.js

@@ -11,7 +11,8 @@ export const add = (num1, num2, digit = 9, omit = false) => {
   if (flag) throw new Error("传入参数错误，参数不为number");
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
-  return decimal1.plus(decimal2).toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
+  const result = decimal1.plus(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -20,12 +21,13 @@ export const add = (num1, num2, digit = 9, omit = false) => {
  * @param {*} num2 
  * @returns 
  */
-export const subtract = (num1, num2, digit = 9) => {
+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).toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
+  const result = decimal1.minus(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -34,12 +36,13 @@ export const subtract = (num1, num2, digit = 9) => {
  * @param {*} num2 
  * @returns 
  */
-export const multiply = (num1, num2, digit = 9) => {
+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).toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
+  const result = decimal1.times(decimal2);
+  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
 
 /**
@@ -48,10 +51,11 @@ export const multiply = (num1, num2, digit = 9) => {
  * @param {*} num2 
  * @returns 
  */
-export const divide = (num1, num2, digit = 9) => {
+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).toDecimalPlaces(digit, Decimal.ROUND_UP).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/index.vue

@@ -390,7 +390,7 @@
     //查看进度
     detailpro(row){
       this.uploadData = row
-      this.prodetail = true
+      this.prodetail = false//状态不管是否查看，目前手动设置为可修改
       this.isupload = true
     },
     //删除项目

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

@@ -290,7 +290,6 @@
       this.formdata = JSON.parse(JSON.stringify(this.uploadData))
       this.formdata.cbStage = this.formdata.cbStage.toString()
       this.getDetail()
-      console.log(this.formdata )
     },
     methods:{
       importdata(){