TASK #4805 依测试反馈调整

app/public/report/js/rpt_main.js

@@ -1449,7 +1449,9 @@ function downloadReport(urls) {
 }
 
 function getStageStatus() {
-    if (current_stage_id > 0 || current_stage_id === -1) {
+    if (current_advance_id > -1 || current_material_id > 0) {
+        return 3;
+    } else if (current_stage_id > 0 || current_stage_id === -1) {
         let ppStatus = zTreeOprObj._chkPrePayStatus();
         if (ppStatus === 3) {
             return ppStatus

app/view/report/index.ejs

@@ -403,6 +403,10 @@
             $('#biz-prepay-item').hide();
             $('#report_selects_ul').show();
             $('#divPresets').show();
+            current_advance_id = -1;
+            current_material_id = -1;
+            // 还有归档按钮处理
+            rptArchiveObj.toggleBtn(true);
         } else if (type === 'change_prepay') {
             // 预付款
             $('#divSelectableStages').hide();
@@ -412,9 +416,12 @@
             $('#report_selects_ul').hide();
             $('#divPresets').hide();
             // 要触发一下
+            current_advance_id = -1;
+            current_material_id = -1;
             if (current_advance_id === -1) {
                 advancePayClick( $('#prepay-select-item a')[0]);
             }
+            rptArchiveObj.toggleBtn(true);
         } else if (type === 'change_material_adjustment') {
             // 材料调差
             $('#divSelectableStages').hide();
@@ -424,9 +431,12 @@
             $('#report_selects_ul').hide();
             $('#divPresets').hide();
             // 要触发一下
+            current_advance_id = -1;
+            current_material_id = -1;
             if (current_material_id === -1) {
                 buildMaterialSelection();
             }
+            rptArchiveObj.toggleBtn(true);
         }
         filterReportsByType();
     });
@@ -503,7 +513,13 @@
     const ALL_CHANGES = <%- changes %>;
     const BGL_OBJ = <%- bglObj %>;
     const ADVANCE_LIST = <%- advanceList %>;
+    ADVANCE_LIST.sort(function(a1, a2) {
+        return a1.order - a2.order;
+    });
     const MATERIAL_LIST = <%- materialAdjList %>;
+    MATERIAL_LIST.sort(function(m1, m2) {
+        return m1.order - m2.order;
+    });
     const CHANGE_ID = BGL_OBJ?.change?.cid || '-1';
     const CHANGE_TIMES = BGL_OBJ?.change?.times || 1;
     const BUSINESS_ID = BGL_OBJ?.BUSINESS_ID || '-1';
@@ -827,6 +843,11 @@
         current_material_id = +ele.attributes[3].value;
         $('#optionSelectableMaterials').siblings('button').text($(ele).text());
         // 刷新报表模板
+        zTreeOprObj.onClick(null, null, zTreeOprObj.currentNode);
+        zTreeOprObj.countChkedRptTpl();
+        if (zTreeOprObj.currentNode) {
+            zTreeOprObj.treeObj.selectNode(zTreeOprObj.currentNode, false);
+        }
     }
 
     function changeCurrentAdvance(ele) {
@@ -836,6 +857,11 @@
         current_advance_id = +ele.attributes[3].value;
         $('#optionSelectableAdvancePays').siblings('button').text($(ele).text());
         // 刷新报表模板
+        zTreeOprObj.onClick(null, null, zTreeOprObj.currentNode);
+        zTreeOprObj.countChkedRptTpl();
+        if (zTreeOprObj.currentNode) {
+            zTreeOprObj.treeObj.selectNode(zTreeOprObj.currentNode, false);
+        }
     }
 
     function changeCurrentStage(ele) {