ration, content

modules/main/controllers/project_controller.js

@@ -11,7 +11,6 @@ var callback = function(req, res, err, message, data){
 module.exports = {
     save: function (req, res) {
         var data = JSON.parse(req.body.data);
-        console.log(data);
         Project.save(data, function (err, message, result) {
             if (err) {
                 logger.err(err);

modules/main/models/ration.js

@@ -52,7 +52,7 @@ let rationSchema = new Schema({
     deleteInfo: deleteSchema,
     rationAssList: [rationAssItemSchema],
     // 工作内容
-    jobContent: String,
+    content: String,
     // 计算规则
     ruleText: String
 });

modules/ration_repository/controllers/search_controller.js

@@ -13,13 +13,10 @@ module.exports = {
         rationItem.getRationItem(rId, code).then(function (result) {
             let rationData = JSON.stringify(result._doc);
             rationData = JSON.parse(rationData);
-            console.log(rationData);
             rationChapter.getRationChapter(rationData.rationRepId, rationData.sectionId).then(function (result) {
                 rationData.chapter = result._doc;
-                console.log(rationData);
                 callback(req, res, null, '', rationData);
             }).catch(function (err, message) {
-                console.log(rationData);
                 callback(req, res, null, '', rationData);
             });
         }).catch(function (err, message) {

web/building_saas/main/html/main.html

@@ -148,7 +148,7 @@
                                       <div class="main-data-bottom ovf-hidden" id="subSpread" style="display: none">
                                       </div>
                                       <div class="main-data-bottom ovf-hidden" style="display: none" id="comments">
-                                          <textarea class="form-control" rows="8"></textarea>
+                                          <textarea class="form-control" rows="8" readonly=""></textarea>
                                       </div>
                                       <div id="tzjnrCon" class="main-data-bottom">
                                           <div class="main-data-bottom ovf-hidden" style="width: 40%; float: left;" id="jobSpread">

web/building_saas/main/js/models/ration.js

@@ -148,13 +148,14 @@ var Ration = {
         ration.prototype.insertStdRation = function (billsID, preRation, std) {
             var br = this.getBillsSortRation(billsID), updateData = this.getInsertRationData(billsID, preRation), newRation = null;
             updateData.forEach(function (data) {
+
                 if (data.updateType === 'ut_create') {
                     data.updateData.code = std.code;
                     data.updateData.name = std.name;
                     data.updateData.caption = std.caption;
                     data.updateData.unit = std.unit;
                     data.updateData.libID = std.rationRepId;
-                    data.updateData.jobContent = std.jobContent;
+                    data.updateData.content = std.jobContent;
                     if (std.chapter) {
                         data.updateData.comments = std.chapter.explanation;
                         data.updateData.ruleText = std.chapter.ruleText;

web/building_saas/main/js/views/main_tree_col.js

@@ -40,7 +40,10 @@ let MainTreeCol = {
         },
         forCalcBase: function (node) {
             // to do according to billsParentType
-            return MainTreeCol.readOnly.billsParent && MainTreeCol.readOnly.non_bills;
+            return MainTreeCol.readOnly.billsParent(node) && MainTreeCol.readOnly.non_bills(node);
+        },
+        forUnitFee: function (node) {
+            return MainTreeCol.readOnly.ration(node) && MainTreeCol.readOnly.billsParent(node);
         }
     },
     cellType: {

web/building_saas/main/js/views/sub_view.js

@@ -133,9 +133,8 @@ let subViewObj = {
             if (node.sourceType === projectObj.project.Bills.getSourceType()) {
                 $('#comments>textarea').val(node.data.comments)
             } else if (node.sourceType === projectObj.project.Ration.getSourceType()) {
-                let comments = node.data.comments ? node.data.comments : '';
-                let jobContent = node.data.jobContent ? node.data.jobContent : '';
-                $('#comments>textarea').val(comments + '\n' + jobContent);
+                console.log(node.data);
+                $('#comments>textarea').val(node.data.content);
             }
         }
     },