浏览代码

增加tiemzone设置,bugs

zhangweicheng 5 年之前
父节点
当前提交
3c20d13f45
共有 3 个文件被更改,包括 32 次插入1 次删除
  1. 30 0
      modules/all_models/com_electrovalence.js
  2. 1 1
      modules/common/base/base_controller.js
  3. 1 0
      package.json

+ 30 - 0
modules/all_models/com_electrovalence.js

@@ -0,0 +1,30 @@
+/**
+ * Created by zhang on 2019/12/10.
+ */
+
+let mongoose = require('mongoose');
+let Schema = mongoose.Schema;
+
+let gljListSchema =new Schema({
+    ID:{type: String},
+    GLJID:Number,
+    projectGLJID:Number,
+    name:String,
+    displayName:String,
+    code:String,
+    specs:String,
+    unit:String,
+    type:Number,
+    // 加权系数
+    coe: Number,
+    from:{type: String,default:'std'}//std, cpt  来自标准工料机库、补充工料机库
+},{versionKey:false,_id: false});
+
+
+let com_electrovalenceSchema = {//综合电价
+    ID:{type:String,index: true},
+    unit_price_file_id: Number,
+    gljList:[gljListSchema]
+};
+
+mongoose.model("com_electrovalence", new Schema(com_electrovalenceSchema, {versionKey: false, collection: "com_electrovalence"}));

+ 1 - 1
modules/common/base/base_controller.js

@@ -7,7 +7,7 @@
  */
 import crypto from "crypto";
 import Url from "url";
-import Moment from "moment";
+import Moment from 'moment-timezone';
 // import menuData from "../../../config/menu";
 
 class BaseController {

+ 1 - 0
package.json

@@ -28,6 +28,7 @@
     "jszip": "^3.1.3",
     "log4js": "~2.3.3",
     "multiparty": "^4.1.3",
+    "moment-timezone": "^0.5.27",
     "node-xlsx": "^0.11.2",
     "pdfkit": "^0.8.2",
     "ueditor": "^1.2.3",