川高显示项目特征(Part 1)

config/gulpConfig.js

@@ -149,6 +149,7 @@ module.exports = {
         'web/building_saas/main/js/controllers/block_controller.js',
         'web/building_saas/main/js/controllers/material_controller.js',
         'web/building_saas/main/js/views/side_tools.js',
+        'web/building_saas/main/js/views/character_content_view.js',
         'web/building_saas/main/js/views/std_billsGuidance_lib.js',
         'web/building_saas/main/js/views/std_bills_unit_price_feature.js',
         'web/building_saas/main/js/views/std_bills_lib.js',

web/building_saas/main/html/main.html

@@ -2146,6 +2146,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/controllers/block_controller.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/controllers/material_controller.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/side_tools.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/character_content_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_billsGuidance_lib.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_unit_price_feature.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>

web/building_saas/main/js/models/bills.js

@@ -215,6 +215,7 @@ var Bills = {
                     data.data.itemCharacter = stdBillsData.itemCharacter;
                     data.data.jobContentText = stdBillsData.jobContentText;
                     data.data.itemCharacterText = stdBillsData.itemCharacterText;
+                    // if (this.project.property.calcProgram.name === '四川养护(2013)计算程序') {}
                     data.data.programID = stdBillsData.engineering;
                     data.data.type = stdBillsData.type;//插入清单类型
                     //Vincent

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -169,7 +169,7 @@ const billsGuidance = (function () {
                 } else if (!projectReadOnly && !isInserting && !projectObj.project.isBillsLocked() && (![1].includes(args.col) || node.children.length === 0)) {
                     //选中部分的最底层（只是选中部分的最底）
                     let lowestNodes = [bills.tree.items[args.row]];
-                    insertBills(lowestNodes);
+                    insertBills(lowestNodes, stdBillsJobData, stdBillsFeatureData);
                 }
             }
         }
@@ -235,7 +235,7 @@ const billsGuidance = (function () {
     }
 
     //插入清单
-    async function insertBills(lowestNodes) {
+    async function insertBills(lowestNodes, stdBillsJobData, stdBillsFeatureData) {
         try {
             let selTree = getSelTree(lowestNodes);
             const { errMsg, parent, mainTreeFragment } = overwrite.getFragment();
@@ -497,6 +497,25 @@ const billsGuidance = (function () {
             if (!stdNode) {
                 return null;
             }
+            
+            // const jobs = billsLibObj.getBillsJobs(stdBillsJobData, stdNode);
+            // const chars = billsLibObj.getBillsFeatures(stdBillsFeatureData, stdNode);
+            const jobContents = contentOprObj.buildJobContent(billsLibObj.getBillsJobs(stdBillsJobData, stdNode));
+            const itemCharacters = characterOprObj.buildItemCharactet(billsLibObj.getBillsFeatures(stdBillsFeatureData, stdNode));
+            const jobContentTxt = [], itemCharTxt = [];
+            jobContents.sort((j1, j2)=> {
+                return j1.serialNo - j2.serialNo;
+            });
+            itemCharacters.sort((ic1, ic2)=> {
+                return ic1.serialNo - ic2.serialNo;
+            });
+            jobContents.forEach((job)=>{
+                jobContentTxt.push(job.content);
+            });
+            itemCharacters.forEach((ic)=>{
+                itemCharTxt.push(ic.character);
+            });
+
             let stdData = {};
             stdData.projectID = projectObj.project.projectInfo.ID;
             stdData.isAdd = 1;
@@ -512,6 +531,8 @@ const billsGuidance = (function () {
             stdData.comments = stdNode.data.comments;
             stdData.programID = stdNode.data.engineering;
             stdData.billsLibId = stdNode.data.billsLibId;
+            stdData.jobContentText = jobContentTxt.join('\n');
+            stdData.itemCharacterText = itemCharTxt.join('\n');
             if (stdNode.data.fixedFlag) {
                 stdData.flags = [{flag : stdNode.data.fixedFlag, fieldName : 'fixed'}];
                 stdData.flagsIndex = {fixed: {fieldName: 'fixed', flag: stdNode.data.fixedFlag}};   //前端用
@@ -1337,7 +1358,7 @@ const billsGuidance = (function () {
             }
             if (lowestNodes.length) {
                 $.bootstrapLoading.start();
-                insertBills(lowestNodes);
+                insertBills(lowestNodes, stdBillsJobData, stdBillsFeatureData);
             }
         });
     }