|
|
@@ -2,6 +2,7 @@
|
|
|
* Created by zhang on 2018/1/30.
|
|
|
*/
|
|
|
let installationFeeObj={
|
|
|
+ feeRateMap:{},
|
|
|
rationInstallSheet:null,
|
|
|
rationInstallData:[],
|
|
|
rationInstallSetting:{
|
|
|
@@ -272,7 +273,6 @@ let installationFeeObj={
|
|
|
me.feeItemSheet.repaint();
|
|
|
},
|
|
|
onFeeDetailSelectionChange:function (e,info) {
|
|
|
- console.log('detail selection change');
|
|
|
let me = installationFeeObj;
|
|
|
if(me.detailReloadSelection){
|
|
|
info.sheet.setSelection(me.detailReloadSelection.row,me.detailReloadSelection.col,1,1);
|
|
|
@@ -476,14 +476,12 @@ let installationFeeObj={
|
|
|
let options=[{text:"无",value:""}];
|
|
|
for(let ir of detail.impactRules){
|
|
|
options.push({text:ir.rule,value:ir.ID});
|
|
|
- options.push(ir.rule);
|
|
|
}
|
|
|
options.push({text:"更多",value:'more'});
|
|
|
let dynamicCombo = sheetCommonObj.getDynamicCombo();//new GC.Spread.Sheets.CellTypes.ComboBox();
|
|
|
dynamicCombo.items(options);
|
|
|
dynamicCombo.editorValueType(GC.Spread.Sheets.CellTypes.EditorValueType.value);
|
|
|
sheet.setCellType(row, col, dynamicCombo, GC.Spread.Sheets.SheetArea.viewport);
|
|
|
- sheet.getCell(row,col).wordWrap(true);
|
|
|
},
|
|
|
getFeeItemData:function (datas) {
|
|
|
let feeItemShowArray = [];
|
|
|
@@ -822,7 +820,6 @@ let installationFeeObj={
|
|
|
let me = this,installation_fee = projectObj.project.installation_fee;
|
|
|
let modifyRule = me.modifyFeeRuleData[0];
|
|
|
let updateMap = null;
|
|
|
- console.log(me.modifyEditedObj);
|
|
|
if(me.modifyEditedObj==null){
|
|
|
$("#modify_feeRule").modal('hide');
|
|
|
return;
|
|
|
@@ -876,7 +873,6 @@ let installationFeeObj={
|
|
|
modifyFee.position = recode.code;
|
|
|
modifyFee.billID = recode.ID;
|
|
|
me.modifyFeeRuleSheet.setValue(riselection.row,positionCol,me.getDisplayText(modifyFee));
|
|
|
- console.log(me.modifyEditedObj);
|
|
|
},
|
|
|
updateRationInstallPosition:function(recode){
|
|
|
let me = this, installation_fee = projectObj.project.installation_fee;
|
|
|
@@ -1041,7 +1037,6 @@ let installationFeeObj={
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log(updateData);
|
|
|
if(updateData.length > 0){
|
|
|
installation_fee.updateInstallation(updateData,function () {
|
|
|
me.refreshView();
|
|
|
@@ -1121,7 +1116,6 @@ let installationFeeObj={
|
|
|
}
|
|
|
me.modifyEditedObj[fieldID] = value;
|
|
|
me.modifyFeeRuleData[info.row][fieldID] = value;
|
|
|
- console.log(me.modifyEditedObj);
|
|
|
},
|
|
|
onFeeDetailValueChange:function (e,info) {
|
|
|
if(info.newValue==info.oldValue){
|
