update

modules/all_models/user.js

@@ -25,6 +25,13 @@ const versionSchema = new Schema({
     invalidInfo: [invalidSchema]
 });
 
+let upgrade = mongoose.Schema({
+    compilationID:String,//编办ID
+    upgrade_time:Number,
+    isUpgrade:Boolean,
+    remark:String//描述：广东办刘飞 2018-06-17 启用/关闭
+}, { _id: false })
+
 // 表结构
 let schema = {
     ssoId: Number,
@@ -55,7 +62,13 @@ let schema = {
         type: Number,
         default: -1
     },
+    // 最后登录时间
+    last_login: {
+        type: Number,
+        default: 0
+    },
     create_time: Number,
+    upgrade_list:[upgrade],
     user_type:{
         type:String,
         default:'normal'//  normal : 普通用户，test:测试用户

modules/users/models/user_model.js

@@ -30,7 +30,7 @@ class UserModel extends BaseModel {
         '造价管理站', '学校', '个人', '其他'];
 
     /**
-     * 企业类型
+     * 企业规模
      *
      * @var
      */

web/building_saas/main/js/views/fee_rate_view.js

@@ -502,32 +502,6 @@ var feeRateObject={
     },
 
     onMainFeeRateSheetValueChange:function (e,info) {
-  /*      let me = feeRateObject,updateData = {},feeRate = projectObj.project.FeeRate;
-        let recode = me.mainFeeRateData[info.row];
-        let fieldID = me.mainFeeRateSetting.header[info.col].dataCode;
-        let value = info.newValue;
-        if(fieldID == 'rate'&&value != null){
-            let checkResult = scMathUtil.isNumOrFormula(value);
-            if(checkResult!=null){
-                value = scMathUtil.roundForObj(checkResult,getDecimal("feeRate"));
-            }else {
-                alert('当前输入的数据类型不正确，请重新输入。');
-                me.mainFeeRateSheet.setValue(info.row, info.col, info.oldValue);
-                return;
-            }
-        }
-        if(recode[fieldID] == value){//没有改变
-            return;
-        }
-        updateData[fieldID] = value;
-        $.bootstrapLoading.start();
-         feeRate.updateFeeRateByID(recode.ID,updateData,function () {
-             me.mainFeeRateSheet.setValue(info.row, info.col, value);
-             if(fieldID == 'rate'){
-                feeRate.onFeeRateChange(recode.ID,value);
-            }
-            $.bootstrapLoading.end();
-        })*/
         feeRateObject.updateFeerateWhenCellsChange([info]);
     },
     onMainFeeRateRangeChanged:function (e,info) {

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

@@ -934,7 +934,6 @@ var gljOprObj = {
             projectObj.project.projectGLJ.updatePriceFromRG(node.data, "marketPrice", newval);
             return
         }
-
         projectObj.mainController.refreshTreeNode([node]);
     },
     updateIsEstimate:function (args, newval) {
@@ -1143,20 +1142,20 @@ var gljOprObj = {
         }
     },
     doReplaceGLJ: function () {
-        var me = this;
-        var oldData = me.sheetData[gljContextMenu.selectedRow];
-        var project = projectObj.project;
-        var selectCode = gljOprObj.GLJSelection[0];
-        var selected = projectObj.project.mainTree.selected;
+        let me = this;
+        let oldData = me.sheetData[gljContextMenu.selectedRow];
+        let project = projectObj.project;
+        let selectCode = gljOprObj.GLJSelection[0];
+        let selected = projectObj.project.mainTree.selected;
         $("#glj_tree_div").modal('hide');
         project.ration_glj.replaceGLJ(selectCode, oldData, function (result) {
             if (result) {
                 //result.adjustState;
-                var glj_list = projectObj.project.ration_glj.datas;
-                var data = result.data;
-                var index = _.findIndex(gljOprObj.sheetData, {'ID': data.ID});
-                var list_index = _.findIndex(glj_list, {'ID': data.ID});
-                var nodes = [selected];
+                let glj_list = projectObj.project.ration_glj.datas;
+                let data = result.data;
+                let index = _.findIndex(gljOprObj.sheetData, {'ID': data.ID});
+                let list_index = _.findIndex(glj_list, {'ID': data.ID});
+                let nodes = [selected];
                 gljOprObj.sheetData[index] = data;
                 glj_list[list_index] = data;
                 project.projectGLJ.loadData(function () {//加载完项目工料机再计算
@@ -1220,10 +1219,10 @@ var gljOprObj = {
         });
     },
     refreshStateAfterMreplace: function (stateList, gljNodes) {
-        var nodes = [];
-        var rationNodes = [];
+        let nodes = [];
+        let rationNodes = [];
         _.forEach(stateList, function (s) {
-            var node = _.find(projectObj.project.mainTree.items, function (n) {
+            let node = _.find(projectObj.project.mainTree.items, function (n) {
                 return n.sourceType == ModuleNames.ration && n.data.ID == s.rationID;
             })
             if (node) {
@@ -1245,8 +1244,8 @@ var gljOprObj = {
         if (!obj) {
             return;
         }
-        var objectArray = [];
-        var nodes = [];
+        let objectArray = [];
+        let nodes = [];
         if (obj instanceof Array) {
             objectArray.concat(obj);
         } else {
@@ -1272,10 +1271,10 @@ var gljOprObj = {
         return node;
     },
     getTreeNodeCellType: function (data,comboboxOptions) {
-        var ns = GC.Spread.Sheets;
-        var rectW = 10;
-        var rectH = 10;
-        var margin = 3;
+        let ns = GC.Spread.Sheets;
+        let rectW = 10;
+        let rectH = 10;
+        let margin = 3;
 
         function TreeNodeCellType() {
         }
@@ -1284,8 +1283,8 @@ var gljOprObj = {
             ctx.strokeStyle = "gray";
             ctx.translate(0.5, 0.5);
             ctx.beginPath();
-            var rectX = x + margin;
-            var rectY = y + Math.round(h / 2) - rectH / 2;
+            let rectX = x + margin;
+            let rectY = y + Math.round(h / 2) - rectH / 2;
             ctx.moveTo(rectX, rectY);
             ctx.lineTo(rectX, rectY + rectH);
             ctx.lineTo(rectX + rectW, rectY + rectH);
@@ -1303,7 +1302,7 @@ var gljOprObj = {
             ctx.beginPath();
             ctx.moveTo(x + margin + 2, y + Math.round(h / 2));
             ctx.lineTo(x + margin + 8, y + Math.round(h / 2));
-            var rectY = y + Math.round(h / 2) - rectH / 2;
+            let rectY = y + Math.round(h / 2) - rectH / 2;
             if (collapsed) {
                 ctx.moveTo(x + margin + rectW / 2, rectY + 2);
                 ctx.lineTo(x + margin + rectW / 2, rectY + 2 + 6);
@@ -1341,11 +1340,11 @@ var gljOprObj = {
                 ctx.clearRect(x, y, w, h);
             }
             if (value != null) {
-                var offset = margin + rectW + 6;
-                var recode = data[options.row];
+                let offset = margin + rectW + 6;
+                let recode = data[options.row];
                 if (recode && recode.hasOwnProperty('subList')) {
                     drowRect(ctx, x, y, w, h);
-                    var collapsed = recode.collapsed == undefined ? true : recode.collapsed;//options.sheet.getTag(options.row,options.col);
+                    let collapsed = recode.collapsed == undefined ? true : recode.collapsed;//options.sheet.getTag(options.row,options.col);
                     drowSymbol(ctx, x, y, w, h, collapsed);
                 } else if (recode && recode.isMixRatio) {
                     offset = drowSubItem(ctx, x, y, w, h, offset, data[options.row + 1]);
@@ -1374,11 +1373,11 @@ var gljOprObj = {
             }
         };
         TreeNodeCellType.prototype.processMouseDown = function (hitinfo) {
-            var recode = data[hitinfo.row];
+            let recode = data[hitinfo.row];
             if (recode && recode.hasOwnProperty('subList')) {
-                var hoffset = hitinfo.cellRect.x + 3;
+                let hoffset = hitinfo.cellRect.x + 3;
                 if (hitinfo.x > hoffset && hitinfo.x < hoffset + 10) {
-                    var collapsed = recode.collapsed == undefined ? true : recode.collapsed;
+                    let collapsed = recode.collapsed == undefined ? true : recode.collapsed;
                     collapsed = !collapsed
                     recode.collapsed = collapsed;
                     //hitinfo.sheet.setTag(hitinfo.row,hitinfo.col,collapsed);
@@ -1417,7 +1416,6 @@ var gljOprObj = {
         gljOprObj.filterLibGLJSheetData();
         gljOprObj.showLibGLJSheetData();
     }
-
 }
 
 $(function () {
@@ -1438,7 +1436,7 @@ $(function () {
             gljOprObj.GLJSelection = [];
         } else if($('#actionType').val() =='m_replace' || $('#actionType').val() == 'replace'){//替换、批量替换
             let selected = gljOprObj.sheetData[gljContextMenu.selectedRow];
-            var connect_key = gljOprObj.getIndex(selected, gljKeyArray);
+            let connect_key = gljOprObj.getIndex(selected, gljKeyArray);
             gljOprObj.GLJSelection = [connect_key];
             selectMap[connect_key] = true;
             gljOprObj.filterLibGLJByType();
@@ -1488,7 +1486,7 @@ $(function () {
             gljOprObj.filterLibGLJSheetData();
             gljOprObj.showLibGLJSheetData();
         }
-    })
+    });
 /*    //工料机搜索
     $('#gljSearchKeyword').change(function () {
         gljOprObj.filterLibGLJSheetData();