cqpCow 1 year ago
parent
commit
647367a7ae
4 changed files with 42 additions and 42 deletions
  1. 5 5
      app/Service/PurchaseOrderService.php
  2. 5 5
      app/Service/SalesOrderService.php
  3. 16 16
      config/header/37.php
  4. 16 16
      config/header/43.php

+ 5 - 5
app/Service/PurchaseOrderService.php

@@ -471,15 +471,15 @@ class PurchaseOrderService extends Service
             $data['data'][$key]['return_exchange_amount'] = $return_exchange_amount;
 
             //最终已收金额
-            $fee1 = $one - $three;
+            $fee1 = round($one - $three,2);
             $data['data'][$key]['fee1'] = $fee1;
             //未收金额
-            $fee2 = $value['purchase_total'] - $return_exchange_amount - $fee1;
+            $fee2 = round($value['purchase_total'] - $return_exchange_amount - $fee1,2);
             $data['data'][$key]['fee2'] = $fee2;
-            //坏账金额
-            $data['data'][$key]['fee3'] = $four;
             //红冲金额
-            $data['data'][$key]['fee4'] = $three;
+            $data['data'][$key]['fee3'] = $three;
+            //坏账金额
+            $data['data'][$key]['fee4'] = $four;
 
             //发货信息 分社向总社采购
             $invoice_state = "未发货";

+ 5 - 5
app/Service/SalesOrderService.php

@@ -970,15 +970,15 @@ class SalesOrderService extends Service
             $data['data'][$key]['return_exchange_amount'] = $return_exchange_amount;
 
             //最终已收金额
-            $fee1 = $one - $three;
+            $fee1 = round($one - $three,2);
             $data['data'][$key]['fee1'] = $fee1;
             //未收金额
-            $fee2 = $value['contract_fee'] - $return_exchange_amount - $fee1;
+            $fee2 = round($value['contract_fee'] - $return_exchange_amount - $fee1,2);
             $data['data'][$key]['fee2'] = $fee2;
-            //坏账金额
-            $data['data'][$key]['fee3'] = $four;
             //红冲金额
-            $data['data'][$key]['fee4'] = $three;
+            $data['data'][$key]['fee3'] = $three;
+            //坏账金额
+            $data['data'][$key]['fee4'] = $four;
         }
 
         return $data;

+ 16 - 16
config/header/37.php

@@ -58,22 +58,22 @@ return [
 //        'key' => 'fee',
 //        'value' => '指派金额',
 //    ],
-//    [
-//        'key' => 'fee1',
-//        'value' => '已收金额',
-//    ],
-//    [
-//        'key' => 'fee2',
-//        'value' => '未收金额',
-//    ],
-//    [
-//        'key' => 'fee3',
-//        'value' => '坏账金额',
-//    ],
-//    [
-//        'key' => 'fee4',
-//        'value' => '最终金额',
-//    ],
+    [
+        'key' => 'fee1',
+        'value' => '已收金额',
+    ],
+    [
+        'key' => 'fee2',
+        'value' => '未收金额',
+    ],
+    [
+        'key' => 'fee3',
+        'value' => '红冲金额',
+    ],
+    [
+        'key' => 'fee4',
+        'value' => '坏账金额',
+    ],
     [
         'key' => 'crt_time',
         'value' => '创建时间',

+ 16 - 16
config/header/43.php

@@ -58,22 +58,22 @@ return [
         'key' => 'fee',
         'value' => '指派金额',
     ],
-//    [
-//        'key' => 'fee1',
-//        'value' => '已收金额',
-//    ],
-//    [
-//        'key' => 'fee2',
-//        'value' => '未收金额',
-//    ],
-//    [
-//        'key' => 'fee3',
-//        'value' => '坏账金额',
-//    ],
-//    [
-//        'key' => 'fee4',
-//        'value' => '最终金额',
-//    ],
+    [
+        'key' => 'fee1',
+        'value' => '已收金额',
+    ],
+    [
+        'key' => 'fee2',
+        'value' => '未收金额',
+    ],
+    [
+        'key' => 'fee3',
+        'value' => '红冲金额',
+    ],
+    [
+        'key' => 'fee4',
+        'value' => '坏账金额',
+    ],
     [
         'key' => 'crt_time',
         'value' => '创建时间',