Browse Source

调整单位选择窗口样式

MaiXinRong 7 years ago
parent
commit
af960a9052

+ 3 - 3
web/building_saas/main/html/main.html

@@ -541,15 +541,15 @@
     </div>
     <!--弹出清单单位选择设置-->
     <div class="modal fade" id="std_bills_unit" data-backdrop="static">
-        <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title"><i class="fa fa-table"></i> 请选择清单计量单位</h5>
+                    <h5 class="modal-title"><i class="fa fa-superscript"></i> 请选择清单计量单位</h5>
                     <button type="button" class="close" id='std_bills_unit_close' aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
-                <div class="modal-body modal-auto-height" id="std_bills_unit_spread" style="height: 200px; overflow: hidden;">
+                <div class="modal-body modal-auto-height" id="std_bills_unit_spread" style="height: 200px; width: 500px; overflow: hidden;">
                 </div>
                 <div class="modal-footer">
                     <a href="javascript:void(0);" id="std_bills_unit_ok" class="btn btn-primary">确定</a>

+ 4 - 3
web/building_saas/main/js/views/confirm_modal.js

@@ -74,8 +74,9 @@ let ConfirmModal = {
         },
         check: function (std, okCallBack, cancelCallBack) {
             if (!this.spread) {
-                this.spread = SheetDataHelper.createNewSpread($('#std_bills_unit_spread')[0]);
-                SheetDataHelper.loadSheetHeader(this.setting, ConfirmModal.stdBillsUnit.spread.getActiveSheet());
+                this.spread = SheetDataHelper.createNewSpread($('#std_bills_unit_spread')[0], {sheetCount: 1});
+                this.spread.options.showScrollTip = GC.Spread.Sheets.ShowScrollTip.vertical;
+                SheetDataHelper.loadSheetHeader(this.setting, this.spread.getActiveSheet());
             }
             let sheet = ConfirmModal.stdBillsUnit.spread.getActiveSheet();
             let modalObj = this.modalObj;
@@ -102,7 +103,7 @@ let ConfirmModal = {
                 datas.push({'code': std.code, 'name': std.name, 'unit': unit});
             }
             SheetDataHelper.loadSheetData(this.setting, sheet, datas);
-            this.modalObj.modal({backdrop: false, keyboard: false});  
+            this.modalObj.modal('show');  
             ConfirmModal.stdBillsUnit.spread.refresh();  
         }
     }