Browse Source

feat: 导入Excel清单,下载示例1、下载示例2,分别改名为“下载通用Excel格式”、“下载分部分项计价表格式”

TASK #3507
vian 4 years atrás
parent
commit
542fd5c90c

+ 12 - 2
web/building_saas/main/html/main.html

@@ -2016,8 +2016,18 @@
         </div>
         <div class="modal-footer inline-wrapper">
           <div class="inline-tools">
-            <button type="button" class="btn btn-primary" id="uploadExample-general">下载示例1</button>
-            <button type="button" class="btn btn-primary" id="uploadExample">下载示例2</button>
+            <div class="inline-tools btn-group" id="example-general">
+              <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                下载示例 <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">
+                <li><a class="dropdown-item" href="javascript:;" id="uploadExample-general">下载通用Excel格式</a></li>
+                <li><a class="dropdown-item" href="javascript:;" id="uploadExample-lj">下载分部分项计价表格式</a></li>
+              </ul>
+            </div>
+            <div class="inline-tools hide-area" id="example-gld">
+              <button type="button" class="btn btn-primary" id="uploadExample-gld">下载示例</button>
+            </div>
           </div>
           <div class="inline-tools">
             <a href="javascript:void(0);" class="btn btn-primary" id="importConfirm">确定导入</a>

+ 10 - 4
web/building_saas/main/js/views/project_view.js

@@ -3079,13 +3079,13 @@ const uploadType = {general: 'general', lj: 'lj', gld: 'gld'};
 let fileType = uploadType.lj;
 
 $('#uploadLj').click(function () {
-    $('#uploadExample-general').show();
-    $('#uploadExample').text('下载示例2');
+    $('#example-gld').hide();
+    $('#example-general').show();
     fileType = uploadType.lj;
 });
 $('#uploadGld').click(function () {
-    $('#uploadExample-general').hide();
-    $('#uploadExample').text('下载示例');
+    $('#example-general').hide();
+    $('#example-gld').show();
     fileType = uploadType.gld;
 });
 
@@ -3329,6 +3329,12 @@ $('#uploadExample-general').click(function () {
 $('#uploadExample').click(function () {
     window.location.href = `/bills/downloadExamp?type=${fileType === uploadType.lj ? uploadType.lj : uploadType.gld}`;
 });
+$('#uploadExample-lj').click(function () {
+    window.location.href = `/bills/downloadExamp?type=${uploadType.lj}`;
+});
+$('#uploadExample-gld').click(function () {
+    window.location.href = `/bills/downloadExamp?type=${uploadType.gld}`;
+});
 
 $(function () {
     //清空导入清单选择文件