修改

src/api/V2/statisticalReport/index.js

@@ -1,64 +1,64 @@
-//采购入库报表
+//期货采购入库报表
 export const API_GET_PURCHRECEIPT = '/purchaseReceiptReport/selectPurchaseOrder'
-// 销售平仓合同
+// 期货销售平仓合同
 export const API_GET_SALE_CONTRACTNO = '/salesClosingReport/selectContractNoList'
-// 销售出库合同
+// 期货销售出库合同
 export const API_GET_SALE_OUT_CONTRACTNO = '/salesDeliveryReport/selectContractNoList'
-// 采购平仓合同
+// 期货采购平仓合同
 export const API_GET_PURCHASE_CONTRACTNO = '/purchaseClosingReport/selectContractNoList'
-// 采购入库合同
+// 期货采购入库合同
 export const API_GET_PURCHASE_IN_CONTRACTNO = '/purchaseReceiptReport/selectContractNoList'
-// 采购入库修改
+// 期货采购入库修改
 export const API_POST_AMEND_PURCHRECEIPT = '/purchaseReceiptReport/api/editProcurementReceiptReport'
-// 采购入库补货结转
+// 期货采购入库补货结转
 export const API_POST_REPLANISHENT = '/purchaseReceiptReport/api/replenishment'
-// 采购入库补货结转其他合同
+// 期货采购入库补货结转其他合同
 export const API_GET_SELECTCONTRACTNO = '/purchaseReceiptReport/selectContractNo'
-// 采购入库审核
+// 期货采购入库审核
 export const API_POST_AUDIT = '/purchaseReceiptReport/api/examinePurchaseOrder'
-// 采购入库付款
+// 期货采购入库付款
 export const API_POST_PAYMONEY = '/purchaseReceiptReport/api/payMoney'
-// 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
+// 期货采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
 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'
-// 销售平仓列表
+// 期货销售平仓列表
 export const API_GET_SALE_LIST ='/salesClosingReport/selectSalesClosingOrder'
-// 销售平仓付款
+// 期货销售平仓付款
 export const API_POST_PAY_MONEY ='/salesClosingReport/api/payMoney'
-// 销售平仓收款
+// 期货销售平仓收款
 export const API_POST_COLLECT_MONEY ='/salesClosingReport/api/collectMoney'
-//采购平仓报表
+//期货采购平仓报表
 export const API_GET_CLOSE = '/purchaseClosingReport/selectPurchaseOrder'
-//采购平仓审核
+//期货采购平仓审核
 export const API_POST_CLOAEAUDIT = '/purchaseClosingReport/api/examine'
-//采购平仓付款
+//期货采购平仓付款
 export const API_POST_CLOSEPAYMONEY = '/purchaseClosingReport/api/payMoney'
-//采购平仓收款
+//期货采购平仓收款
 export const API_POST_CLOSECOLLMONEY = '/purchaseClosingReport/api/collectMoney'
-//采购入库开发票
+//期货采购入库开发票
 export const API_POST_OPENINVOICE = '/purchaseReceiptReport/api/openInvoice'
-//采购入库批量开发票
+//期货采购入库批量开发票
 export const API_POST_BATCHOPENINVOICE = '/purchaseReceiptReport/api/openInvoiceList'
-//销售出库报表
+//期货销售出库报表
 export const API_GET_SALELIST = '/salesDeliveryReport/selectSalesDeliveryReport'
-// 销售出库出纳收款
+// 期货销售出库出纳收款
 export const API_POST_CASHIER_PAYMENT = '/salesDeliveryReport/api/collectMoney'
-// 销售出库开发票
+// 期货销售出库开发票
 export const API_POST_SALES_INVOICING = '/salesDeliveryReport/api/openInvoice'
-// 销售出库批量开发票
+// 期货销售出库批量开发票
 export const API_POST_SALES_BATCH_INVOICING = '/salesDeliveryReport/api/openInvoiceList'
-// 销售出库最终结算价
+// 期货销售出库最终结算价
 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'
 // 汽运结算报表
 export const API_GET_AUTOSETTLEMENT= '/tranSettlementReport/selectTranSettlementReport'
@@ -69,4 +69,15 @@ export const API_GET_AUTOCONTRACT= '/tranSettlementReport/selectContractNoList'
 // 汽运结算报表付款
 export const API_POST_AUTOPAYMONEY= '/tranSettlementReport/api/payMoney'
 // 汽运结算报表批量开发票
-export const API_POST_OPENINVOICELIST= '/tranSettlementReport/api/openInvoiceList'
+export const API_POST_OPENINVOICELIST= '/tranSettlementReport/api/openInvoiceList'
+
+//现货采购入库报表
+export const API_GET_STOCKPURCHASERECEIPT = '/stockPurchaseReceiptReport/selectPurchaseOrder'
+//现货采购入库付款
+export const API_POST_STOCKPURCHASEPAYMONEY = '/stockPurchaseReceiptReport/api/payMoney'
+//现货采购入库 定金/备注
+export const API_POST_ADDDISORREMARKS = '/stockPurchaseReceiptReport/api/disAndRemark'
+//现货采购入库修改结算重量
+export const API_POST_EDITSETTLEMENTWEIGHT = '/stockPurchaseReceiptReport/api/edit'
+//现货采购入库合同
+export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'

src/model/statisticalReport/index.js

@@ -33,66 +33,71 @@ import {
     API_POST_EDITAUTOSETTLEMENT,
     API_GET_AUTOCONTRACT,
     API_POST_AUTOPAYMONEY,
-    API_POST_OPENINVOICELIST
+    API_POST_OPENINVOICELIST,
+    API_GET_STOCKPURCHASERECEIPT,
+    API_POST_STOCKPURCHASEPAYMONEY,
+    API_POST_ADDDISORREMARKS,
+    API_POST_EDITSETTLEMENTWEIGHT,
+    API_GET_STOCKPURCHASECONTRACTNOLIST
 } from '@/api/V2/statisticalReport'
-//采购入库报表
+//期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
-//销售平仓合同
+//期货销售平仓合同
 export const getsaleclosingcontractno = appRx.get(API_GET_SALE_CONTRACTNO, errorCatcher, errorHandle, filter)
-//销售出库合同
+//期货销售出库合同
 export const getsaleoutcontractno = appRx.get(API_GET_SALE_OUT_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购平仓合同
+//期货采购平仓合同
 export const getpurchasecontractno = appRx.get(API_GET_PURCHASE_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库合同
+//期货采购入库合同
 export const getpurchaseincontractno = appRx.get(API_GET_PURCHASE_IN_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库修改
+//期货采购入库修改
 export const postamend = appRx.post(API_POST_AMEND_PURCHRECEIPT, errorCatcher, errorHandle, filter)
-//采购入库补货结转
+//期货采购入库补货结转
 export const postreplanishent = appRx.post(API_POST_REPLANISHENT, errorCatcher, errorHandle, filter)
-//采购入库补货结转其他合同
+//期货采购入库补货结转其他合同
 export const getselectctcontractno = appRx.get(API_GET_SELECTCONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库审核
+//期货采购入库审核
 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)
-//销售平仓列表
+//期货销售平仓列表
 export const getsalelist = appRx.get(API_GET_SALE_LIST, errorCatcher, errorHandle, filter)
-//销售平仓付款
+//期货销售平仓付款
 export const postsalepaymoney= appRx.post(API_POST_PAY_MONEY, errorCatcher, errorHandle, filter)
-//销售平仓收款
+//期货销售平仓收款
 export const postsalecollectmoney= appRx.post(API_POST_COLLECT_MONEY, errorCatcher, errorHandle, filter)
-//采购平仓报表
+//期货采购平仓报表
 export const getclose = appRx.get(API_GET_CLOSE, errorCatcher, errorHandle, filter)
-//采购平仓审核
+//期货采购平仓审核
 export const closeaudit = appRx.post(API_POST_CLOAEAUDIT, errorCatcher, errorHandle, filter)
-//采购平仓付款
+//期货采购平仓付款
 export const closepaymoney = appRx.post(API_POST_CLOSEPAYMONEY, errorCatcher, errorHandle, filter)
-//采购平仓收款
+//期货采购平仓收款
 export const closecollmoney = appRx.post(API_POST_CLOSECOLLMONEY, errorCatcher, errorHandle, filter)
-//采购入库开发票
+//期货采购入库开发票
 export const postopeninvoice = appRx.post(API_POST_OPENINVOICE, errorCatcher, errorHandle, filter)
-//采购入库批量开发票
+//期货采购入库批量开发票
 export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
 
 
 
-//销售出库报表
+//期货销售出库报表
 export const salelist = appRx.get(API_GET_SALELIST, errorCatcher, errorHandle, filter)
-//销售出库出纳收款
+//期货销售出库出纳收款
 export const cashierpayment = appRx.post(API_POST_CASHIER_PAYMENT, errorCatcher, errorHandle, filter)
-//销售出库开发票
+//期货销售出库开发票
 export const salesinvoicing = appRx.post(API_POST_SALES_INVOICING, errorCatcher, errorHandle, filter)
-//销售出库批量开发票
+//期货销售出库批量开发票
 export const salesbatchinvoicing = appRx.post(API_POST_SALES_BATCH_INVOICING, errorCatcher, errorHandle, filter)
-//销售出库最终结算价
+//期货销售出库最终结算价
 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)
 
 
@@ -106,4 +111,16 @@ export const autocontract = appRx.get(API_GET_AUTOCONTRACT, errorCatcher, errorH
 // 汽运结算报表付款
 export const autopaymoney = appRx.post(API_POST_AUTOPAYMONEY, errorCatcher, errorHandle, filter)
 // 汽运结算报表批量开发票
-export const openinvoicelist = appRx.post(API_POST_OPENINVOICELIST, errorCatcher, errorHandle, filter)
+export const openinvoicelist = appRx.post(API_POST_OPENINVOICELIST, errorCatcher, errorHandle, filter)
+
+
+//现货采购入库报表
+export const getStockPurchaseReceiptList = appRx.get(API_GET_STOCKPURCHASERECEIPT, errorCatcher, errorHandle, filter)
+//现货采购入库付款
+export const stockPurchasePayMoney = appRx.post(API_POST_STOCKPURCHASEPAYMONEY, errorCatcher, errorHandle, filter)
+//现货采购入库 定金/备注
+export const addDisOrRemarks = appRx.post(API_POST_ADDDISORREMARKS, errorCatcher, errorHandle, filter)
+//现货采购入库修改结算重量
+export const editSettlementWeight = appRx.post(API_POST_EDITSETTLEMENTWEIGHT, errorCatcher, errorHandle, filter)
+//现货采购入库合同编号下拉
+export const getStockPurchaseContractNoList = appRx.get(API_GET_STOCKPURCHASECONTRACTNOLIST, errorCatcher, errorHandle, filter)