Browse Source

项目预算模块金额单位转换为万元

ljb 6 months ago
parent
commit
aca836b719

+ 1 - 1
src/option/projectManage/designCost.js

@@ -37,7 +37,7 @@ export default {
       span: 24,
       align: 'center',
       min: 0,
-      precision: 2,
+      precision: 5,
       showOverflowTooltip: true,
       rules: [{
         required: true,

+ 1 - 1
src/option/projectManage/otherCost.js

@@ -38,7 +38,7 @@ export default {
       align: 'center',
       showOverflowTooltip: true,
       min: 0,
-      precision: 2,
+      precision: 5,
       rules: [{
         required: true,
         message: '请输入预算金额',

+ 1 - 1
src/option/projectManage/outsourcingCost.js

@@ -50,7 +50,7 @@ export default {
       span: 24,
       align: 'center',
       min: 0,
-      precision: 2,
+      precision: 5,
       showOverflowTooltip: true,
       rules: [{
         required: true,

+ 4 - 4
src/option/projectManage/personCost.js

@@ -34,7 +34,7 @@ export default {
       label: '姓名',
       prop: 'name',
       span: 24,
-      width: 160,
+      width: 120,
       align: 'center',
       display: false,
       showOverflowTooltip: true,
@@ -80,9 +80,9 @@ export default {
       prop: 'pjrgfy',
       type: 'number',
       min: 0,
-      precision: 2,
+      precision: 5,
       span: 24,
-      minWidth: 90,
+      minWidth: 120,
       align: 'center',
       showOverflowTooltip: true,
       rules: [{
@@ -97,7 +97,7 @@ export default {
       type: 'number',
       min: 0,
       span: 24,
-      minWidth: 80,
+      minWidth: 120,
       align: 'center',
       display: false,
       showOverflowTooltip: true,

+ 1 - 1
src/option/projectManage/zbCost.js

@@ -37,7 +37,7 @@ export default {
       span: 24,
       align: 'center',
       min: 0,
-      precision: 2,
+      precision: 5,
       showOverflowTooltip: true,
       rules: [{
         required: true,

+ 3 - 3
src/option/projectManage/zjfyycqdtfyCost.js

@@ -49,7 +49,7 @@ export default {
       label: '月折旧额(万元)',
       prop: 'yzje',
       type: 'number',
-      width: 90,
+      width: 110,
       span: 24,
       align: 'center',
       showOverflowTooltip: true,
@@ -59,7 +59,7 @@ export default {
       label: '预算合计(万元)',
       prop: 'yshj',
       type: 'number',
-      width: 90,
+      width: 110,
       span: 24,
       align: 'center',
       showOverflowTooltip: true,
@@ -86,7 +86,7 @@ export default {
       span: 24,
       align: 'center',
       min: 0,
-      precision: 2,
+      precision: 5,
       showOverflowTooltip: true,
       // rules: [{
       //   required: true,

+ 6 - 6
src/option/projectManage/zztlCost.js

@@ -45,7 +45,7 @@ export default {
       prop: 'danJia',
       type: 'number',
       min: 0,
-      precision: 2,
+      precision: 5,
       width: 100,
       span: 24,
       align: 'center',
@@ -56,8 +56,8 @@ export default {
       prop: 'wzysje',
       type: 'number',
       min: 0,
-      precision: 2,
-      width: 90,
+      precision: 5,
+      width: 120,
       span: 24,
       align: 'center',
       showOverflowTooltip: true,
@@ -76,7 +76,7 @@ export default {
       prop: 'ysje',
       type: 'number',
       min: 0,
-      precision: 2,
+      precision: 5,
       minWidth: 140,
       span: 24,
       align: 'center',
@@ -95,9 +95,9 @@ export default {
       prop: 'zlfyys',
       type: 'number',
       min: 0,
-      minWidth: 100,
+      minWidth: 130,
       span: 24,
-      precision: 2,
+      precision: 5,
       align: 'center',
       showOverflowTooltip: true,
     },

+ 25 - 4
src/views/project-manage/components/all-budget-table.vue

@@ -43,7 +43,7 @@
                 </el-table-column>
                 <el-table-column
                   prop="sales"
-                  label="科目金额(元)"
+                  label="科目金额(元)"
                   width="120"
                   align="center"
                 >
@@ -144,7 +144,28 @@ export default {
         this.loading = false;
         if (data.success) {
           const { ryrgfy, zjtrfy, zjfyycqdtfy, wxzctxfy, sjfy, zbtsysyfy, wtwbyjkffy, qtfy } = data.data;
-          let _total = (new Decimal(ryrgfy).add(zjtrfy).add(zjfyycqdtfy).add(wxzctxfy).add(sjfy).add(zbtsysyfy).add(wtwbyjkffy).add(qtfy)).toFixed(2);
+          const newData = {
+            ryrgfy: new Decimal(ryrgfy === -1 ? 0 : ryrgfy).div(new Decimal(10000)).toFixed(5),
+            zjtrfy: new Decimal(zjtrfy === -1 ? 0 : zjtrfy).div(new Decimal(10000)).toFixed(5),
+            zjfyycqdtfy: new Decimal(zjfyycqdtfy === -1 ? 0 : zjfyycqdtfy).div(new Decimal(10000)).toFixed(5),
+            wxzctxfy: new Decimal(wxzctxfy === -1 ? 0 : wxzctxfy).div(new Decimal(10000)).toFixed(5),
+            sjfy: new Decimal(sjfy === -1 ? 0 : sjfy).div(new Decimal(10000)).toFixed(5),
+            zbtsysyfy: new Decimal(zbtsysyfy === -1 ? 0 : zbtsysyfy).div(new Decimal(10000)).toFixed(5),
+            wtwbyjkffy: new Decimal(wtwbyjkffy === -1 ? 0 : wtwbyjkffy).div(new Decimal(10000)).toFixed(5),
+            qtfy: new Decimal(qtfy === -1 ? 0 : qtfy).div(new Decimal(10000)).toFixed(5),
+          };
+
+          console.log(newData)
+          let _total = new Decimal(newData.ryrgfy)
+            .add(newData.zjtrfy)
+            .add(newData.zjfyycqdtfy)
+            .add(newData.wxzctxfy)
+            .add(newData.sjfy)
+            .add(newData.zbtsysyfy)
+            .add(newData.wtwbyjkffy)
+            .add(newData.qtfy);
+            console.log(_total)
+          
           this.tableData = this.tableData.map((item, index) => {
             let readKey = '';
             if (index == 0) {
@@ -165,11 +186,11 @@ export default {
               readKey = 'qtfy';
             }
 
-            item.sales = (data.data[readKey] === -1 ? 0 : data.data[readKey]).toFixed(0);
+            item.sales = newData[readKey];
 
             let ratio = 0;
             if (Number(_total) > 0) {
-              ratio = (new Decimal(item.sales).div(new Decimal(_total)) * 100).toFixed(2);
+              ratio = (new Decimal(item.sales).div(new Decimal(_total)) * 100).toFixed(5);
             }
             item.ratio = ratio;
 

+ 2 - 1
src/views/project-manage/components/design-cost.vue

@@ -62,6 +62,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
+import Decimal from "decimal.js";
 
 
 export default window.$crudCommon({
@@ -160,7 +161,7 @@ export default window.$crudCommon({
   name: 'projectManage/designCost',
   res: ({ data }) => {
     data.records = data.records.map(item => {
-      item.ysje = (item.ysje || 0).toFixed(2);
+      item.ysje = new Decimal(item.ysje || 0).div(new Decimal(10000)).toFixed(5);
       return item;
     });
     return data;

+ 2 - 1
src/views/project-manage/components/other-cost.vue

@@ -64,6 +64,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
+import Decimal from "decimal.js";
 
 
 export default window.$crudCommon({
@@ -162,7 +163,7 @@ export default window.$crudCommon({
   name: 'projectManage/otherCost',
   res: ({ data }) => {
     data.records = data.records.map(item => {
-      item.ysje = (item.ysje || 0).toFixed(2);
+      item.ysje = new Decimal(item.ysje || 0).div(new Decimal(10000)).toFixed(5);
       return item;
     })
     return data;

+ 2 - 1
src/views/project-manage/components/outsourcing-cost.vue

@@ -64,6 +64,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
+import Decimal from "decimal.js";
 
 
 export default window.$crudCommon({
@@ -162,7 +163,7 @@ export default window.$crudCommon({
   name: 'projectManage/outsourcingCost',
   res: ({ data }) => {
     data.records = data.records.map(item => {
-      item.wwfy = (item.wwfy || 0).toFixed(2);
+      item.wwfy = new Decimal(item.wwfy || 0).div(new Decimal(10000)).toFixed(5);
 
       return item;
     })

+ 4 - 3
src/views/project-manage/components/person-cost.vue

@@ -173,14 +173,15 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       let zzsc = new Decimal(item.zzsc || 0);
-      let pjrgfy = new Decimal(item.pjrgfy || 0);
+      let pjrgfy = new Decimal(item.pjrgfy || 0).div(new Decimal(10000));
 
+      item.pjrgfy = pjrgfy;
       item.technicianId = item.technicianId.toString();
       item.name = item.technician.name;
       item.number = item.technician.number;
       item.idCard = item.technician.idCard;
-      item.pjrgfy = (item.pjrgfy || 0).toFixed(2);
-      item.total = zzsc.mul(pjrgfy).toFixed(2);
+      item.pjrgfy = (item.pjrgfy || 0).toFixed(5);
+      item.total = zzsc.mul(pjrgfy).toFixed(5);
       item.isWp = item.nature === '在职' ? '是' : '否';
       return item;
     });

+ 3 - 3
src/views/project-manage/components/wxzctx-cost.vue

@@ -218,11 +218,11 @@ export default window.$crudCommon({
     data.records = data.records.map(item => {
       item.zcmc = item.zcEntity ? item.zcEntity.zcmc : '';
       // item.zcbm = item.zcEntity ? item.zcEntity.zcbm : '';
-      item.ytxe = Number(item.zcEntity ? item.zcEntity.yzje : 0).toFixed(2);
+      item.zcbm = item.assetId;
+      item.ytxe = new Decimal((item.zcEntity ? item.zcEntity.yzje : 0)).div(10000).toFixed(5);
 
       let zzscD = new Decimal(item.zzsc || 0); // 工作时长
-      let yzjeD = new Decimal(item.ytxe || 0); // 摊销额
-      item.yshj = zzscD.mul(yzjeD).toFixed(2);
+      item.yshj = zzscD.mul(item.ytxe).toFixed(5);
       return item;
     });
     return data;

+ 2 - 1
src/views/project-manage/components/zb-cost.vue

@@ -64,6 +64,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
+import Decimal from "decimal.js";
 
 
 export default window.$crudCommon({
@@ -162,7 +163,7 @@ export default window.$crudCommon({
   name: 'projectManage/zbCost',
   res: ({ data }) => {
     data.records = data.records.map(item => {
-      item.ysje = (item.ysje || 0).toFixed(2);
+      item.ysje = new Decimal(item.ysje || 0).div(new Decimal(10000)).toFixed(5);
       return item;
     });
     return data;

+ 3 - 4
src/views/project-manage/components/zjfyycqdtfy-cost.vue

@@ -215,12 +215,11 @@ export default window.$crudCommon({
   name: 'projectManage/zjfyycqdtfyCost',
   res: ({ data }) => {
     data.records = data.records.map(item => {
-      item.yzje = Number((item.yzje || 0)).toFixed(2);
-      item.cqdtfyysje = Number((item.cqdtfyysje || 0)).toFixed(2);
+      item.yzje = new Decimal(item.yzje || 0).div(10000).toFixed(5);
+      item.cqdtfyysje = new Decimal((item.cqdtfyysje || 0)).div(10000).toFixed(5);
 
       let zzscD = new Decimal(item.zzsc || 0); // 工作时长
-      let yzjeD = new Decimal(item.yzje || 0);
-      item.yshj = zzscD.mul(yzjeD).toFixed(2);
+      item.yshj = zzscD.mul(item.yzje).toFixed(5);
       return item;
     });
     return data;

+ 4 - 5
src/views/project-manage/components/zztl-cost.vue

@@ -161,15 +161,14 @@ export default window.$crudCommon({
   // 模块路径
   name: 'projectManage/zztlCost',
   res: ({ data }) => {
-
     data.records = data.records.map(item => {
       item.yongLiang = item.yongLiang === -1 ? '' : (item.yongLiang).toFixed(2);
-      item.danJia = item.danJia === -1 ? '' : (item.danJia).toFixed(2);
-      item.ysje = item.ysje === -1 ? '' : (item.ysje).toFixed(2);
-      item.zlfyys = item.zlfyys === -1 ? '' : (item.zlfyys).toFixed(2);
+      item.danJia = item.danJia === -1 ? '' : (new Decimal(item.danJia).div(new Decimal(10000))).toFixed(5);
+      item.ysje = item.ysje === -1 ? '' : (new Decimal(item.ysje).div(new Decimal(10000))).toFixed(5);
+      item.zlfyys = item.zlfyys === -1 ? '' : (new Decimal(item.zlfyys).div(new Decimal(10000))).toFixed(5);
 
       if (item.yongLiang && item.danJia) {
-        item.wzysje = new Decimal(item.yongLiang).mul(item.danJia);
+        item.wzysje = new Decimal(item.yongLiang).mul(item.danJia).toFixed(5);
       }
 
       return item;

+ 3 - 3
src/views/yf-cost-manage/basic-data-setting/atten-info.vue

@@ -266,12 +266,12 @@ export default window.$crudCommon({
       let dailyAttendances = [];
       Object.keys(this.form).forEach(key => {
         if (key.indexOf(this.params.yearAndMonth) > -1) {
-          if (this.form[key]) {
+          // if (this.form[key]) {
             dailyAttendances.push({
               workDate: key,
-              workHours: this.form[key]
+              workHours: this.form[key] || 0
             });
-          }
+          // }
           delete newFormData[key];
         }
       });