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

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

@@ -73,16 +73,26 @@ var billsLibObj = {
             }
             return null;
         };
+        let sortJobsAndFeatures = function (arr) {
+            arr.sort(function (a, b) {
+                let rst = 0;
+                if(a.serialNo > b.serialNo) rst = 1;
+                else if(a.serialNo < b.serialNo) rst = -1;
+                return rst;
+            });
+        };
         var getBillsJobs = function (node) {
             var jobs = [], i, jobData = null;
             if (stdBillsJobData && node && node.data.jobs) {
                 for (i = 0; i < node.data.jobs.length; i++) {
                     jobData = findData(node.data.jobs[i], 'id', stdBillsJobData);
                     if (jobData) {
+                        jobData.serialNo = node.data.jobs[i].serialNo;
                         jobs.push(jobData);
                     }
                 }
             }
+            sortJobsAndFeatures(jobs);
             return jobs;
         };
         var getBillsFeatures = function (node) {
@@ -91,10 +101,12 @@ var billsLibObj = {
                 for (i = 0; i < node.data.items.length; i++) {
                     featureData = findData(node.data.items[i], 'id', stdBillsFeatureData);
                     if (featureData) {
+                        featureData.serialNo = node.data.items[i].serialNo;
                         features.push(featureData);
                     }
                 }
             }
+            sortJobsAndFeatures(features);
             return features;
         };
         var showJobs = function (jobs) {
@@ -110,6 +122,7 @@ var billsLibObj = {
             $('#stdBillsRemarkTab').hide();
             billsLibObj.refreshBillsRelaSpread();
             billsLibObj.checkBillsRelaSpread();
+            sortJobsAndFeatures(getBillsJobs(node));
             showJobs(getBillsJobs(node));
             showFeatures(getBillsFeatures(node));
         };