取消登录回车，子目换算下拉框显示调整，打勾默认选中第一条

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

@@ -142,6 +142,10 @@ var ration_coe = {
             };
             let gljList = project.ration_glj.getGLJListByRationID(record.rationID);
             if(gljUtil.isDef(record.option_codes)&&record.option_codes!=""){ //说明编辑的是下拉选择编号的类型
+                //勾选而不是下拉的情况下，默认选择下拉框中的第一个
+                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,ext);
             }
 

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 type="button" id="login" 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>