Ver código fonte

核减bug修改

chenjun 10 meses atrás
pai
commit
6a939bd126

+ 2 - 2
zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -421,12 +421,12 @@
             }
             let amount = Number(previousAmount) + Number(bz2);
 
-            if(Number(postData.createReqVO.totalAmount).toFixed(2) > Number(amount).toFixed(2)){
+            if(Number(Number(postData.createReqVO.totalAmount).toFixed(2)) > Number(Number(amount).toFixed(2))){
                 all({success: false, errorMsg: "核减后金额不能大于原来金额!"});
                 return;
             }
             //发生金额变化
-            if(Number(postData.createReqVO.totalAmount).toFixed(2) != Number(previousAmount).toFixed(2)){
+            if(Number(Number(postData.createReqVO.totalAmount).toFixed(2)) != Number(Number(previousAmount).toFixed(2))){
                 let num = Number(amount) - Number(postData.createReqVO.totalAmount);
                 postData.createReqVO.bz3 = '发生了核减:'+'核减'+num.toFixed(2)+'(元)';
                 postData.createReqVO.bz2 = num.toFixed(2);

+ 2 - 2
zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -415,12 +415,12 @@
             }
             let amount = Number(previousAmount) + Number(bz2);
 
-            if(Number(postData.createReqVO.totalAmount).toFixed(2) > Number(amount).toFixed(2)){
+            if(Number(Number(postData.createReqVO.totalAmount).toFixed(2)) > Number(Number(amount).toFixed(2))){
                 all({success: false, errorMsg: "核减后金额不能大于原来金额!"});
                 return;
             }
             //发生金额变化
-            if(Number(postData.createReqVO.totalAmount).toFixed(2) != Number(previousAmount).toFixed(2)){
+            if(Number(Number(postData.createReqVO.totalAmount).toFixed(2)) != Number(Number(previousAmount).toFixed(2))){
                 let num = Number(amount) - Number(postData.createReqVO.totalAmount);
                 postData.createReqVO.bz3 = '发生了核减:'+'核减'+num.toFixed(2)+'(元)';
                 postData.createReqVO.bz2 = num.toFixed(2);

+ 5 - 5
zjugis-business/src/main/resources/templates/TravelCost/js/index.js

@@ -664,7 +664,7 @@
         }
 
         amount = amount.toFixed(2)
-        if (amount >= 0) {
+        if (Number(amount) >= 0) {
             z.ui.input("[name='createReqVO$totalBoatCarCost']").setValue(amount);
         }
     }
@@ -683,7 +683,7 @@
 
         amount = amount.toFixed(2)
         carAmount = carAmount.toFixed(2)
-        if (amount >= 0) {
+        if (Number(amount) >= 0) {
             z.ui.input("[name='createReqVO$totalOtherCost']").setValue(amount);
             z.ui.input("[name='createReqVO$totalCityCarCost']").setValue(carAmount);
         }
@@ -703,7 +703,7 @@
 
         amount += Number(subsidyAmount);
         amount = amount.toFixed(2)
-        if (amount >= 0) {
+        if (Number(amount) >= 0) {
             z.ui.input("[name='createReqVO$totalAmount']").setValue(amount);
             z.ui.input("[name='createReqVO$totalAmountCn']").setValue(convertCurrency(amount));
         }
@@ -939,12 +939,12 @@
                 bz2 = 0;
             }
             let amount = Number(previousAmount) + Number(bz2);
-            if (Number(postData.createReqVO.totalAmount).toFixed(2) > Number(amount).toFixed(2)) {
+            if (Number(Number(postData.createReqVO.totalAmount).toFixed(2)) > Number(Number(amount).toFixed(2))) {
                 all({success: false, errorMsg: "核减后金额不能大于原来金额!"});
                 return;
             }
             //发生金额变化
-            if (Number(postData.createReqVO.totalAmount).toFixed(2) != Number(previousAmount).toFixed(2)) {
+            if (Number(Number(postData.createReqVO.totalAmount).toFixed(2)) != Number(Number(previousAmount).toFixed(2))) {
                 let num = Number(amount) - Number(postData.createReqVO.totalAmount);
                 postData.createReqVO.bz3 = '发生了核减:' + '核减' + num + '(元)';
                 postData.createReqVO.bz2 = num;