Prechádzať zdrojové kódy

fix: 浙江养护、浙江接口导入问题

vian 4 rokov pred
rodič
commit
d3c871c167

+ 1 - 1
modules/pm/controllers/pm_controller.js

@@ -1052,7 +1052,7 @@ module.exports = {
     getImportTemplateData: async function (req, res) {
         try {
             const data = JSON.parse(req.body.data);
-            const templateData = await pm_facade.getImportTemplateData(req.session.sessionCompilation._id, data.feeName, data.valuationID, data.projectCount);
+            const templateData = await pm_facade.getImportTemplateData(req.session.sessionCompilation._id, data.valuationID, data.projectCount);
             callback(req, res, 0, 'success', templateData);
         } catch (err) {
             callback(req, res, 1, err, null);

+ 2 - 2
modules/pm/facade/pm_facade.js

@@ -2640,8 +2640,8 @@ async function getBasicInfo(compilationID, fileKind = null) {
 }
 
 // 获取导入接口功能的模板数据,用于将导入数据与模板数据进行合并生成新的项目
-async function getImportTemplateData(compilationID, feeName, valuationID, projectCount) {
-    const engineeringLib = await engineeringModel.findOne({ feeName, valuationID }).lean();
+async function getImportTemplateData(compilationID, valuationID, projectCount) {
+    const engineeringLib = await engineeringModel.findOne({ valuationID }).lean();
     if (!engineeringLib) {
         return null;
     }

+ 3 - 3
web/building_saas/pm/js/pm_newMain.js

@@ -342,11 +342,11 @@ const projTreeObj = {
                 return compilationData && names.includes(compilationData.name);
             },
             callback: function () {
-                CommonHeader.doAfterValidateVersion(
+                /* CommonHeader.doAfterValidateVersion(
                     () => $('#interface-import-modal').modal('show'),
                     () => alert(`${commonUtil.getVersionText()}不提供此功能。`)
-                );
-                //$('#interface-import-modal').modal('show');
+                ); */
+                $('#interface-import-modal').modal('show');
             }
         },
         manageFiles: {

+ 2 - 2
web/building_saas/standard_interface/import/base.js

@@ -444,8 +444,8 @@ const INTERFACE_EXPORT_BASE = (() => {
       throw '导入的文件中不存在有效的标段数据。';
     }
     const projectCount = 1 + importData.tenders.length;
-    const feeName = compilationData.name === '安徽养护(2018)' ? '安徽养护' : '公路工程';
-    const templateData = await ajaxPost('/pm/api/getImportTemplateData', { user_id: userID, valuationID, feeName, projectCount });
+    // const feeName = compilationData.name === '安徽养护(2018)' ? '安徽养护' : '公路工程';
+    const templateData = await ajaxPost('/pm/api/getImportTemplateData', { user_id: userID, valuationID, projectCount });
     if (!templateData) {
       throw '无法获取有效模板数据。';
     }