diff --git a/index.html b/index.html
index babf7cb7..989c57d9 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
/>
<%= title %>
-
+
+
+
diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
new file mode 100644
index 00000000..9b411b52
--- /dev/null
+++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+ 选中合计:
+ {{ calcSelectedAmount }}
+
+
+
+
+
+ {{ record.invoiceNumber || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/financialTax/expenseAccount/detail/components/columns.tsx b/src/views/financialTax/expenseAccount/detail/components/columns.tsx
new file mode 100644
index 00000000..f09c8108
--- /dev/null
+++ b/src/views/financialTax/expenseAccount/detail/components/columns.tsx
@@ -0,0 +1,159 @@
+import { BasicColumn, FormSchema } from '/@/components/Table'
+import moment from 'moment'
+import { numberThousandFormat } from '/@/utils/commonUtil'
+
+export const invoiceCodeList: LabelValueOptions = [
+ { label: '全电发票(铁路电子客票)', value: '51' },
+ { label: '全电发票(航空运输电子客票行程单)', value: '61' },
+ { label: '全电发票(增值税专用发票)', value: '81' },
+ { label: '全电发票(普通发票)', value: '82' },
+ { label: '全电纸质发票(增值税专用发票)', value: '85' },
+ { label: '全电纸质发票(普通发票)', value: '86' },
+ { label: '增值税电子普票发票', value: '026' },
+ { label: '增值税电子专用发票', value: '028' },
+ { label: '增值税普通发票', value: '007' },
+ { label: '增值税专用发票', value: '004' },
+ { label: '税控卷票', value: '025' },
+]
+export const invoiceStatusList: LabelValueOptions = [
+ { label: '蓝票', value: '00' },
+ { label: '红票', value: '01' },
+]
+
+export const columns: BasicColumn[] = [
+ {
+ title: '发票号码',
+ dataIndex: 'invoiceNumber',
+ width: 200,
+ },
+ {
+ title: '发票类型代码',
+ dataIndex: 'invoiceTypeCode',
+ width: 200,
+ customRender({ text }) {
+ return invoiceCodeList.find((el) => el.value === text)?.label || ''
+ },
+ },
+ {
+ title: '开票日期',
+ dataIndex: 'invoicingDate',
+ width: 140,
+ },
+ {
+ title: '合计金额',
+ dataIndex: 'totalAmount',
+ sorter: true,
+ width: 100,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
+ },
+ {
+ title: '合计税额',
+ dataIndex: 'totalTax',
+ width: 100,
+ sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
+ },
+ {
+ title: '价税合计',
+ dataIndex: 'totalWithTax',
+ width: 100,
+ sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
+ },
+ {
+ title: '发票状态',
+ dataIndex: 'invoiceStatus',
+ width: 100,
+ sorter: true,
+ customRender: ({ text }) => {
+ return invoiceStatusList.find((el) => el.value === text)?.label || '未知'
+ },
+ },
+ {
+ title: '开票人',
+ dataIndex: 'invoicer',
+ width: 80,
+ sorter: true,
+ },
+ {
+ title: '原发票号码',
+ dataIndex: 'originalInvoiceNumber',
+ width: 200,
+ // sorter: true,
+ },
+ {
+ title: '购方开票名称',
+ dataIndex: 'buyerInvoiceName',
+ width: 200,
+ ellipsis: true,
+ // sorter: true,
+ },
+ {
+ title: '购方开票税号',
+ dataIndex: 'buyerInvoiceTaxNumber',
+ width: 200,
+ // sorter: true,
+ },
+ {
+ title: '销方开票名称',
+ dataIndex: 'sellerInvoiceName',
+ width: 130,
+ // sorter: true,
+ },
+ {
+ title: '销方开票税号',
+ dataIndex: 'sellerInvoiceTaxNumber',
+ width: 200,
+ ellipsis: true,
+ // sorter: true,
+ },
+ {
+ title: '是否已获取详情',
+ dataIndex: 'isDetailObtained',
+ width: 120,
+ align: 'center',
+ // sorter: true,
+ },
+ {
+ title: '销方识别号',
+ dataIndex: 'sellerIdentificationNumber',
+ width: 200,
+ // sorter: true,
+ },
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ field: 'invoiceNumber',
+ label: '发票号码',
+ colProps: { span: 4 },
+ component: 'Input',
+ },
+ {
+ field: 'buyerInvoiceTaxNumber',
+ label: '购方开票税号',
+ colProps: { span: 4 },
+ component: 'Input',
+ },
+ {
+ field: 'buyerInvoiceName',
+ label: '购方开票名称',
+ colProps: { span: 4 },
+ component: 'Input',
+ },
+ {
+ field: 'invoicingDate',
+ label: '开票时间',
+ component: 'RangePicker',
+ colProps: { span: 4 },
+ componentProps: {
+ allowClear: true,
+ },
+ },
+]
diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue
new file mode 100644
index 00000000..5deb0a0c
--- /dev/null
+++ b/src/views/financialTax/expenseAccount/detail/index.vue
@@ -0,0 +1,569 @@
+
+
+
+
+
+
+
+
+ {{ getStatusInfo('label') }}
+
+
+ 驳回原因:{{ expenseAccountDetail.rejectReason }}
+
+
+ 报销单编号:{{ expenseAccountDetail.reimbursementId }}
+
+
+
+
+
+
+
+
发票引入
+
+
+
+ 添加发票
+
+
+
+ 删除
+
+
+
+
+
+
+
+ {{ record.invoiceNumber || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合计金额:
+ {{ calcSumAmountFormat }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue
index 3700c712..04f18c5c 100644
--- a/src/views/financialTax/expenseAccount/index.vue
+++ b/src/views/financialTax/expenseAccount/index.vue
@@ -1,73 +1,82 @@
-
-
-
-
-
- 复制
-
-
-
-
-
-
-
- 删除
-
-
-
-
+
+
+
+
+
+
+ 新建
+
+
+
-
-
-
-
-
-
-
+
+
+
+ 删除
+
+
+
+
+
+
+
+
-
- {{ record.invoiceNumber || '' }}
-
+
+
+
+
+
+ {{ record.invoiceNumber || '' }}
+
+
+
+
+
+ {{ getStatusInfo(record, 'label') }}
+
+
+
-
-
+
+
diff --git a/src/views/financialTax/incomeInvoice/columns.tsx b/src/views/financialTax/incomeInvoice/columns.tsx
index 01e8242f..421d69fa 100644
--- a/src/views/financialTax/incomeInvoice/columns.tsx
+++ b/src/views/financialTax/incomeInvoice/columns.tsx
@@ -1,4 +1,5 @@
import { BasicColumn, FormSchema } from '/@/components/Table'
+import { numberThousandFormat } from '/@/utils/commonUtil'
export const invoiceCodeList: LabelValueOptions = [
{ label: '全电发票(铁路电子客票)', value: '51' },
@@ -45,18 +46,27 @@ export const columns: BasicColumn[] = [
dataIndex: 'totalAmount',
sorter: true,
width: 100,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '合计税额',
dataIndex: 'totalTax',
width: 100,
sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '价税合计',
dataIndex: 'totalWithTax',
width: 100,
sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '发票状态',
@@ -141,6 +151,9 @@ export const columns: BasicColumn[] = [
dataIndex: 'deductionAmount',
width: 100,
sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '机动车发票类型代码',
@@ -203,6 +216,9 @@ export const columns: BasicColumn[] = [
dataIndex: 'amount',
width: 100,
sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '销方名称',
@@ -260,6 +276,9 @@ export const columns: BasicColumn[] = [
dataIndex: 'taxAmount',
width: 100,
sorter: true,
+ customRender({ text }) {
+ return numberThousandFormat(text)
+ },
},
{
title: '备注',
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index eaa14212..def85626 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -1187,8 +1187,8 @@
path: '/approve-fee',
query: {
id: data.ouT_BS_NO,
- btype: 1
- }
+ btype: 1,
+ },
})
break
case 'WAIT_ORDER_AUDIT':
@@ -1225,6 +1225,17 @@
},
})
break
+ case 'ReimbursementApproval':
+ // 跳转到报销单审批页面
+ go({
+ path: '/expenseAccountDetail',
+ query: {
+ id: data.ouT_BS_NO,
+ type: 'AUDIT',
+ tabName: '报销单审核',
+ },
+ })
+ break
default:
break
}