-
+
基本信息（应收费用）
{{ costInfo?.ltdName }}
@@ -27,13 +27,13 @@
{{ costInfo?.arvattypeLabel }}
- {{ costInfo?.armoeny }}
+ {{ costInfo?.armoeny | currency }}
- {{ costInfo?.arkpmoney }}
+ {{ costInfo?.arkpmoney | currency }}
- {{ costInfo?.armoeny }}
+ {{ costInfo?.armoeny | currency }}
@@ -44,7 +44,7 @@
{{ costInfo?.feetypeLabel }}
-
+ {{ costInfo?.hrmoney}}
{{ costInfo?.hrremarks }}
@@ -55,13 +55,13 @@
{{ costInfo?.hrvattypeLabel }}
- {{ costInfo?.hrmoney }}
+ {{ costInfo?.hrmoney | currency}}
- {{ costInfo?.hrvatmoney }}
+ {{ (costInfo?.hrvatmoney || 0) | currency }}
- {{ costInfo?.hrpaymoney }}
+ {{ costInfo?.hrpaymoney | currency }}
@@ -71,31 +71,27 @@
+
{{formData?.ltdName}}
@@ -41,7 +41,7 @@
{{formData?.refundStatusLabel}}
- {{formData?.amount}}
+ {{formData?.amount | currency}}
{{formData?.bankSerialNumber}}
@@ -50,7 +50,7 @@
{{formData?.bankId}}
- ![]()
+ {{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index 1c789121..c184fa93 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -67,6 +67,19 @@ export class WithdrawalsDetailComponent implements OnInit {
});
}
+ downBack() {
+ if (this.formData?.refundStatus !== '3') {
+ return;
+ }
+ this.service.getReceiptUrl(this.formData.receiptUrl, {
+ bankType: this.formData.bankType,
+ rmYll: this.formData.userId,
+ snglFlgCd: this.formData.coreSerNo,
+ bussType: '06',
+ ltdId: this.formData.ltdId
+ });
+ }
+
goBack() {
history.go(-1);
}
diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.less b/src/app/routes/sys-setting/components/role-management/menu/menu.less
index 4e400d45..ea1914df 100644
--- a/src/app/routes/sys-setting/components/role-management/menu/menu.less
+++ b/src/app/routes/sys-setting/components/role-management/menu/menu.less
@@ -174,6 +174,21 @@ li {
list-style : none;
}
+.dictData {
+ dl {
+ margin : 0;
+ padding: 0;
+ }
+
+ dt {
+ margin : 0 0 5px 0;
+ padding : 3px 0;
+ color : #999;
+ font-weight : normal;
+ font-size : 13px;
+ border-bottom: solid 1px #eee;
+ }
+}
label {
color : #666;
@@ -185,18 +200,12 @@ label {
width : 700px;
.leftBox {
- width : 250px;
- border : 1px solid #d1d1d1;
- max-height: 500px;
- overflow : auto;
+ width : 40%;
+ // border-right: solid 1px #eee;
}
.rightBox {
- flex : 1;
- margin : 0 0 0 20px;
- padding-left: 12px;
- border : 1px solid #d1d1d1;
- max-height : 500px;
- overflow : auto;
+ width : 60%;
+ padding: 0 0 0 20px;
}
}
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
index 460bd272..32244510 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@@ -45,7 +45,7 @@
-
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
index b0a55a45..858cf893 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@@ -353,7 +353,7 @@ export class CancellationInvoiceComponent implements OnInit {
},
{ title: '服务名称', index: 'vatname', width: 100 },
{ title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
- { title: '票面备注', render: 'vatremarks', width: 250 },
+ { title: '票面备注', index: 'remarks', width: 250 },
{ title: '其他要求', index: 'otherremarks', width: 100 },
{
title: '操作',
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
index 34b2be1b..86dbbfdd 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
@@ -19,7 +19,7 @@
{{info?.artoacc}}
- {{info?.vatremarks}}
+ {{info?.remarks}}
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
index fcb6b560..f226a86b 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
@@ -14,22 +14,6 @@ export class PushInvoiceComponent implements OnInit {
@ViewChild('st', { static: false })
st!: STComponent;
columns: STColumn[] = this.initST();
- data = [
- {
- key: 0,
- disabled: true,
- href: 'https://ant.design',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
- no: 'TradeCode 0'
- },
- {
- key: 1,
- disabled: false,
- href: 'https://ant.design',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
- no: 'TradeCode 1'
- }
- ];
info: any = {};
id!: number;
diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
index 175cf98e..c0bf7776 100644
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
@@ -32,5 +32,5 @@