Просмотр исходного кода

1. 列显示,调整
2. 台账数量,显示相关

MaiXinRong 5 месяцев назад
Родитель
Сommit
13d450f1b8
1 измененных файлов с 4 добавлено и 5 удалено
  1. 4 5
      app/const/spread.js

+ 4 - 5
app/const/spread.js

@@ -124,7 +124,7 @@ const BaseSetCol = {
         { key: 'unit_price', name: '单价', fixed: ['alias'], bills: 1, pos: 0 },
         { key: 'dgn_qty', name: '项目节数量', fixed: [], bills: 1, pos: 0, },
         { key: 'dgn_price', name: '经济指标', fixed: ['alias'], bills: 1, pos: 0},
-        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 1, },
+        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 0, },
         { key: 'tz_calc', name: '台账', fixed: ['alias'], bills: 1, pos: 1, },
         { key: 'drawing_code', name: '图册号', fixed: ['alias'], bills: 1, pos: 1 },
         { key: 'node_type', name: '费用类别', fixed: ['alias'], bills: 1, pos: 0 },
@@ -155,7 +155,6 @@ const BaseSetCol = {
         { key: 'memo', name: '备注', fixed: [], bills: 1, pos: 0 },
         { key: 'ex_memo2', name: '备注2', fixed: [], bills: 1, pos: 1, },
         { key: 'ex_memo3', name: '备注3', fixed: [], bills: 1, pos: 1, },
-        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 1, pos: 1, },
         { key: 'is_tp', name: '总额计量', fixed: [], bills: 1, pos: 0 },
         { key: 'gxby', name: '工序报验', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
         { key: 'dagl', name: '档案管理', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
@@ -171,7 +170,7 @@ const BaseSetCol = {
         { key: 'unit_price', name: '单价', fixed: ['alias'], bills: 1, pos: 0 },
         { key: 'dgn_qty', name: '项目节数量', fixed: [], bills: 1, pos: 0, },
         { key: 'dgn_price', name: '经济指标', fixed: ['alias'], bills: 1, pos: 0},
-        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 1, },
+        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 0, },
         { key: 'tz_calc', name: '台账', fixed: ['alias'], bills: 1, pos: 1, },
         { key: 'drawing_code', name: '图册号', fixed: ['alias'], bills: 1, pos: 1 },
         { key: 'node_type', name: '费用类别', fixed: ['alias'], bills: 1, pos: 0 },
@@ -202,7 +201,7 @@ const BaseSetCol = {
         { key: 'memo', name: '备注', fixed: [], bills: 1, pos: 0 },
         { key: 'ex_memo2', name: '备注2', fixed: [], bills: 1, pos: 1, },
         { key: 'ex_memo3', name: '备注3', fixed: [], bills: 1, pos: 1, },
-        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 1, pos: 1, },
+        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 0, pos: 1, },
         { key: 'is_tp', name: '总额计量', fixed: [], bills: 1, pos: 0 },
         { key: 'gxby', name: '工序报验', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
         { key: 'dagl', name: '档案管理', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
@@ -752,7 +751,7 @@ const BaseSpreadColSetting = {
             position: [{title: '位置', colSpan: '1', rowSpan: '2', field: 'position', hAlign: 0, width: 60, formatter: '@'}],
             real_qty: [{title: '现场实际数量', colSpan: '1', rowSpan: '2', field: 'real_qty', hAlign: 2, width: 60, type: 'Number'}],
             estimate_qty: [{title: '预计变更数量', colSpan: '1', rowSpan: '2', field: 'estimate_qty', hAlign: 2, width: 60, type: 'Number', readOnly: true}],
-            tz_calc: [{title: '台账数量', colSpan: '1', rowSpan: '2', field: 'sgfh_qty', hAlign: 2, width: 60, formatter: '@', type: 'Number', aliasFormat: '{%s}数量'}],
+            tz_calc: [{title: '台账数量', colSpan: '1', rowSpan: '2', field: 'sgfh_qty', hAlign: 2, width: 60, type: 'Number', aliasFormat: '{%s}数量'}],
             cur_calc: [
                 {title: '本期计量|合同', colSpan: '4|1', rowSpan: '1|1', field: 'contract_qty', hAlign: 2, width: 60, type: 'Number'},
                 {title: '|数量变更', colSpan: '|1', rowSpan: '|1', field: 'qc_qty', hAlign: 2, width: 80, type: 'Number'},