报表

src/api/V2/statisticalReport/index.js

@@ -22,6 +22,8 @@ export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
 export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
 // 采购订单删除
 export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
+// 采购入库报表头部信息
+export const API_GET_SELECTORDER= '/purchaseReceiptReport/selectOrder'
 // 销售平仓审核、通过、驳回
 export const API_POST_SALE_EXAMINE ='/salesClosingReport/api/examine'
 // 销售平仓列表
@@ -54,3 +56,5 @@ export const API_POST_SALES_BATCH_INVOICING = '/salesDeliveryReport/api/openInvo
 export const API_POST_FINAL_SETTLEMENT_PRICE = '/salesDeliveryReport/api/editSalesDeliveryReport'
 // 销售出库审核
 export const API_POST_ISSUE_APPROVAL = '/salesDeliveryReport/api/examineSalesDeliveryReport'
+// 销售出库报表头部信息
+export const API_GET_SELECTSALEORDER= '/salesDeliveryReport/selectOrder'

src/model/statisticalReport/index.js

@@ -25,7 +25,9 @@ import {
     API_POST_ISSUE_APPROVAL,
     API_GET_SALE_OUT_CONTRACTNO,
     API_GET_PURCHASE_CONTRACTNO,
-    API_GET_PURCHASE_IN_CONTRACTNO
+    API_GET_PURCHASE_IN_CONTRACTNO,
+    API_GET_SELECTORDER,
+    API_GET_SELECTSALEORDER
 
 } from '@/api/V2/statisticalReport'
 //采购入库报表
@@ -46,6 +48,8 @@ export const postreplanishent = appRx.post(API_POST_REPLANISHENT, errorCatcher,
 export const postaudit = appRx.post(API_POST_AUDIT, errorCatcher, errorHandle, filter)
 //采购入库付款
 export const postpaymoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
+//采购入库报表头部
+export const getorder = appRx.get(API_GET_SELECTORDER, errorCatcher, errorHandle, filter)
 //销售平仓审核
 export const postsaleaudit = appRx.post(API_POST_SALE_EXAMINE, errorCatcher, errorHandle, filter)
 //销售平仓列表
@@ -81,5 +85,7 @@ export const salesbatchinvoicing = appRx.post(API_POST_SALES_BATCH_INVOICING, er
 export const finalsettlementprice = appRx.post(API_POST_FINAL_SETTLEMENT_PRICE, errorCatcher, errorHandle, filter)
 //销售出库审核
 export const issueapproval = appRx.post(API_POST_ISSUE_APPROVAL, errorCatcher, errorHandle, filter)
+//销售出库报表头部
+export const getsaleorder = appRx.get(API_GET_SELECTSALEORDER, errorCatcher, errorHandle, filter)
 
 

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -47,10 +47,10 @@
       </el-col>
       </el-row>
       <div v-if='contractNo!=""'>
-        <span>合同重量:吨</span>
-      <span>成交量:吨</span>
-      <span>已平仓:吨</span>
-      <span>入库量:吨</span>
+      <span>合同重量:{{orderList.transactionsNumber}}吨</span>
+      <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
+      <span>已平仓:{{orderList.closedPosition}}吨</span>
+      <span>入库量:{{orderList.stockInQuantity}}吨</span>
       </div>
       
       <el-table
@@ -447,6 +447,7 @@ import {
   getpurchreceipt,
   getpurchaseincontractno,
   postamend,
+  getorder,
   postreplanishent,
   postaudit,
   postpaymoney,
@@ -538,6 +539,7 @@ export default {
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
       warehouseList: [],
+      orderList:{},
       deptBudgetList: {},
       id: '',
 
@@ -939,6 +941,13 @@ export default {
     },
     contractchange(e) {
       this.contractNo = e
+        getorder({
+        contractNo: this.contractNo
+      })
+        .toPromise()
+        .then((response) => {
+          this.orderList = response
+        })
       this.getList()
     },
     updated() {

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -50,10 +50,10 @@
         </el-col>
       </el-row>
         <div v-if='contractNo!=""'>
-          <span>合同重量:吨</span>
-          <span>成交量:吨</span>
-          <span>已平仓:吨</span>
-          <span>入库量:吨</span>
+        <span>合同重量:{{orderList.transactionsNumber}}吨</span>
+        <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
+        <span>已平仓:{{orderList.closedPosition}}吨</span>
+        <span>出库量:{{orderList.stockOutQuantity}}吨</span>
         </div>
         
         <el-table
@@ -235,6 +235,7 @@ import {
   getsaleoutcontractno,
   finalsettlementprice,
   issueapproval,
+  getsaleorder,
   cashierpayment,
   salesinvoicing,
   salesbatchinvoicing
@@ -290,6 +291,7 @@ export default {
       barHeight: 0,
       retioX: 1,
       ratioY: 1,
+      orderList:{},
       isTaped: false,
       isHover: false,
       isShow: !this.autohide,
@@ -468,6 +470,13 @@ export default {
     },
     contractchange(e){ 
       this.contractNo=e
+      getsaleorder({
+        contractNo: this.contractNo
+      })
+        .toPromise()
+        .then((response) => {
+          this.orderList = response
+        })
       this.getList()
     },
     updated() {