|
|
@@ -229,8 +229,8 @@ $(document).ready(() => {
|
|
|
{title: '清单工料含量|编号', colSpan: '5|1', rowSpan: '1|1', field: 'code', hAlign: 0, width: 80, formatter: '@', readOnly: true},
|
|
|
{title: '|名称', colSpan: '|1', rowSpan: '|1', field: 'name', hAlign: 0, width: 100, formatter: '@', readOnly: true},
|
|
|
{title: '|单位', colSpan: '|1', rowSpan: '|1', field: 'unit', hAlign: 1, width: 60, formatter: '@', readOnly: true},
|
|
|
- {title: '|计算式', colSpan: '|1', rowSpan: '|1', field: 'expr', hAlign: 2, width: 120, formatter: '@', readOnly: 'readOnly.isEdit'},
|
|
|
{title: '|数量 �', colSpan: '1', rowSpan: '|1', field: 'quantity', hAlign: 2, width: 80, type: 'Number', readOnly: 'readOnly.isEdit'},
|
|
|
+ {title: '|计算式', colSpan: '|1', rowSpan: '|1', field: 'expr', hAlign: 2, width: 120, formatter: '@', readOnly: 'readOnly.isEdit'},
|
|
|
],
|
|
|
emptyRows: 0,
|
|
|
headRows: 2,
|
|
|
@@ -283,7 +283,7 @@ $(document).ready(() => {
|
|
|
loadMaterialData(0, 0);
|
|
|
const sheet = materialSpread.getActiveSheet();
|
|
|
sheet.suspendPaint();
|
|
|
- sheet.setCellType(1, 4, new TipCellType(), spreadNS.SheetArea.colHeader);
|
|
|
+ sheet.setCellType(1, 3, new TipCellType(), spreadNS.SheetArea.colHeader);
|
|
|
sheet.resumePaint();
|
|
|
// 不参与调差数据值变灰
|
|
|
function checkNotJoinMaterialData() {
|
