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

web/building_saas/main/js/models/ration_coe.js

@@ -143,9 +143,12 @@ var ration_coe = {
             };
             let gljList = project.ration_glj.getGLJListByRationID(record.rationID);
             if(gljUtil.isDef(record.option_codes)&&record.option_codes!=""){ //说明编辑的是下拉选择编号的类型
-                this.prepareDataForOptionType(record,newval,gljList,updateData,replace,codesList,ext);
+                //勾选而不是下拉的情况下，默认选择下拉框中的第一个
+                if(newval == 1 && (!gljUtil.isDef(doc.select_code)||doc.select_code == '')){
+                    if(record.option_list&&record.option_list.length > 0) doc.select_code = record.option_list[0].value;
+                }
+                this.prepareDataForOptionType(record,newval,gljList,updateData,replace,codesList,doc);
             }
-
             for(let coe of record.coes){//做单个、替换等检查
                 if(coe.coeType == "单个工料机"){ //单个工料机的情况
                     let glj = _.find(gljList,{"code":coe.gljCode});

web/building_saas/main/js/views/zmhs_view.js

@@ -174,7 +174,7 @@ let zmhs_obj = {
     getComboBoxForCodes:function (coe,i) {
         this.coeSheet.getCell(i, 1, GC.Spread.Sheets.SheetArea.viewport).locked(false);
         let options = coe.option_list; //coe.option_codes.split("|");
-        let combo = sheetCommonObj.getDynamicCombo(true);
+        let combo =  new GC.Spread.Sheets.CellTypes.ComboBox();//sheetCommonObj.getDynamicCombo(true);  2019-4-1 这里用普通的下拉框，一直显示
         let buttonRow =  this.coeSheet.getViewportBottomRow(1);
         combo.editorValueType(GC.Spread.Sheets.CellTypes.EditorValueType.value);
         combo.items(options).maxDropDownItems(buttonRow - i -1 < 3 ?3:buttonRow - i -1 );//itemHeight(options.length).

web/users/html/login.html

@@ -37,7 +37,7 @@
                 <div id="captcha-box"></div>
             </div>
             <div class="form-group btn-area" style="display: none;">
-                <button id="login" class="btn btn-primary btn-block">登录</button>
+                <button id="login" type="button" class="btn btn-primary btn-block">登录</button>
             </div>
             <div class="pt-1 d-flex justify-content-center">
                 <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
@@ -118,7 +118,8 @@
                     <h5 class="modal-title">验证码安全登录</h5>
                 </div>
                 <div class="modal-body">
-                    <p class="">您是专业版用户，为您提供手机验证码安全登录。</p>
+                    <p class="">请您提供手机验证码进行安全登录。</p>
+                    <p class="">请点击“获取验证码”，验证码将发送至手机<span id="pro_mobile"></span>，注意查收。</p>
                     <div class="form-row">
                         <div class="form-group col-md-8">
                             <input type="text" class="form-control" id="smsCode" placeholder="输入验证码">

web/users/js/login.js

@@ -69,6 +69,7 @@ $(document).ready(function () {
                             } else {
                                 $('#phonepass').modal('show');
                                 $('#proMobile').val(response.data);
+                                $('#pro_mobile').text(response.data.substr(0, 3) + '****' + response.data.substr(7, 11));
                             }
                         } else if(response.error === 2) {
                             $('#check_ssoId').val(response.ssoId);