Browse Source

pc端应收与统计销售与app一致

liyuan 6 days ago
parent
commit
d9e5f0cbb6

+ 8 - 0
src/api/collectionSettlement/index.js

@@ -23,3 +23,11 @@ export const getSettlementSum = (params) => {
         params: params
     })
 }
+
+
+export const getPendingPaymentSum = () => {
+    return request({
+        url: '/api/blade-sales-part/order/getPendingPaymentSum',
+        method: 'get'
+    })
+}

+ 10 - 3
src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -41,7 +41,7 @@
 
 <script>
 // import {getList, remove} from "@/api/oceanShipping/maritimeExport/index.js";
-import { getList, remove,getSettlementSum } from "@/api/collectionSettlement/index.js";
+import { getList, remove,getSettlementSum, getPendingPaymentSum } from "@/api/collectionSettlement/index.js";
 import detailsPage from "./detailsPage"
 import { getToken } from "@/util/auth";
 export default {
@@ -244,6 +244,7 @@ export default {
     // this.findObject(this.optionList.column,'corpId').click = ()=>{
     //   console.log('点击了');
     // }
+      this.getAmountSum()
   },
   // 解决AVue表格错位问题
   activated() {
@@ -269,6 +270,12 @@ export default {
     )
   },
   methods: {
+      getAmountSum(){
+          getPendingPaymentSum().then(res => {
+              this.advanceReceipt = res.data.data
+          })
+      },
+
     //导出
     outExport() {
       let config = {
@@ -357,9 +364,9 @@ export default {
       getList(params).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-          getSettlementSum(params).then(sumRes => {
+/*          getSettlementSum(params).then(sumRes => {
               this.advanceReceipt = sumRes.data.data
-          })
+          })*/
       }).finally(() => {
         this.loading = false
       })

+ 11 - 11
src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -199,7 +199,7 @@ export default {
                 //     search: true,
                 //     searchslot: true,
                 //     searchOrder: 4
-                // }, 
+                // },
                 {
                     label: '仓库',
                     prop: "storageName",
@@ -262,7 +262,7 @@ export default {
                 //     label: '数量',
                 //     prop: 'goodsNum',
                 //     overHidden: true,
-                // }, 
+                // },
                 {
                     label: '价格',
                     prop: 'price',
@@ -294,12 +294,12 @@ export default {
                     overHidden: true,
                 },
                 {
-                    label: '卖出数量',
+                    label: '融资卖出数量',
                     prop: 'outGoodsTotalShipNum',
                     overHidden: true,
                 },
                 {
-                    label: '卖出金额',
+                    label: '融资卖出金额',
                     prop: 'outGoodsTotalShipAmount',
                     overHidden: true,
                 },
@@ -317,12 +317,12 @@ export default {
                 //     label: '成本',
                 //     prop: 'costprie',
                 //     overHidden: true,
-                // }, 
+                // },
                 // {
                 //     label: '毛利',
                 //     prop: 'profit',
                 //     overHidden: true,
-                // }, 
+                // },
                 {
                     label: '业务开始',
                     prop: 'businesDateStart',
@@ -416,12 +416,12 @@ export default {
             //     id: 3,
             //     label: '采购成本',
             //     prop: 'costprie'
-            // }, 
+            // },
             // {
             //     id: 4,
             //     label: '采购毛利',
             //     prop: 'profit'
-            // }, 
+            // },
             {
                 id: 5,
                 label: '已取消数量',
@@ -441,11 +441,11 @@ export default {
                 prop: 'amount',
             },
             {
-                label: '卖出数量',
+                label: '融资卖出数量',
                 prop: 'outGoodsTotalShipNum',
             },
             {
-                label: '卖出金额',
+                label: '融资卖出金额',
                 prop: 'outGoodsTotalShipAmount',
             },
             {
@@ -460,7 +460,7 @@ export default {
                 //     id: 7,
                 //     label: '已取消成本',
                 //     prop: 'costprieCancellation'
-                // }, 
+                // },
                 // {
                 //     id: 8,
                 //     label: '已取消毛利',

+ 3 - 3
src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -145,7 +145,7 @@ export default {
                         decimals: 2
                     },
                     {
-                        name: 'costprie',
+                        name: 'costPrice',
                         type: 'sum',
                         decimals: 2
                     },
@@ -361,7 +361,7 @@ export default {
             }, {
                 id: 3,
                 label: '销售成本',
-                prop: 'costprie'
+                prop: 'costPrice'
             }, {
                 id: 4,
                 label: '销售毛利',
@@ -383,7 +383,7 @@ export default {
             }, {
                 id: 8,
                 label: '已取消成本',
-                prop: 'costprieCancellation'
+                prop: 'costPriceCancellation'
             }, {
                 id: 9,
                 label: '已取消毛利',

+ 1 - 1
src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue

@@ -191,7 +191,7 @@ export default {
           {
             label: "结清不显示",
             prop: "whetherSettlement",
-            search: true,
+            search: false,
             hide: true
           },
           // {