Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

modules/all_models/calc_program_model.js

@@ -37,7 +37,7 @@ let stdCalcPrograms = new Schema({
 
 let projectCalcPrograms = new Schema({
     ID: String,
-    projectID: Number,
+    projectID: {type: Number, index: true},
     name: String,
     libID: Number,
     libName: String,

modules/all_models/ration_glj.js

@@ -12,7 +12,7 @@ var ration_glj = new Schema({
     GLJID:Number,
     repositoryId:Number,
     projectID: Number,
-    rationID:String,
+    rationID:{type: String, index: true},
     projectGLJID:Number,
     name:String,
     code:String,

public/web/sheet/sheet_common.js

@@ -136,13 +136,15 @@ var sheetCommonObj = {
                 if(data[row].cellType === 'comboBox'){
                     let options = data[row].options ? data[row].options.split("@") : [];
                     this.setComboBox(row,col,sheet,options);
+                }else if(data[row].cellType === 'String'){//默认设置字符输入，避免出现输入10：01变成日期的情况
+                    sheet.setFormatter(row, col,"@", GC.Spread.Sheets.SheetArea.viewport);
                 }
                 let val = data[row][setting.header[col].dataCode];
                 if(val&&setting.header[col].dataType === "Number"){
                     if(setting.header[col].hasOwnProperty('decimalField')){
                         let decimal = getDecimal(setting.header[col].decimalField);
                         val =scMathUtil.roundToString(val,decimal);
-                        sheet.setFormatter(-1, col,getFormatter(decimal), GC.Spread.Sheets.SheetArea.viewport);
+                        sheet.setFormatter(row, col,getFormatter(decimal), GC.Spread.Sheets.SheetArea.viewport);
                     }else {
                         val =scMathUtil.roundToString(val,2);
                     }

web/building_saas/main/js/views/config_material_view.js

@@ -717,6 +717,8 @@ let pgljSelObj={
         if(!this.spread){
             this.spread = SheetDataHelper.createNewSpread($("#pglj_from_sheet")[0]);
             sheetCommonObj.spreadDefaultStyle(this.spread);
+        }else {
+            this.spread.refresh();
         }
         this.sheet = this.spread.getSheet(0);
         sheetCommonObj.initSheet(this.sheet,this.setting);

web/building_saas/main/js/views/material_adjust_view.js

@@ -305,6 +305,8 @@ let gljFromObj={
         if(!this.spread){
             this.spread = SheetDataHelper.createNewSpread($("#glj_from_sheet")[0]);
             sheetCommonObj.spreadDefaultStyle(this.spread);
+        }else {
+            this.spread.refresh();
         }
         this.sheet = this.spread.getSheet(0);
         sheetCommonObj.initSheet(this.sheet,this.setting);