Merge branch 'master' into 测试

src/views/shengde/group/finance/reconciliation/print.vue

@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import { printDetail, editAmount } from '@/api/shengde/group/finance/reconciliation'
+import { printDetail } from '@/api/shengde/group/finance/reconciliation'
 import $ from 'jquery'
 
 export default {
@@ -159,11 +159,6 @@ export default {
         (res) => {
           this.tableList = res.data.data
           this.loadingStatus = false
-          let data = {
-            id: this.rowData.id,
-            amount: Number(this.getAggregate()),
-          }
-          editAmount(data).then()
         },
         (err) => {
           this.loadingStatus = false
@@ -224,13 +219,8 @@ export default {
       let allMoney = 0
       if (this.tableList && this.tableList.length > 0) {
         this.tableList.map((item) => {
-          // allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
-          if (item.bomDetails && item.bomDetails.length > 0) {
-            item.bomDetails.map((itemBom) => {
-              if (itemBom.amount) {
-                allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
-              }
-            })
+          if (item.amount) {
+            allMoney = parseFloat(Number(allMoney) + Number(item.amount)).toFixed(2)
           }
         })
       }

src/views/shengde/group/finance/summary/print.vue

@@ -132,7 +132,6 @@
 
 <script>
 import { summaryPrintDetail } from '@/api/shengde/group/finance/summary'
-import { editAmount } from '@/api/shengde/group/finance/reconciliation'
 import $ from 'jquery'
 
 export default {
@@ -158,11 +157,6 @@ export default {
         (res) => {
           this.tableList = res.data.data
           this.loadingStatus = false
-          let data = {
-            id: this.rowData.id,
-            amount: Number(this.getAggregate()),
-          }
-          editAmount(data).then()
         },
         (err) => {
           this.loadingStatus = false
@@ -223,13 +217,8 @@ export default {
       let allMoney = 0
       if (this.tableList && this.tableList.length > 0) {
         this.tableList.map((item) => {
-          // allMoney = parseFloat(Number(allMoney) + Number(item.skuPrice) * Number(item.quantity) - Number(item.aftermarketAmount)).toFixed(2)
-          if (item.bomDetails && item.bomDetails.length > 0) {
-            item.bomDetails.map((itemBom) => {
-              if (itemBom.amount) {
-                allMoney = parseFloat(Number(allMoney) + Number(itemBom.amount)).toFixed(2)
-              }
-            })
+          if (item.amount) {
+            allMoney = parseFloat(Number(allMoney) + Number(item.amount)).toFixed(2)
           }
         })
       }