Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/main/models/bills.js

@@ -4,6 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
+var deleteSchema = require('../../../public/models/deleteSchema');
 var Schema = mongoose.Schema;
 var counter = require("../../../public/counter/counter.js");
 
@@ -37,7 +38,8 @@ var billsSchema = new Schema({
     // 费用字段
     fees: [subSchema.feesSchema],
     // 标记字段
-    flags: [subSchema.flagsSchema]
+    flags: [subSchema.flagsSchema],
+    deleteInfo: deleteSchema
 });
 
 var bills = db.model("bills", billsSchema);
@@ -45,7 +47,7 @@ var bills = db.model("bills", billsSchema);
 var billsDAO = function(){};
 
 billsDAO.prototype.getData = function(projectID, callback){
-    bills.find({projectID: projectID}, function(err, datas){
+    bills.find({'$or': [{projectID: projectID, deleteInfo: null}, {projectID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
         if (!err) {
             callback(0, '', datas);
         } else {

modules/templates/models/bills_template.js

@@ -30,7 +30,7 @@ BillsTemplateDAO.prototype.getTemplate = function (type, callback) {
                 if (err) {
                     callback(1, '找不到模板', null);
                 } else {
-                    callback(0, '', template);
+                    callback(0, '', result);
                 }
             });
         return null;

server.js

@@ -56,6 +56,17 @@ app.get('/template/bills', function (req, res) {
         {userAccount: req.session.userAccount,
             userID: req.session.userID});
 });
+
+app.use('/template/bills', function (req, res, next) {
+    var checkAdmin = function (userAccount) {
+        return true;
+    }
+    if (checkAdmin(req.session.userAccount)) {
+        next();
+    } else {
+        res.json({error: 1, message: '对不起，您无权限操作清单模板。', data: null});
+    }
+});
 var billsTemplateRouter = require('./modules/templates/routes/bills_template_router');
 app.use('/template/bills', billsTemplateRouter);