导入bug

web/building_saas/main/js/models/importStandardInterface.js

@@ -74,7 +74,9 @@ const ImportXML = (() => {
         //建设工程竣工档案编制费
         PROJECT_COMPLETE_ARCH_FEE:30,
         //住宅工程质量分户验收费
-        HOUSE_QUALITY_ACCEPT_FEE:31
+        HOUSE_QUALITY_ACCEPT_FEE:31,
+        //组织措施费
+        ORGANIZATION:32
     };
     //导入的文件类型，界面选的文件类型是生成项目的文件类型，这里的文件类型指的是，要导入文件的类型，
     //导入文件类型不同，导入数据不同
@@ -1083,6 +1085,7 @@ const ImportXML = (() => {
             RGJC: '{人工价差}',
             CLJC: '{材料价差}',
             JXJC: '{机械价差}',
+            JRGLF: '{甲供人工费}',
             JGCLF: '{甲供材料费}',
             JGJXF: '{甲供施工机具使用费}',
             JGZCF: '{甲供主材费}',
@@ -1115,9 +1118,10 @@ const ImportXML = (() => {
                     continue;
                 }
                 let sub = billsData.find(data => data.ParentID === bills.ID);
-                //有子项数据，则清空基数
+                //有子项数据，则清空基数，费率
                 if (sub) {
                     bills.calcBase = '';
+                    bills.feeRate = '';
                     continue;
                 }
                 //提取基数
@@ -1222,13 +1226,13 @@ const ImportXML = (() => {
                 postConstructData.engs.push(postEngData);
                 for (let j = 0; j < curEng.tenders.length; j++) {
                     let curTender = curEng.tenders[j],
-                        preTender = curEng.tenders[j - 1];
+                        preTender = postEngData.tenders[j - 1];
                     curTender.ID = IDPlaceholder.project++;
                     curTender.ParentID = curEng.ID;
                     curTender.NextSiblingID = -1;
                     curTender.property.unitPriceFile.id = IDPlaceholder.unitPriceFile++;
                     if (preTender) {
-                        preTender.NextSiblingID = curTender.ID;
+                        preTender.tender.NextSiblingID = curTender.ID;
                     }
                     //提取详细数据
                     let postTenderData = await transformTender(curTender, IDPlaceholder);
@@ -1236,7 +1240,7 @@ const ImportXML = (() => {
                     postEngData.tenders.push(postTenderData);
                 }
             }
-            //console.log(postConstructData);
+            console.log(postConstructData);
             return postConstructData;
         };
 

web/building_saas/pm/js/pm_import.js

@@ -242,6 +242,7 @@ const importView = (() => {
             valuationName: tbcObj.valuation.name,
             engineering_id: curEngineering.engineering_id,  //工程专业
             engineeringName: curEngineering.lib.name,
+            taxType: parseInt(tbcObj.taxType),    //计税方法
             isInstall: !!curEngineering.lib.isInstall,  //是安装工程?
             feeStandardName: curEngineering.lib.feeName,    //费用标准
             engineering: curEngineering.lib.engineering,    //定额取费专业
@@ -405,7 +406,7 @@ const importView = (() => {
             if (sameDepthProjs.find(node => node.data.name === xmlObj.name)) {
                 xmlObj.name += `(${moment(Date.now()).format('YYYY-MM-DD HH:mm:ss')})`;
             }
-            //console.log(xmlObj);
+            console.log(xmlObj);
             $('#importInterface').modal('hide');
             //let importData = await importXML.transformData(xmlObj);
             let pr = new SCComponent.InitProgressBar($('#progress'), $('#progress-title'), $('#progress-content'), $('#progressBar'));