diff --git a/oms_web/oms_vue/src/api/finance/payment.js b/oms_web/oms_vue/src/api/finance/payment.js
index 89d859b7..992e2103 100644
--- a/oms_web/oms_vue/src/api/finance/payment.js
+++ b/oms_web/oms_vue/src/api/finance/payment.js
@@ -12,6 +12,16 @@ export function listPayment(query) {
data: tansParams(query)
})
}
+export function exportPayment(query) {
+ return request({
+ url: '/finance/payment/export',
+ method: 'post',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ },
+ data: tansParams(query)
+ })
+}
// 查询付款单详细
export function getPayment(id) {
@@ -101,6 +111,14 @@ export function applyRefund(id) {
needLoading: true
})
}
+export function deletePayment(id) {
+ return request({
+ url: '/finance/payment/remove',
+ method: 'post',
+ params:{ids:id},
+ needLoading: true
+ })
+}
export function applyRefundApprove(id) {
return request({
diff --git a/oms_web/oms_vue/src/api/sip/purchaseorder.js b/oms_web/oms_vue/src/api/sip/purchaseorder.js
index 7a62075e..d0a15702 100644
--- a/oms_web/oms_vue/src/api/sip/purchaseorder.js
+++ b/oms_web/oms_vue/src/api/sip/purchaseorder.js
@@ -106,6 +106,16 @@ export function recallPurchaseorder(id) {
method: 'put'
})
}
+export function exportPurchaseorder(data) {
+ return request({
+ url: '/sip/purchaseorder/export',
+ method: 'get',
+ params: data,
+ // headers: { 'Content-Type': 'multipart/form-data' },
+ needLoading: true
+
+ })
+}
// 查询已审批采购单主表列表
export function listApprovedPurchaseorder(query) {
diff --git a/oms_web/oms_vue/src/main.js b/oms_web/oms_vue/src/main.js
index 189b9dfc..8e1d7304 100644
--- a/oms_web/oms_vue/src/main.js
+++ b/oms_web/oms_vue/src/main.js
@@ -21,6 +21,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"
import { getConfigKey } from "@/api/system/config"
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"
+import { formatCurrency } from "@/utils"
// 分页组件
import Pagination from "@/components/Pagination"
// 自定义表格工具组件
@@ -42,6 +43,7 @@ import DictData from '@/components/DictData'
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime
+Vue.prototype.formatCurrency = formatCurrency
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
diff --git a/oms_web/oms_vue/src/plugins/download.js b/oms_web/oms_vue/src/plugins/download.js
index 8dc83eaa..ec8b9649 100644
--- a/oms_web/oms_vue/src/plugins/download.js
+++ b/oms_web/oms_vue/src/plugins/download.js
@@ -9,13 +9,12 @@ const baseURL = process.env.VUE_APP_BASE_API
let downloadLoadingInstance
export default {
- name(name, isDelete = true) {
+ download(name, isDelete = true) {
var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
axios({
method: 'get',
url: url,
responseType: 'blob',
- headers: { 'Authorization': 'Bearer ' + getToken() }
}).then((res) => {
const isBlob = blobValidate(res.data)
if (isBlob) {
diff --git a/oms_web/oms_vue/src/utils/index.js b/oms_web/oms_vue/src/utils/index.js
index 9375db7f..3004a5b0 100644
--- a/oms_web/oms_vue/src/utils/index.js
+++ b/oms_web/oms_vue/src/utils/index.js
@@ -14,7 +14,10 @@ export function formatDate(cellValue) {
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
-
+export function formatCurrency(value) {
+ if (value == null) return '0.00';
+ return Number(value).toLocaleString('en-US', {minimumFractionDigits: 2, maximumFractionDigits: 2});
+}
/**
* @param {number} time
* @param {string} option
diff --git a/oms_web/oms_vue/src/views/approve/approved_order/index.vue b/oms_web/oms_vue/src/views/approve/approved_order/index.vue
index 12ab63f3..f05925a8 100644
--- a/oms_web/oms_vue/src/views/approve/approved_order/index.vue
+++ b/oms_web/oms_vue/src/views/approve/approved_order/index.vue
@@ -49,6 +49,22 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
搜索
重置
@@ -72,7 +88,11 @@
-
+
+
+ {{ formatCurrency(scope.row.actualPurchaseAmount || scope.row.shipmentAmount) }}
+
+
@@ -127,6 +147,7 @@