单价文件编辑

web/building_saas/main/js/views/glj_view.js

@@ -341,7 +341,8 @@ var gljOprObj = {
     },
     loadPageData: function (sheet, reset, index) {
         let condition = this.getPagingCondition(false, reset, false, index);
-        projectObj.project.ration_glj.getGLJDataPaging(condition, function (data) {
+        let getPagingFun =  typeof unitPriceObj != 'undefined' ? unitPriceObj.getGLJDataPaging:projectObj.project.ration_glj.getGLJDataPaging;
+        getPagingFun(condition, function (data) {
             sheetCommonObj.appendData(sheet, condition.index, 0, gljOprObj.gljLibSheetSetting, data);
             gljOprObj.initSelection({row: gljOprObj.gljLibSheet.getActiveRowIndex()});
         });
@@ -358,6 +359,7 @@ var gljOprObj = {
         style.borderRight = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         style.borderBottom = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         let colorOpts = optionsOprObj.getOption(optionsOprObj.optionsTypes.COLOROPTS);
+        if(!colorOpts) colorOpts = {SELECTED:{backColor:"#FFFACD"}};
         let selectedColor = colorOpts.SELECTED.backColor,
             recColor =  rcolor?rcolor:'White';
         style.backColor = selected ? selectedColor : recColor;

web/building_saas/main/js/views/project_info.js

@@ -80,8 +80,6 @@ var projectInfoObj = {
             billsQuanDecimal.datas = data.property.billsQuantityDecimal || [billsDecimalView.angleDecimal];
             basicInfoView.orgDatas = data.property.basicInformation ? basicInfoView.toViewDatas(data.property.basicInformation) : [];
             projFeatureView.orgDatas = data.property.projectFeature ? projFeatureView.toViewDatas(data.property.projectFeature) : [];
-            console.log(`me.orgDatas`);
-            console.log(projFeatureView.orgDatas);
             $('#fullpath').html(this.getFullPathHtml(data));
             // 分享给
             $('#init-share').click(() => SHARE_TO.initModal(projectObj.project.ID()));