zhangweicheng 7 年之前
父节点
当前提交
3ac42e6183

+ 18 - 0
modules/all_models/bills_template.js

@@ -0,0 +1,18 @@
+/**
+ * Created by zhang on 2018/3/22.
+ */
+
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var deleteSchema = require('../all_schemas/delete_schema');
+var BillsTemplateSchema = new Schema({
+    ID: Number,
+    ParentID: Number,
+    NextSiblingID: Number,
+    code: String,
+    name: String,
+    unit: String,
+    deleteInfo: deleteSchema,
+    tempType: Number
+});
+//mongoose.model('temp_bills', BillsTemplateSchema);  之后删除

+ 6 - 5
modules/main/controllers/GLJ_controller.js

@@ -1,9 +1,10 @@
-/**
+/*
+/!**
  * Created by jimiz on 2017/4/17.
- */
-/**
+ *!/
+/!**
  * Created by jimiz on 2017/4/7.
- */
+ *!/
 var GLJData = require('../models/glj');
 
 //统一回调函数
@@ -44,4 +45,4 @@ module.exports = {
         });
     }
 
-};
+};*/

+ 2 - 2
modules/main/facade/ration_installation_facade.js

@@ -1,8 +1,8 @@
 /**
  * Created by zhang on 2018/2/24.
  */
-
-import rationInstallationModel from "../models/ration_installation";
+let mongoose = require('mongoose');
+let rationInstallationModel =  mongoose.model('ration_installation');
 let consts = require('../models/project_consts');
 let projectConsts = consts.projectConst;
 

+ 4 - 2
modules/main/routes/GLJ_route.js

@@ -1,6 +1,7 @@
-/**
+/*
+/!**
  * Created by jimiz on 2017/4/17.
- */
+ *!/
 let express = require('express');
 
 module.exports = function (app) {
@@ -13,3 +14,4 @@ module.exports = function (app) {
 
     app.use('/glj_bak', GLJRouter);
 };
+*/

+ 4 - 20
modules/templates/models/bills_template.js

@@ -2,26 +2,10 @@
  * Created by Mai on 2017/4/14.
  * 清单模板,新建项目使用
  */
-var counter = require("../../../public/counter/counter.js");
-
-var mongoose = require('mongoose');
-var dbm = require("../../../config/db/db_manager");
-var templatesDB = dbm.getCfgConnection("templates");
-var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/delete_schema');
-var BillsTemplateSchema = new Schema({
-    ID: Number,
-    ParentID: Number,
-    NextSiblingID: Number,
-    code: String,
-    name: String,
-    unit: String,
-    deleteInfo: deleteSchema,
-    tempType: Number
-});
-var BillsTemplates = templatesDB.model('temp_bills', BillsTemplateSchema);
-
-var BillsTemplateDAO = function(){};
+let counter = require("../../../public/counter/counter.js");
+let mongoose = require('mongoose');
+let BillsTemplates = mongoose.model('temp_bills');
+let BillsTemplateDAO = function(){};
 
 BillsTemplateDAO.prototype.getTemplate = function (type, callback) {
     if (callback) {

+ 1 - 0
server.js

@@ -78,6 +78,7 @@ app.use(function (req, res, next) {
 
 //加载路由文件
 fileUtils.getGlobbedFiles('./modules/**/routes/*.js').forEach(function(modelPath) {
+    console.log(modelPath);
     require(path.resolve(modelPath))(app);
 });