|
|
@@ -42,8 +42,8 @@ var blockLibObj = {
|
|
|
{headerName: "项目编码", headerWidth: 90, dataCode: "code", dataType: "String", hAlign: "center"},
|
|
|
{headerName: "项目名称", headerWidth: 100, dataCode: "name", dataType: "String"},
|
|
|
{headerName: "单位", headerWidth: 40, dataCode: "unit", dataType: "String", hAlign: "center"},
|
|
|
- {headerName: "综合单价", headerWidth: 60, dataCode: "quantity", dataType: "Number"},
|
|
|
- {headerName: "项目特征", headerWidth: 120, dataCode: "itemCharacterText", dataType: "String"}
|
|
|
+ {headerName: "综合单价", headerWidth: 70, dataCode: "", dataType: "Number"},
|
|
|
+ {headerName: "项目特征", headerWidth: 160, dataCode: "itemCharacterText", dataType: "String"}
|
|
|
],
|
|
|
view: {
|
|
|
lockColumns: [0, 1, 2, 3, 4]
|
|
|
@@ -57,8 +57,8 @@ var blockLibObj = {
|
|
|
{headerName: "名称", headerWidth: 100, dataCode: "name", dataType: "String"},
|
|
|
{headerName: "单位", headerWidth: 40, dataCode: "unit", dataType: "String", hAlign: "center"},
|
|
|
{headerName: "含量", headerWidth: 40, dataCode: "contain", dataType: "Number"},
|
|
|
- {headerName: "取费专业", headerWidth: 60, dataCode: "programID", dataType: "Number"},
|
|
|
- {headerName: "综合单价", headerWidth: 60, dataCode: "quantity", dataType: "Number"},
|
|
|
+ {headerName: "取费专业", headerWidth: 70, dataCode: "", dataType: "String", hAlign: "center"},
|
|
|
+ {headerName: "综合单价", headerWidth: 70, dataCode: "", dataType: "Number"},
|
|
|
{headerName: "子目换算状态", headerWidth: 90, dataCode: "adjustState", dataType: "String"}
|
|
|
],
|
|
|
view: {
|
|
|
@@ -146,9 +146,11 @@ var blockLibObj = {
|
|
|
rationDatas.push(r.data);
|
|
|
};
|
|
|
sheetCommonObj.showData(me.billSheet, me.billSetting, [sourceNode.data]);
|
|
|
+ me.changeBillText(sourceNode.data);
|
|
|
let rCount = (rationDatas.length > 0) ? rationDatas.length : 1;
|
|
|
me.rationSheet.setRowCount(rCount, GC.Spread.Sheets.SheetArea.viewport);
|
|
|
sheetCommonObj.showData(me.rationSheet, me.rationSetting, rationDatas);
|
|
|
+ me.changeRationText(rationDatas);
|
|
|
}
|
|
|
else{
|
|
|
sheetCommonObj.cleanSheet(me.billSheet, me.billSetting, 1);
|
|
|
@@ -415,6 +417,28 @@ var blockLibObj = {
|
|
|
this.billSpread.refresh();
|
|
|
if (this.rationSpread)
|
|
|
this.rationSpread.refresh();
|
|
|
+ },
|
|
|
+ changeRationText: function (rationDatas) {
|
|
|
+ let sheet = this.rationSheet;
|
|
|
+ sheet.suspendPaint();
|
|
|
+ sheet.suspendEvent();
|
|
|
+ for (let i = 0; i < rationDatas.length; i++) {
|
|
|
+ let pID = rationDatas[i].programID;
|
|
|
+ if (pID) sheet.setValue(i, 4, projectObj.project.calcProgram.compiledTemplateMaps[pID]);
|
|
|
+ if (rationDatas[i].feesIndex && rationDatas[i].feesIndex.common)
|
|
|
+ sheet.setValue(i, 5, rationDatas[i].feesIndex.common.unitFee);
|
|
|
+ }
|
|
|
+ sheet.resumeEvent();
|
|
|
+ sheet.resumePaint();
|
|
|
+ },
|
|
|
+ changeBillText: function (billData){
|
|
|
+ let sheet = this.billSheet;
|
|
|
+ sheet.suspendPaint();
|
|
|
+ sheet.suspendEvent();
|
|
|
+ if (billData.feesIndex && billData.feesIndex.common)
|
|
|
+ sheet.setValue(0, 3, billData.feesIndex.common.unitFee);
|
|
|
+ sheet.resumeEvent();
|
|
|
+ sheet.resumePaint();
|
|
|
}
|
|
|
};
|
|
|
|
