Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

modules/complementary_ration_lib/models/compleRationModel.js

@@ -168,16 +168,18 @@ class CompleRatoinDao {
                 }
                 return 0;
             });
-            for(let glj of gljDatas){
-                hintsArr.push(` ${glj.code} ${glj.name}${glj.specs ? '   ' + glj.specs : ''} &nbsp ${glj.unit}   ${gljAmtMapping[glj.ID]}`)
-            }
-            hintsArr.push(`基价 元 ${ration.basePrice}`);
             if(ration.jobContent && ration.jobContent.toString().trim() !== ''){
-                hintsArr.push(`工作内容:`);
+                hintsArr.push(`<label class="nomargin font_blue">工作内容:`);
                 hintsArr = hintsArr.concat(ration.jobContent.split('\n'));
+                hintsArr.push("</label>")
+                hintsArr.push("");
             }
+            for(let glj of gljDatas){
+                hintsArr.push(`<label class="nomargin ${glj.gljType==4?"font_blue":""}"> ${glj.code} ${glj.name}${glj.specs ? '&nbsp;&nbsp;&nbsp;' + glj.specs : ''}&nbsp;&nbsp&nbsp;${glj.unit}&nbsp;&nbsp;&nbsp;${gljAmtMapping[glj.ID]}</label>`)
+            }
+            hintsArr.push(`基价 元 ${ration.basePrice}`);
             if(ration.annotation && ration.annotation.toString().trim() !== ''){
-                hintsArr.push(`附注:`);
+                hintsArr.push(`<br>附注:`);
                 hintsArr = hintsArr.concat(ration.annotation.split('\n'));
             }
             ration._doc.hint = hintsArr.join('<br>');
@@ -254,16 +256,18 @@ class CompleRatoinDao {
                 }
                 return 0;
             });
-            for(let glj of gljDatas){
-                hintsArr.push(` ${glj.code} ${glj.name}${glj.specs ? '&nbsp;&nbsp;&nbsp;' + glj.specs : ''}&nbsp;&nbsp&nbsp;${glj.unit}&nbsp;&nbsp;&nbsp;${gljAmtMapping[glj.ID]}`)
-            }
-            hintsArr.push(`基价 元 ${ration.basePrice}`);
             if(ration.jobContent && ration.jobContent.toString().trim() !== ''){
-                hintsArr.push(`工作内容:`);
+                hintsArr.push(`<label class="nomargin font_blue">工作内容:`);
                 hintsArr = hintsArr.concat(ration.jobContent.split('\n'));
+                hintsArr.push("</label>");
+                hintsArr.push("");
             }
+            for(let glj of gljDatas){
+                hintsArr.push(`<label class="nomargin ${glj.gljType==4?"font_blue":""}"> ${glj.code} ${glj.name}${glj.specs ? '&nbsp;&nbsp;&nbsp;' + glj.specs : ''}&nbsp;&nbsp&nbsp;${glj.unit}&nbsp;&nbsp;&nbsp;${gljAmtMapping[glj.ID]}</label>`)
+            }
+            hintsArr.push(`基价 元 ${ration.basePrice}`);
             if(ration.annotation && ration.annotation.toString().trim() !== ''){
-                hintsArr.push(`附注:`);
+                hintsArr.push(`<br>附注:`);
                 hintsArr = hintsArr.concat(ration.annotation.split('\n'));
             }
             ration._doc.hint = hintsArr.join('<br>');

modules/users/controllers/login_controller.js

@@ -202,6 +202,13 @@ class LoginController {
                 throw '接口返回数据错误';
             }
 
+            // 正确登录后 存入session
+            let userData = responseData[0];
+
+            if (userData.mobile === '') {
+                return response.json({error: 2,ssoId: userData.id});
+            }
+
             const userInfo = await userModel.findDataByAccount(account);
             if (userInfo && userInfo.upgrade_list !== undefined) {
                 for (const ul of userInfo.upgrade_list) {

web/building_saas/css/custom.css

@@ -315,4 +315,11 @@ input.text-right{
     display: none;
     color: #43CD80;
     margin-left: 8px
+}
+.font_blue{
+    color: #3FB2E5;
+}
+
+.nomargin{
+    margin: 0px;
 }

web/building_saas/main/js/views/glj_view.js

@@ -766,14 +766,15 @@ var gljOprObj = {
         return gljUtil.calcPriceDiff(glj,calcOptions);
     },
     getIndex(obj, pops){
-        let t_index = '';
+        return gljUtil.getIndex(obj,pops);
+       /* let t_index = '';
         let k_arr = [];
         for (let p of pops) {
             let tmpK = (obj[p] == undefined || obj[p] == null || obj[p] == '') ? 'null' : obj[p];
             k_arr.push(tmpK);
         }
         t_index = k_arr.join("|-|");
-        return t_index;
+        return t_index;*/
     },
     getConditionByKey(conKey){//将连接字符串转换成对象
         let valueArray = conKey.split("|-|");

web/building_saas/main/js/views/main_tree_col.js

@@ -453,14 +453,15 @@ let MainTreeCol = {
         let ration_glj = projectObj.project.ration_glj;
         let gljList = gljOprObj.filterGljByRation(node.data, ration_glj.datas);
         gljList = gljUtil.sortRationGLJ(gljList);
-        for(let glj of gljList){
-            tips += `${glj.code} ${glj.name}${glj.specs ? '&nbsp;&nbsp;&nbsp;' + glj.specs : ''}&nbsp;&nbsp&nbsp;${glj.unit}&nbsp;&nbsp;&nbsp;${glj.quantity}<br>`;
-        }
         if(node.data.content && node.data.content.toString().trim() !== ''){
-            tips += `工作内容:<br>`;
-            tips += `${node.data.content.replace(/\n/g,"<br>")}<br>`;
+            tips += `<label class="nomargin font_blue">工作内容:<br>`;
+            tips += `${node.data.content.replace(/\n/g,"<br>")}</label><br><br>`;
+        }
+        for(let glj of gljList){
+            tips += `<label class="nomargin ${glj.type==gljType.MAIN_MATERIAL?"font_blue":""}">${glj.code} ${glj.name}${glj.specs ? '&nbsp;&nbsp;&nbsp;' + glj.specs : ''}&nbsp;&nbsp&nbsp;${glj.unit}&nbsp;&nbsp;&nbsp;${glj.quantity}</label><br>`;
         }
         if(node.data.annotation && node.data.annotation.toString().trim() !== ''){
+            tips +='<br>';
             tips += `附注:<br>`;
             tips += `${node.data.annotation.replace(/\n/g,"<br>")}<br>`;
         }

web/users/js/login.js

@@ -70,6 +70,9 @@ $(document).ready(function () {
                                 $('#phonepass').modal('show');
                                 $('#proMobile').val(response.data);
                             }
+                        } else if(response.error === 2) {
+                            $('#check_ssoId').val(response.ssoId);
+                            $('#phone').modal('show');
                         } else {
                             let msg = response.msg !== undefined ? response.msg : '未知错误';
                             showError(msg, $("input"));