Browse Source

进度汇总值重新调整

laiguoran 4 years ago
parent
commit
98ce1025cd

+ 1 - 1
app/public/js/schedule_plan.js

@@ -60,7 +60,7 @@ $(function () {
             const cols2 = {title: '|计划金额(万元)', colSpan: '|1', rowSpan: '|1', field: sm.yearmonth+'_tp', hAlign: 2, width: 90, type: 'Number', readOnly: readOnly ? readOnly : 'readOnly.tp'};
             monthsCols.push(cols);
             monthsCols.push(cols2);
-            calcCols.push(sm.yearmonth+'_gcl');
+            // calcCols.push(sm.yearmonth+'_gcl');
             calcCols.push(sm.yearmonth+'_tp');
         }
     }

+ 6 - 6
app/public/js/schedule_stage_gcl.js

@@ -51,7 +51,7 @@ $(function () {
         }
     };
     const monthsCols = [];
-    const calcCols = [];
+    const calcCols = ['total_price'];
     if(scheduleMonth.length > 0) {
         for (const sm of scheduleMonth) {
             if (sm.stage_gcl_used === 1) {
@@ -64,9 +64,9 @@ $(function () {
                 monthsCols.push(cols2);
                 monthsCols.push(cols3);
                 monthsCols.push(cols4);
-                calcCols.push(sm.yearmonth + '_plan_gcl');
+                // calcCols.push(sm.yearmonth + '_plan_gcl');
                 calcCols.push(sm.yearmonth + '_plan_tp');
-                calcCols.push(sm.yearmonth + '_sj_gcl');
+                // calcCols.push(sm.yearmonth + '_sj_gcl');
                 calcCols.push(sm.yearmonth + '_sj_tp');
             }
         }
@@ -315,7 +315,7 @@ $(function () {
         level: 'level',
         rootId: -1,
         fullPath: 'full_path',
-        calcFields: ['plan_gcl', 'plan_tp', 'next_plan_gcl', 'next_plan_tp', 'end_plan_gcl', 'end_plan_tp', 'year_plan_gcl', 'year_plan_tp'],
+        calcFields: ['plan_tp', 'next_plan_tp', 'end_plan_tp', 'year_plan_tp', 'total_price'],
     };
 
     const huizong_static_cols = [
@@ -363,8 +363,8 @@ $(function () {
         setSjs: function (order) {
             postData('/tender/' + getTenderId() + '/measure/stage/' + order + '/load', { filter: 'ledger' }, function (data) {
                 postData('/tender/' + getTenderId() + '/schedule/stage/' + order + '/load', {}, function (data2) {
-                    const calcList = ['year_contract_qty', 'year_gather_tp',
-                        'contract_qty', 'end_gather_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp',
+                    const calcList = ['year_gather_tp',
+                        'contract_tp', 'qc_qty', 'qc_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp',
                         'pre_contract_tp', 'pre_qc_tp', 'pre_gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp', 'end_correct_tp'];
                     const showList = ['plan_gcl', 'plan_tp', 'next_plan_gcl', 'next_plan_tp', 'end_plan_gcl', 'end_plan_tp', 'year_plan_gcl', 'year_plan_tp',
                         'year_contract_qty', 'year_gather_tp',

+ 3 - 3
app/public/js/schedule_stage_tp.js

@@ -22,7 +22,7 @@ $(function () {
         level: 'level',
         rootId: -1,
         fullPath: 'full_path',
-        calcFields: ['plan_gcl', 'plan_tp', 'next_plan_gcl', 'next_plan_tp', 'end_plan_gcl', 'end_plan_tp', 'year_plan_gcl', 'year_plan_tp'],
+        calcFields: ['plan_tp', 'next_plan_tp', 'end_plan_tp', 'year_plan_tp', 'total_price'],
     };
     const ledgerTree = createNewPathTree('filter', treeSetting);
 
@@ -71,8 +71,8 @@ $(function () {
 
     if (curScheduleStage && curScheduleStage.order) {
         postData('/tender/' + getTenderId() + '/measure/stage/' + curScheduleStage.order + '/load', { filter: 'ledger' }, function (data) {
-            const calcList = ['year_contract_qty', 'year_gather_tp',
-                'contract_qty', 'end_gather_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp',
+            const calcList = ['year_gather_tp',
+                'contract_tp', 'qc_qty', 'qc_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp',
                 'pre_contract_tp', 'pre_qc_tp', 'pre_gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp', 'end_correct_tp'];
             const showList = ['plan_gcl', 'plan_tp', 'next_plan_gcl', 'next_plan_tp', 'end_plan_gcl', 'end_plan_tp', 'year_plan_gcl', 'year_plan_tp',
                 'year_contract_qty', 'year_gather_tp',