diff --git a/oms_web/oms_vue/src/api/finance/invoice.js b/oms_web/oms_vue/src/api/finance/invoice.js
index 1151753d..b479995b 100644
--- a/oms_web/oms_vue/src/api/finance/invoice.js
+++ b/oms_web/oms_vue/src/api/finance/invoice.js
@@ -51,6 +51,15 @@ export function redRush(id) {
})
}
+// 申请红冲 (提交表单)
+export function applyRefund(data) {
+ return request({
+ url: '/finance/invoice/applyRefund',
+ method: 'post',
+ data: data
+ })
+}
+
// 退回销售收票单
export function returnInvoice(id) {
return request({
diff --git a/oms_web/oms_vue/src/router/index.js b/oms_web/oms_vue/src/router/index.js
index f63afeba..db6984e1 100644
--- a/oms_web/oms_vue/src/router/index.js
+++ b/oms_web/oms_vue/src/router/index.js
@@ -124,6 +124,11 @@ export const constantRoutes = [
component: () => import('@/views/approve/finance/receivableInvoice/approved/index.vue'),
hidden: true
},
+ {
+ path: 'receivableInvoiceRefundLog',
+ component: () => import('@/views/approve/finance/receivableInvoiceRefund/approved/index.vue'),
+ hidden: true
+ },
]
},
{
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
index 44166a92..e440634f 100644
--- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/components/ReceivableInvoiceDetail.vue
@@ -33,28 +33,43 @@
-
-
附件信息
-
-
-
-
-
-
- 预览
- 下载
-
-
-
-
+
+
附件信息
+
+
+
+
+
+
+ 下载
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,6 +92,7 @@ export default {
data() {
return {
attachments: [],
+ excelList: [],
pdfPreviewVisible: false,
currentPdfUrl: '',
imagePreviewVisible: false,
@@ -84,7 +100,20 @@ export default {
};
},
watch: {
-
+ data: {
+ handler(val) {
+ if (val && val.updateTime) {
+ this.excelList = [{
+ fileName: '电子发票--购买方公司信息.xlsx',
+ createUserName: '系统生成',
+ createTime: val.updateTime,
+ isSystemGenerated: true
+ }];
+ }
+ },
+ immediate: true,
+ deep: true
+ }
},
methods: {
@@ -112,6 +141,15 @@ export default {
}
},
handleDownload(row) {
+ if (row.isSystemGenerated) {
+ request({
+ url: '/finance/invoice/export/' + this.data.invoiceBillCode,
+ method: 'get'
+ }).then(res => {
+ window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(res.msg) + "&delete=true";
+ });
+ return;
+ }
const link = document.createElement('a');
link.href = this.getImageUrl(row.filePath);
link.download = row.fileName || 'attachment';
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
new file mode 100644
index 00000000..4cca9323
--- /dev/null
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.totalPriceWithTax }}
+
+
+
+
+ {{ parseTime(scope.row.applyTime) }}
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+ 导出PDF
+
+
+
+
+
+ 开票编号: {{ form.invoiceBillCode }}
+
+
+
+
+
流转意见
+
+
+
+
+ {{ log.approveOpinion }}
+ 操作人: {{ log.approveUserName }}
+ 审批状态: {{ getStatusText(log.approveStatus) }}
+
+
+
+
暂无流转过程数据。
+
+
+
+
+
+
+
+
+
+
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
new file mode 100644
index 00000000..44293ab1
--- /dev/null
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/components/ReceivableInvoiceDetail.vue
@@ -0,0 +1,182 @@
+
+
+
+ {{ data.invoiceBillCode }}
+ {{ data.partnerName }}
+
+ {{ data.totalPriceWithTax }}
+
+
+ {{ data.totalPriceWithoutTax }}
+
+
+ {{ data.taxAmount }}
+
+
+
+
+
+
+
+
+
+
+
应收单列表
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.totalPriceWithTax }}
+
+
+
+
+ {{ scope.row.receiptAmount }}
+
+
+
+
+
+
+
附件信息
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
附件信息
+
+
+
+
+
+
+ 预览
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
new file mode 100644
index 00000000..52ff0883
--- /dev/null
+++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 审批历史
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.totalPriceWithTax }}
+
+
+
+
+ {{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+ 审批
+
+
+
+
+
+
+
+
+
+
+ 导出PDF
+
+
+
+
+
+ {{ form.invoiceBillCode }}
+
+
+
+
+
流转意见
+
+
+
+
+ {{ log.approveOpinion }}
+ 操作人: {{ log.approveUserName }}
+ 审批状态: {{ getStatusText(log.approveStatus) }}
+
+
+
+
暂无流转过程数据。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue
index b19118af..4e64929f 100644
--- a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue
+++ b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue
@@ -110,7 +110,7 @@
@@ -185,7 +185,7 @@