Jelajahi Sumber

fix: 安徽池州调整

Tony Kang 3 bulan lalu
induk
melakukan
a1fe1c691d

+ 1 - 0
modules/main/routes/main_route.js

@@ -57,6 +57,7 @@ module.exports =function (app) {
                         userID: req.session.sessionUser.id,
                         userName: req.session.sessionUser.username,
                         userCompany: req.session.sessionUser.company,
+                        userMobile: req.session.sessionUser.mobile,
                         projectData: projectData,
                         compilationName: req.session.sessionCompilation.name,
                         defaultLocation:req.session.sessionCompilation.defaultLocation,

+ 1 - 0
web/building_saas/main/html/main.html

@@ -40,6 +40,7 @@
         let userAccount = '<%- userAccount %>';
         let userID = '<%- userID %>';
         let userCompany = '<%- userCompany %>';
+        let userMobile = '<%- userMobile %>';
         let defaultLocation = '<%- defaultLocation %>';
         const USER_NAME = '<%- userName %>';
         let projectReadOnly = JSON.parse('<%- projectReadOnly %>');

+ 4 - 2
web/building_saas/standard_interface/export/anhui_chizhou.js

@@ -222,9 +222,11 @@ INTERFACE_EXPORT = (() => {
 
                 { name: '造价软件品牌', value: '纵横公路云造价' },
                 { name: '造价软件版本', value: "Ver" + VERSION },
-                { name: '造价软件加密锁编号', value: userID },
+                // { name: '造价软件加密锁编号', value: userID },
+                { name: '造价软件加密锁编号', value: `ZH${userMobile}` }, // 池州有验证码,需要用户输入这个信息,但用户不知道自己的ID,换成 ZH + 手机号
+                // 
                 { name: '计算机硬件信息', value: cpuId + diskId + macId },
-                { name: '软件公司识别码', value: $('#certifyInputForAH_CZ')[0].value },
+                { name: '软件公司识别码', value: (projectObj.project.property.boqType !== 1) ? $('#certifyInputForAH_CZ')[0].value : ''},
                 // 
             ];
             Element.call(this, '投标信息', attrs);

+ 11 - 11
web/building_saas/standard_interface/export/view.js

@@ -54,7 +54,7 @@ const EXPORT_VIEW = (() => {
         }
         const parentArea = $('#export-parent-area').val();
         const subArea = $('#export-sub-area').val();
-        if (subArea === '池州') {
+        if (subArea === '池州' && projectObj.project.property.boqType !== 1) {
           if ($('#certifyInputForAH_CZ')[0].value === null || $('#certifyInputForAH_CZ')[0].value.trim() === '') {
             throw '请输入验证码。';
           }
@@ -135,12 +135,12 @@ function bidAreaSelectChange(dom) {
     if (gxDom2 && gxDom2.length > 0) {
       gxDom2[0].style.display = "none";
     }
-  } else if (dom.options[dom.selectedIndex].text === '池州' || (dom.options[dom.selectedIndex].text === '安徽' && subArea === '池州')) {
-    $('#certifyDivForXJ')[0].style.display = "none";
+  } else if (dom.options[dom.selectedIndex].text === '新疆') {
+    //certifyDivForXJ
+    $('#certifyDivForXJ')[0].style.display = "";
     $('#certifyDivForGX')[0].style.display = "none";
-    $('#certifyDivForAH_CZ')[0].style.display = "";
-    $('#certifyInputForAH_CZ')[0].value = '';
-    //
+    $('#certifyDivForAH_CZ')[0].style.display = "none";
+    $('#certifyInputForXJ')[0].value = '';
     let gxDom1 = $('#lblTtlDiv');
     if (gxDom1 && gxDom1.length > 0) {
       gxDom1[0].style.display = "none";
@@ -149,12 +149,12 @@ function bidAreaSelectChange(dom) {
     if (gxDom2 && gxDom2.length > 0) {
       gxDom2[0].style.display = "none";
     }
-  } else if (dom.options[dom.selectedIndex].text === '新疆') {
-    //certifyDivForXJ
-    $('#certifyDivForXJ')[0].style.display = "";
+  } else if (projectObj.project.property.boqType !== 1 && (dom.options[dom.selectedIndex].text === '池州' || (dom.options[dom.selectedIndex].text === '安徽' && subArea === '池州'))) {
+    $('#certifyDivForXJ')[0].style.display = "none";
     $('#certifyDivForGX')[0].style.display = "none";
-    $('#certifyDivForAH_CZ')[0].style.display = "none";
-    $('#certifyInputForXJ')[0].value = '';
+    $('#certifyDivForAH_CZ')[0].style.display = "";
+    $('#certifyInputForAH_CZ')[0].value = '';
+    //
     let gxDom1 = $('#lblTtlDiv');
     if (gxDom1 && gxDom1.length > 0) {
       gxDom1[0].style.display = "none";