导入下拉选择工程专业bug

web/building_saas/main/js/models/exportStandardInterface.js

@@ -2498,7 +2498,7 @@ const XMLStandard = (function () {
             });
         };
         /*
-         * 导出数据
+         * 转换导出数据
          * @param {Number}tenderID(当前界面的单位工程ID，后台根据这个单位工程，根据导出粒度去找其建设项目下相关数据)
          * @param {Number}curExportKind(导出的文件类型：1-投标 2-招标 3-控制价)
          * @return {void}
@@ -2515,7 +2515,7 @@ const XMLStandard = (function () {
             }
             this.originalDatas.push({data: this.datas, fileName: `重庆标准交换数据(${FILE_KIND[exportKind]}).QTF`});
         };
-        //导出文件
+        //将转换的数据导出文件
         this.exportFile = async function () {
             let fileDatas = [];
             //源数据转换成blob

web/building_saas/pm/js/pm_import.js

@@ -171,8 +171,6 @@ const importView = (() => {
             $('#tbc-engineering').empty();  //清空工程专业选项
             $('#tbc-feeStandard').empty();  //清空费用标准选项
             $('#tbc-calcProgram').empty();  //清空计算程序选项
-            //
-            //let engineerings = this.engineeringList.filter(data => data.lib.name === tenderData.engineering);
             let engineerings = [];
             if (tenderData.temp.engineering) {
                 engineerings = this.engineeringList.filter(data => data.lib.name === tenderData.temp.engineering);
@@ -182,7 +180,8 @@ const importView = (() => {
             }
             //文件里的工程专业跟软件里的对应不上，取第一个
             if (!engineerings.length) {
-                engineerings = this.engineeringList.filter(data => data.lib.seq === 1) || [this.engineeringList[0]];
+                let firstEngineering = this.engineeringList[0];
+                engineerings = this.engineeringList.filter(data => data.lib.name === firstEngineering.lib.name);
                 tenderData.temp.engineering = engineerings[0] ? engineerings[0].lib.name : tenderData.engineering;
             }
             if (!engineerings.length) {
@@ -210,38 +209,6 @@ const importView = (() => {
             $('#tbc-calcProgram').html(calcOptsHtml);
             tenderData.temp.calcProgram = $('#tbc-calcProgram').val();
         }
-        /*initFeeOpts(tenderData) {
-            $('#tbc-engineering').empty();  //清空工程专业选项
-            $('#tbc-feeStandard').empty();  //清空费用标准选项
-            $('#tbc-calcProgram').empty();  //清空计算程序选项
-            //工程专业
-            let engineerings = this.engineeringList.filter(data => data.lib.name === tenderData.engineering);
-            if (!engineerings.length) {
-                return;
-            }
-            /!*let engineeringHtml = this.engineeringList.map(data =>
-                `<option ${tenderData.engineering === data.lib.name ? 'selected' : ''} value="${data.lib.name}">${data.lib.name}</option>`);
-            $('#tbc-engineering').html(engineeringHtml);*!/
-            $('#tbc-engineering').html(`<option selected value="${tenderData.engineering}">${tenderData.engineering}</option>`);
-            //费用标准，若当前工程有费用标准数据（该数据本身没有费用标准数据，选择过了，就会记录），则选中该费用标准
-            let feeOptsHtml = engineerings.map(data =>
-                `<option ${tenderData.temp.feeStandard === data.lib.feeName ? 'selected' : ''} value="${data.lib.feeName}">${data.lib.feeName}</option>`).join('');
-            $('#tbc-feeStandard').html(feeOptsHtml);
-            if (!tenderData.temp.feeStandard) { //记录选中的费用标准
-                tenderData.temp.feeStandard = $('#tbc-feeStandard').val();
-            }
-            //根据工程专业及费用标准确定的当前选中的工程专业库
-            let curEngineering = engineerings.find(data => data.lib.feeName === tenderData.temp.feeStandard) || engineerings[0];
-            //根据计税方法过滤出来的计税组合
-            let taxDatas = curEngineering.lib.tax_group.filter(data => data.taxType == this.taxType);
-            //计算程序，若当前工程有计算程序（该数据本身没有计算程序数据，选择过了，就会记录），则选中该计算程序
-            let calcOptsHtml = taxDatas.map(data =>
-                `<option ${tenderData.temp.calcProgram === data.program_lib.name ? 'selected' : ''} value="${data.program_lib.name}">${data.program_lib.name}</option>`);
-            $('#tbc-calcProgram').html(calcOptsHtml);
-            if (!tenderData.temp.calcProgram) {
-                tenderData.temp.calcProgram = $('#tbc-calcProgram').val();
-            }
-        }*/
     }
     /*
      * 根据条件获取计税组合数据