|
@@ -55,7 +55,7 @@ let repositoryGljObj = {
|
|
{headerName:"名称",headerWidth:160,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
|
|
{headerName:"名称",headerWidth:160,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
|
|
{headerName:"规格型号",headerWidth:120,dataCode:"specs", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
|
|
{headerName:"规格型号",headerWidth:120,dataCode:"specs", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
|
|
{headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
|
|
{headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
|
|
- {headerName:"基价单价",headerWidth:80,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
|
|
|
|
|
|
+ {headerName:"定额价",headerWidth:80,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
|
|
{headerName:"类型",headerWidth:90,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
|
|
{headerName:"类型",headerWidth:90,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
|
|
{headerName:"调整系数",headerWidth:60,dataCode:"adjCoe", dataType: "Number", hAlign: "center", vAlign: "center"},
|
|
{headerName:"调整系数",headerWidth:60,dataCode:"adjCoe", dataType: "Number", hAlign: "center", vAlign: "center"},
|
|
],
|
|
],
|
|
@@ -194,21 +194,10 @@ let repositoryGljObj = {
|
|
showGljItems: function(data, type) {
|
|
showGljItems: function(data, type) {
|
|
let me = repositoryGljObj;
|
|
let me = repositoryGljObj;
|
|
if (me.workBook) {
|
|
if (me.workBook) {
|
|
- //let cacheSection = [];
|
|
|
|
let cacheSection = data;
|
|
let cacheSection = data;
|
|
- /*let pArr = me.parentNodeIds["_pNodeId_" + type];
|
|
|
|
- console.log(pArr);
|
|
|
|
- for (let i = 0; i < data.length; i++) {
|
|
|
|
- if (pArr && pArr.indexOf(data[i].gljClass) >= 0) {
|
|
|
|
- cacheSection.push(data[i]);
|
|
|
|
- } else if (type == data[i].gljClass) {
|
|
|
|
- cacheSection.push(data[i]);
|
|
|
|
- }
|
|
|
|
- }*/
|
|
|
|
sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
|
|
sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
|
|
sheetsOprObj.showData(me.workBook.getSheet(0), me.setting, cacheSection, me.distTypeTree);
|
|
sheetsOprObj.showData(me.workBook.getSheet(0), me.setting, cacheSection, me.distTypeTree);
|
|
- sheetCommonObj.setStaticCombo(me.workBook.getActiveSheet(), 0, 5, cacheSection.length, me.distTypeTree.comboDatas, false, 'text');
|
|
|
|
- sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), cacheSection.length, 5, me.workBook.getActiveSheet().getRowCount() - cacheSection.length, me.distTypeTree.comboDatas, false, 'text');
|
|
|
|
|
|
+ sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 5, me.workBook.getActiveSheet().getRowCount(), me.distTypeTree.comboDatas, false, 'text');
|
|
cacheSection = null;
|
|
cacheSection = null;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -221,6 +210,7 @@ let repositoryGljObj = {
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
|
|
|
|
+ me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.LeaveCell, me.onLeaveCell);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.SelectionChanged, me.onSelectionChanged);
|
|
me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.SelectionChanged, me.onSelectionChanged);
|
|
},
|
|
},
|
|
getCurrentComponent: function (gljComponent) {
|
|
getCurrentComponent: function (gljComponent) {
|
|
@@ -304,7 +294,7 @@ let repositoryGljObj = {
|
|
sheetCommonObj.cleanSheet(that.workBook.getSheet(0), that.setting, -1);
|
|
sheetCommonObj.cleanSheet(that.workBook.getSheet(0), that.setting, -1);
|
|
me.workBook.focus(true);
|
|
me.workBook.focus(true);
|
|
me.currentComponent = [];
|
|
me.currentComponent = [];
|
|
- that.workBook.getSheet(0).setRowCount(5);
|
|
|
|
|
|
+ that.workBook.getSheet(0).setRowCount(10);
|
|
if(row < me.currentCache.length){
|
|
if(row < me.currentCache.length){
|
|
//标记当前工料机
|
|
//标记当前工料机
|
|
me.currentGlj = me.currentCache[row];
|
|
me.currentGlj = me.currentCache[row];
|
|
@@ -323,9 +313,15 @@ let repositoryGljObj = {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ onLeaveCell: function (sender, args) {
|
|
|
|
+ let me = repositoryGljObj;
|
|
|
|
+ me.lastCol = args.col
|
|
|
|
+ },
|
|
onEnterCell: function (sender, args) {
|
|
onEnterCell: function (sender, args) {
|
|
let me = repositoryGljObj;
|
|
let me = repositoryGljObj;
|
|
- args.sheet.repaint();
|
|
|
|
|
|
+ if(me.setting.header[args.col].dataCode === 'gljType' || me.setting.header[me.lastCol].dataCode === 'gljType'){
|
|
|
|
+ args.sheet.repaint();
|
|
|
|
+ }
|
|
me.cellRowIdx = args.row;
|
|
me.cellRowIdx = args.row;
|
|
let isHasData = false;
|
|
let isHasData = false;
|
|
if(me.addGljObj){
|
|
if(me.addGljObj){
|
|
@@ -527,6 +523,7 @@ let repositoryGljObj = {
|
|
rObj.basePrice = 0;
|
|
rObj.basePrice = 0;
|
|
}
|
|
}
|
|
rObj.basePrice = !isNaN(parseFloat(rObj.basePrice)) && (rObj.basePrice && typeof rObj.basePrice !== 'undefined') ? scMathUtil.roundTo(parseFloat(rObj.basePrice), -2) : 0;
|
|
rObj.basePrice = !isNaN(parseFloat(rObj.basePrice)) && (rObj.basePrice && typeof rObj.basePrice !== 'undefined') ? scMathUtil.roundTo(parseFloat(rObj.basePrice), -2) : 0;
|
|
|
|
+ console.log(rObj.basePrice);
|
|
addArr.push(rObj);
|
|
addArr.push(rObj);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1106,7 +1103,7 @@ let gljTypeTreeOprObj = {
|
|
gljTypeId = treeNode.ID;
|
|
gljTypeId = treeNode.ID;
|
|
me.gljCurTypeId = treeNode.ID;
|
|
me.gljCurTypeId = treeNode.ID;
|
|
me.addGljObj = null;
|
|
me.addGljObj = null;
|
|
- sheetCommonObj.cleanSheet(that.workBook.getSheet(0), that.setting, 5);
|
|
|
|
|
|
+ sheetCommonObj.cleanSheet(that.workBook.getSheet(0), that.setting, 10);
|
|
if (me.parentNodeIds["_pNodeId_" + treeNode.ID]) {
|
|
if (me.parentNodeIds["_pNodeId_" + treeNode.ID]) {
|
|
me.currentOprParent = 1;
|
|
me.currentOprParent = 1;
|
|
me.currentCache = me.getParentCache(me.parentNodeIds["_pNodeId_" + treeNode.ID]);
|
|
me.currentCache = me.getParentCache(me.parentNodeIds["_pNodeId_" + treeNode.ID]);
|