Browse Source

feat: 项目管理-全部、分享界面,去掉“分部分项合计”、“措施项目合计”、“其他项目合计”、“规费”、“税金”。

vian 4 năm trước cách đây
mục cha
commit
d7426aaefa

+ 4 - 4
modules/pm/facade/pm_facade.js

@@ -1307,7 +1307,7 @@ const defaultSummaryField = {
             { name: 'estimate', feeName: 'estimate' }
         ]
     },
-    [fixedFlag.SUB_ENGINERRING]: {
+    /* [fixedFlag.SUB_ENGINERRING]: {
         items: [{ name: 'subEngineering', feeName: 'common' }]
     },
     [fixedFlag.MEASURE]: {
@@ -1324,7 +1324,7 @@ const defaultSummaryField = {
     },
     [fixedFlag.TAX]: {
         items: [{ name: 'tax', feeName: 'common' }]
-    }
+    } */
 };
 
 // 项目管理界面需要显示的汇总字段
@@ -1332,12 +1332,12 @@ function setupSummaryFields(summaryInfo, projects, fields = null) {
     if (!fields) {
         fields = [
             'engineeringCost',
-            'subEngineering',
+            /* 'subEngineering',
             'measure',
             'safetyConstruction',
             'other',
             'charge',
-            'tax',
+            'tax', */
             'rate',
             'buildingArea',
             'perCost'

+ 4 - 4
web/building_saas/pm/js/pm_newMain.js

@@ -112,12 +112,12 @@ const projTreeObj = {
             {name: '单价文件', dataCode: 'unitPriceFile', width: 140, vAlign: 'center', hAlign: 'left'},
             {name: '费率文件', dataCode: 'feeRateFile', width: 140, vAlign: 'center', hAlign: 'left'},
             {name: '创建日期', dataCode: 'createDateTime', width: 100, vAlign: 'center', hAlign: 'center'},
-            {name: '分部分项合计', dataCode: 'subEngineering', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+            /* {name: '分部分项合计', dataCode: 'subEngineering', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
             {name: '措施项目合计', dataCode: 'measure', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
-            {name: '其他项目合计', dataCode: 'other', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+            {name: '其他项目合计', dataCode: 'other', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'}, */
             //{name: '安全文明施工费', dataCode: 'safetyConstruction', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
-            {name: '规费', dataCode: 'charge', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
-            {name: '税金', dataCode: 'tax', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+            /* {name: '规费', dataCode: 'charge', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+            {name: '税金', dataCode: 'tax', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'}, */
             {name: '占造价比例(%)', dataCode: 'rate', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
             {name: '建筑面积', dataCode: 'buildingArea', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
             {name: '单方造价', dataCode: 'perCost', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'}

+ 2 - 2
web/building_saas/pm/js/pm_share.js

@@ -35,11 +35,11 @@ const pmShare = (function () {
         {name: '来自', dataCode: 'from', width: 80, rateWidth: 0.15, vAlign: 'center', hAlign: 'left'},
         {name: '分享时间', dataCode: 'shareDate', width: 140, rateWidth: 0.15, vAlign: 'center', hAlign: 'left'},
         {name: '工程造价', dataCode: 'engineeringCost', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
-        {name: '分部分项合计', dataCode: 'subEngineering', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+        /* {name: '分部分项合计', dataCode: 'subEngineering', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
         {name: '措施项目合计', dataCode: 'measure', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
         {name: '其他项目合计', dataCode: 'other', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
         {name: '规费', dataCode: 'charge', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
-        {name: '税金', dataCode: 'tax', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
+        {name: '税金', dataCode: 'tax', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'}, */
         {name: '占造价比例(%)', dataCode: 'rate', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
         {name: '建筑面积', dataCode: 'buildingArea', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},
         {name: '单方造价', dataCode: 'perCost', width: 100, vAlign: 'center', hAlign: 'right', formatter: '0.00'},