repair bug: 1. display of standardBills, mainTree 2. standardBills: sort of search result

proj_counter

modules/main/models/bills.js

@@ -55,15 +55,6 @@ class billsModel extends baseModel {
         super(bills);
     };
 
-    /**
-     *
-     * @param {Number} projectId
-     * @returns {Promise}
-     */
-    getProjectData (projectId) {
-        return this.getQueryData({"projectID": projectId}, '-_id');
-    };
-
     getData (projectID, callback) {
         this.model.find({'$or': [{projectID: projectID, deleteInfo: null}, {projectID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
             if (!err) {

modules/main/models/ration.js

@@ -93,10 +93,6 @@ class rationModel extends baseModel {
             callback(0, '', {lowID: lowID, highID: highID});
         });
     };
-
-    getProjectData (projectID) {
-        return this.getQueryData({"projectID": projectID}, '-_id');
-    };
 };
 
 module.exports = new rationModel();

modules/pm/controllers/copy_proj_controller.js

@@ -4,25 +4,31 @@
 
 let billsData = require('../../main/models/bills');
 let rationData = require('../../main/models/ration');
+let projCounter = require('../../main/models/proj_counter');
 let async = require('async');
 
 module.exports = {
     copyProjectData: function (srcProjID, newProjID, callback) {
         var fun = [];
         var copyData = function (model) {
-            return () => {
-                model.getProjectData(srcProjID).then(function (results) {
-                    let datas = [];
-                    results.forEach(function (result) {
-                        result._doc.projectID = newProjID;
-                        datas.push(result._doc);
-                    });
-                    return model.insertData(datas, callback);
-                }).catch((err) => callback(err));
+            return (cb) => {
+                model.getQueryData({"projectID": srcProjID}, '-_id').then(function (results, err) {
+                    if (results.length > 0) {
+                        let datas = [];
+                        results.forEach(function (result) {
+                            result._doc.projectID = newProjID;
+                            datas.push(result._doc);
+                        });
+                        return model.insertData(datas, cb);
+                    } else {
+                        cb(err);
+                    }
+                }).catch(cb);
             };
         };
         fun.push(copyData(billsData));
         fun.push(copyData(rationData));
+        fun.push(copyData(projCounter));
         async.parallel(fun, (err) => callback(err));
     }
 };

modules/pm/controllers/new_proj_controller.js

@@ -2,18 +2,27 @@
  * Created by Mai on 2017/4/24.
  */
 
-let billsData = require('../../main/models/bills');
 let BillsTemplateData = require('../../templates/models/bills_template');
+let billsData = require('../../main/models/bills');
+let projCounter = require('../../main/models/proj_counter');
+let async = require('async');
 
 module.exports = {
     copyTemplateData: function (tempType, newProjID, callback) {
-        BillsTemplateData.getTemplate(tempType).then(function (templates) {
-            let datas = [];
-            templates.forEach(function (template) {
-                template._doc.projectID = newProjID;
-                datas.push(template._doc);
-            })
-            return billsData.insertData(datas, callback);
-        }).catch((err) => callback(err));
+        async.parallel([
+            function (cb) {
+                BillsTemplateData.getTemplate(tempType).then(function (templates) {
+                    let datas = [];
+                    templates.forEach(function (template) {
+                        template._doc.projectID = newProjID;
+                        datas.push(template._doc);
+                    })
+                    return billsData.insertData(datas, cb);
+                });
+            },
+            function (cb) {
+                projCounter.insertData({"projectID": newProjID}, cb);
+            }
+        ], (err) => callback(err));
     }
 };

package.json

@@ -13,10 +13,14 @@
     "ejs": "~2.5.5",
     "express-session": "^1.15.1",
     "request": "^2.79.0",
-    "tape": "^4.6.3"
+    "tape": "^4.6.3",
+    "nodemon": "^1.11.0"
   },
   "dependencies": {
     "bluebird": "^3.5.0",
     "jszip": "^3.1.3"
+  },
+  "scripts" :{
+    "start": "nodemon server.js"
   }
 }

server.js

@@ -150,6 +150,6 @@ app.use(function(err, req, res, next) {
     console.error(err.stack);
     res.status(500).send('500 Error');
 });
-app.listen(6060);
-
-
+app.listen(6060, function () {
+    console.log('server start');
+});

test/tmp_data/bills_grid_setting.js

@@ -257,7 +257,7 @@ var BillsGridSetting ={
             "readOnly":false,
             "head":{
                 "titleNames":[
-                    "工程量计量规则"
+                    "工程量计算规则"
                 ],
                 "spanCols":[
                     1

web/building_saas/main/html/main.html

@@ -198,7 +198,7 @@
                                           <select class="form-control form-control-sm col-6" id="stdBillsLibSelect">
                                           </select>
                                           <div class="input-group col-6" id="stdBillsSearch">
-                                              <input type="text" class="form-control form-control-sm" placeholder="搜索清单" value="1-1-2">
+                                              <input type="text" class="form-control form-control-sm" placeholder="搜索清单">
                                               <span class="input-group-btn">
                                                   <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
                                               </span>

web/building_saas/main/js/views/std_bills_lib.js

@@ -304,7 +304,7 @@ var LoadStdBills = (function () {
                 "width":200,
                 "readOnly":true,
                 "head":{
-                    "titleNames":["工程内容"],
+                    "titleNames":["工作内容"],
                     "spanCols":[1],
                     "spanRows":[1],
                     "vAlign":[1],
@@ -410,7 +410,7 @@ var LoadStdBills = (function () {
             return codeIs || nameIs;
         });
         result.sort(function (x, y) {
-            return x.serialNo - y.serialNo;
+            return x.serialNo() - y.serialNo();
         });
         if (result.length !== 0) {
             var sel = stdBillsSpread.getActiveSheet().getSelections();