소스 검색

feat: 导出清单精灵排版数据按钮位置调整

vian 3 년 전
부모
커밋
ee2aa0e0b3

+ 1 - 1
web/maintain/billsGuidance_lib/html/zhiyin.html

@@ -69,6 +69,7 @@
                                     <button id="searchBillBtn" class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
                                 </span>
                                 </div>
+                                <a id="buildExcel" href="javascript:void(0);" class="btn btn-sm"><i class="fa fa-sign-out" aria-hidden="true"></i> 导出excel</a>
                                
                             </div>
                             <div id="searchBillsResult" style="display: none;">
@@ -99,7 +100,6 @@
                                   <a id="upMove" href="javascript:void(0);" class="btn btn-sm lock-btn-control" data-toggle="tooltip" data-placement="bottom" title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                                   <a id="editMaterial" href="javascript:void(0);" class="btn btn-sm"><i class="fa fa-edit" aria-hidden="true"></i> 配置材料</a>
                                   <a id="expandContract" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="收起定额"><i class="fa fa-minus-square-o" aria-hidden="true"></i> 收起定额</a>
-                                  <a id="buildExcel" href="javascript:void(0);" class="btn btn-sm"><i class="fa fa-sign-out" aria-hidden="true"></i> 导出excel</a>
                                   <!-- <a id="generate-class" href="javascript:void(0);" class="btn btn-sm lock-btn-control" data-toggle="tooltip" data-placement="bottom" title="生成分类">测试生成分类算法</a> -->
                               </div>
                           </div>

+ 1 - 1
web/maintain/billsGuidance_lib/js/billsGuidance.js

@@ -2304,7 +2304,7 @@ const billsGuidance = (function () {
             }
         });
         $("#excel-modal").on('hidden.bs.modal', function () {
-            $('#excel-info').text(`导出清单中:`);
+            $('#excel-info').text(`导出排版中:`);
             $('#excel-spread').hide();
             $('#export-excel-confirm').hide();
             $('#excel-dialog').width('500px');

+ 1 - 1
web/maintain/billsGuidance_lib/js/exportExcel.js

@@ -155,7 +155,7 @@ class ExportExcel {
 
   // 更新进度信息
   updateProcessInfo() {
-    this.$info.text(`导出清单中: ${this.curProcessCount} / ${this.total}`)
+    this.$info.text(`导出排版中: ${this.curProcessCount} / ${this.total}`)
   }
 
   // 精灵树数据转换为表格块单元格数据