Browse Source

1.修改版本管理创建时记录的信息
2.修改删除版本的逻辑

caiaolin 7 years ago
parent
commit
0174942516

+ 3 - 1
modules/users/controllers/version_controller.js

@@ -94,10 +94,12 @@ class VersionController extends BaseController {
             msg: ''
             msg: ''
         };
         };
         try {
         try {
+            let sessionManager = request.session.managerData;
             let insertData = {
             let insertData = {
                 name: name,
                 name: name,
                 standard_bill: [{id: standardBillId, name: standardBill}],
                 standard_bill: [{id: standardBillId, name: standardBill}],
-                ration_lib: [{id: rationLibId, name: rationLib}]
+                ration_lib: [{id: rationLibId, name: rationLib}],
+                creator: sessionManager.userID
             };
             };
 
 
             let versionModel = new VersionModel();
             let versionModel = new VersionModel();

+ 5 - 1
modules/users/models/schemas/version.js

@@ -20,7 +20,11 @@ let modelSchema = {
     // 标准清单
     // 标准清单
     standard_bill: Schema.Types.Mixed,
     standard_bill: Schema.Types.Mixed,
     // 定额库
     // 定额库
-    ration_lib: Schema.Types.Mixed
+    ration_lib: Schema.Types.Mixed,
+    // 创建时间
+    create_time: Number,
+    // 创建者id
+    creator: Number
 };
 };
 let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
 let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
 export {model as default, collectionName as collectionName};
 export {model as default, collectionName as collectionName};

+ 1 - 0
modules/users/models/version_model.js

@@ -62,6 +62,7 @@ class VersionModel extends BaseModel {
         }
         }
 
 
         this.setScene('add');
         this.setScene('add');
+        data.create_time = new Date().getTime();
         result = this.db.create(data);
         result = this.db.create(data);
         return result;
         return result;
     }
     }

+ 16 - 2
web/users/views/version/index.html

@@ -28,7 +28,14 @@
 					<label>标准清单</label>
 					<label>标准清单</label>
 					<div id="bill-list">
 					<div id="bill-list">
 						<% selectedVersion.standard_bill.forEach(function (bill){ %>
 						<% selectedVersion.standard_bill.forEach(function (bill){ %>
-						<p class="form-control-static"><a class="pull-right text-danger remove-version" data-model="bill" data-id="<%= bill.id %>" title="移除"><span class="glyphicon glyphicon-remove"></span></a><%= bill.name %></p>
+						<p class="form-control-static">
+							<% if (selectedVersion.standard_bill.length > 1) { %>
+							<a class="pull-right text-danger remove-version" data-model="bill" data-id="<%= bill.id %>" title="移除">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+							<% } %>
+							<%= bill.name %>
+						</p>
 						<% }) %>
 						<% }) %>
 					</div>
 					</div>
 					<a class="btn btn-link btn-sm add-version" href="javascript:void(0)" data-model="bill">添加</a>
 					<a class="btn btn-link btn-sm add-version" href="javascript:void(0)" data-model="bill">添加</a>
@@ -37,7 +44,14 @@
 					<label>定额库</label>
 					<label>定额库</label>
 					<div id="ration-list">
 					<div id="ration-list">
 						<% selectedVersion.ration_lib.forEach(function (ration){ %>
 						<% selectedVersion.ration_lib.forEach(function (ration){ %>
-						<p class="form-control-static"><a class="pull-right text-danger remove-version" data-model="ration" title="移除" data-id="<%= ration.id %>"><span class="glyphicon glyphicon-remove"></span></a><%= ration.name %></p>
+						<p class="form-control-static">
+							<% if (selectedVersion.ration_lib.length > 1) { %>
+							<a class="pull-right text-danger remove-version" data-model="ration" title="移除" data-id="<%= ration.id %>">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+							<% } %>
+							<%= ration.name %>
+						</p>
 						<% }) %>
 						<% }) %>
 					</div>
 					</div>
 					<a href="#" class="btn btn-link btn-sm add-version" data-model="ration">添加</a>
 					<a href="#" class="btn btn-link btn-sm add-version" data-model="ration">添加</a>