Browse Source

报表调价

TonyKang 5 years ago
parent
commit
a5422ade1d
2 changed files with 6 additions and 2 deletions
  1. 1 1
      config/config.js
  2. 5 1
      modules/main/models/ration.js

File diff suppressed because it is too large
+ 1 - 1
config/config.js


+ 5 - 1
modules/main/models/ration.js

@@ -24,7 +24,11 @@ class rationModel extends baseModel {
             if (!err) {
             if (!err) {
                 if (isReport){
                 if (isReport){
                     for (let i = 0; i < datas.length; i++) {
                     for (let i = 0; i < datas.length; i++) {
-                        if(datas[i]._doc.rationQuantityCoe&&datas[i]._doc.rationQuantityCoe!="")datas[i]._doc.quantity = datas[i]._doc.quantity* parseFloat(datas[i]._doc.rationQuantityCoe);
+                        if (datas[i]._doc.rationQuantityCoe !== null && datas[i]._doc.rationQuantityCoe !== undefined && datas[i]._doc.rationQuantityCoe !== '' && datas[i]._doc.rationQuantityCoe !== 0) {
+                            //如有调价,则需要改动
+                            datas[i]._doc.quantity = parseFloat(datas[i]._doc.quantity) * parseFloat(datas[i]._doc.rationQuantityCoe);
+                            datas[i]._doc.contain = parseFloat(datas[i]._doc.contain) * parseFloat(datas[i]._doc.rationQuantityCoe);
+                        }
                         let fees = datas[i]._doc.fees;
                         let fees = datas[i]._doc.fees;
                         if (fees){
                         if (fees){
                             for (let i = 0; i < fees.length; i++) {
                             for (let i = 0; i < fees.length; i++) {