Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/main/routes/main_route.js

@@ -13,6 +13,7 @@ const billsUnitPriceFeatureFacade = require("../../std_bills_unitprice_feature_l
 let config = require("../../../config/config.js");
 const { getTitle } = require("../../../public/titleUtil");
 
+
 module.exports =function (app) {
     const baseController = new BaseController();
     app.get('/main', baseController.init, function(req, res) {
@@ -48,12 +49,14 @@ module.exports =function (app) {
                 // console.log(featureLibs);
 
                 let billsUnitPriceFeature = (featureLibs && featureLibs.length > 0)?featureLibs[featureLibs.length - 1]:null;
-        
+                // console.log(req.session.sessionUser);
+            
                 res.render('building_saas/main/html/main.html',
                     {
                         userAccount: req.session.userAccount,
                         userID: req.session.sessionUser.id,
                         userName: req.session.sessionUser.username,
+                        userCompany: req.session.sessionUser.company,
                         projectData: projectData,
                         compilationName: req.session.sessionCompilation.name,
                         defaultLocation:req.session.sessionCompilation.defaultLocation,

modules/users/controllers/cld_controller.js

@@ -167,6 +167,21 @@ class CLDController {
         }
     }
 
+    async updateUserCompany(request, response) {
+        let ssoID = request.body.ssoId;
+        let newCompany = request.body.company;
+        let condition = {ssoId: ssoID};
+        let updateData = {
+            company: newCompany
+        };
+        let result = await userModel.updateUser(condition, updateData);
+        if (result) {
+            response.json({error: 0, msg: 'success'});
+        } else {
+            throw '更新失败';
+        }
+    }
+
     /**
      * 获取编办列表
      *

modules/users/routes/cld_route.js

@@ -24,6 +24,8 @@ module.exports = function (app) {
 
     router.post('/setUserUpgrade', cldController.setUsersUpgrade);
 
+    router.post('/updateUserCompany', cldController.updateUserCompany);
+
     router.get('/getUsersInfo', cldController.getUsersInfo);
 
     router.get('/getUserList', cldController.getUserList);

web/building_saas/main/html/main.html

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

web/building_saas/standard_interface/config.js

@@ -114,9 +114,9 @@ const INTERFACE_CONFIG = (() => {
     '山东@山东': {
       scriptName: 'shandong_common.js',
       fileSuffix: {
-        [BID_INVITATION]: '.XML',
-        [BID_SUBMISSION]: '.XML',
-        [CONTROL]: '.XML',
+        [BID_INVITATION]: '.sdjtzb',
+        [BID_SUBMISSION]: '.sdjttb',
+        [CONTROL]: '.sdjtkzj',
       },
     },
     '新疆@新疆': {

web/building_saas/standard_interface/export/shandong_common.js

@@ -284,7 +284,8 @@ INTERFACE_EXPORT = (() => {
         //投标的时候取基本信息的makeData字段
         if(isBidSubmission) makeData = _.find(baseInfo.items, { "key": "makeDate" });
         // 取编制软件序列号所属单位。读取项目属性-建设项目基本信息的“投标单位”字段。该字段需要模板中新增。等确定后再修改
-        let softwareNumHolder = _.find(baseInfo.items, { "key": "???" });
+        // let softwareNumHolder = _.find(baseInfo.items, { "key": "???" });
+        let softwareNumHolder = userCompany; // userCompany是在main界面上已经有现成的(类似userAccount, userID)
         let hardID = UTIL.generateHardwareId();
         let [cpuId, diskId, macId] = hardID.split(";");
         const orgScretInfoStr = `SoftwareName=纵横公路工程造价管理软件,SoftwareVer=V${VERSION},SoftwareCompany=珠海纵横创新软件有限公,SoftwareNumber=${userID},HardNumber=${diskId},MacAddress=${macId},SoftwareNumberHolder=${softwareNumHolder}`

web/users/html/user-info.html

@@ -49,7 +49,7 @@
                     <form id="info-form" method="post" action="/user/info">
                         <div class="form-group">
                             <label class="form-control-label">企业名称</label>
-                            <input class="form-control" value="<%= userData.company %>" placeholder="输入您的企业名称" id="company" name="company" autocomplete="off">
+                            <input class="form-control" value="<%= userData.company %>" placeholder="输入您的企业名称" id="company" name="company" autocomplete="off" disabled>
                         </div>
                         <div class="form-group">
                             <label class="form-control-label">企业所在地区</label>