bug

public/scHintBox.html

@@ -12,7 +12,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 id="hintBox_title" class="modal-title">标题</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="hintBox_btn_cross">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -68,6 +68,7 @@
             $('#hintBox_btn_yes').hide();
             $('#hintBox_btn_no').hide();
             $('#hintBox_btn_cancel').hide();
+            $('#hintBox_btn_cross').show();
         },
         font: function(str){
             return `<span style='color:red;font-weight:bold;font-size:15px'> ${str} </span>`;
@@ -78,8 +79,10 @@
             $("#hintBox_value").focus();
             $("#hintBox_value").select();
         },
-        infoBox: function (title, caption, btnType, doYes, doNo, btnTextArr) {
+        infoBox: function (title, caption, btnType, doYes, doNo, btnTextArr, showCrossBtn = true) {
             this.init();
+            if (!showCrossBtn)
+                $('#hintBox_btn_cross').hide();
             $('#hintBox_title').text(title);
             $('#hintBox_caption').html(caption);
             $('#hintBox_caption').show();

web/building_saas/main/js/models/calc_program.js

@@ -1936,8 +1936,16 @@ class CalcProgram {
         };
 
         let coe = (treeNode.data.targetTotalFee / treeNode.data.feesIndex.common.totalFee).toDecimal(decimalObj.process);
-        if (treeNode.data.rationQuantityCoe != coe){
-            treeNode.data.rationQuantityCoe = coe;
+        if (tender == tenderTypes.ttReverseRation){
+            if (treeNode.data.rationQuantityCoe != coe){
+                treeNode.data.rationQuantityCoe = coe;
+                treeNode.changed = true;
+            };
+        }else if (tender == tenderTypes.ttReverseGLJ){
+            let coeObj = treeNode.data.quantityCoe;
+            for (let pn in coeObj){
+                coeObj[pn] = coe;
+            }
             treeNode.changed = true;
         };