Explorar el Código

支付审批报表导出PDF出错问题

Tony Kang hace 11 meses
padre
commit
69d69e4a36
Se han modificado 2 ficheros con 20 adiciones y 2 borrados
  1. 4 0
      app/view/payment/detail.ejs
  2. 16 2
      app/view/report/index.ejs

+ 4 - 0
app/view/payment/detail.ejs

@@ -252,6 +252,10 @@
         "continuousOutput": true
     }
 
+    function getStageStatus() {
+        // if (current_stage_status === 3 || ppStatus === 3) return 3
+        return current_stage_status;
+    }
     let zTreeOprObj = {
         _chkPrePayStatus: function() {
             return -1;

+ 16 - 2
app/view/report/index.ejs

@@ -46,11 +46,19 @@
                     </div>
                 </div> -->
                 <% if (false || ![-100, -200, -300, -301, -302, -303].includes(stg_id)) { %>
-                <div class="d-inline-block" id="divSelectableStages_up">
+                <div class="d-inline-block" id="divSelectableBizs_up">
                     <div class="dropdown" id="divSelectableStages">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentStage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="optionSelectableStages"></div>
                     </div>
+                    <div class="dropdown" id="divSelectableAdvancePays" style="display:none;">
+                        <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentAdvancePay" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="optionSelectableAdvancePays"></div>
+                    </div>
+                    <div class="dropdown" id="divSelectableMaterials" style="display:none;">
+                        <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentMaterial" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="optionSelectableMaterials"></div>
+                    </div>
                 </div>
                 <% } %>
                 <% if (stg_id === -200 || ![-100, -300, -301, -302, -303].includes(stg_id)) { %>
@@ -385,18 +393,24 @@
         if (type === 'stage') {
             // 计量期
             $('#divSelectableStages').show();
+            $('#divSelectableAdvancePays').hide();
+            $('#divSelectableMaterials').hide();
             $('#biz-prepay-item').hide();
             $('#report_selects_ul').show();
             $('#divPresets').show();
         } else if (type === 'change_prepay') {
             // 预付款
             $('#divSelectableStages').hide();
+            $('#divSelectableAdvancePays').show();
+            $('#divSelectableMaterials').hide();
             $('#biz-prepay-item').show();
             $('#report_selects_ul').hide();
             $('#divPresets').hide();
         } else if (type === 'change_material_adjustment') {
             // 材料调差
-            $('#divSelectableStages').show();
+            $('#divSelectableStages').hide();
+            $('#divSelectableAdvancePays').hide();
+            $('#divSelectableMaterials').show();
             $('#biz-prepay-item').hide();
             $('#report_selects_ul').hide();
             $('#divPresets').hide();