diff --git a/src/components/CorporateReceiptsCard/index.vue b/src/components/CorporateReceiptsCard/index.vue
index 6e76f0b..3be16a8 100644
--- a/src/components/CorporateReceiptsCard/index.vue
+++ b/src/components/CorporateReceiptsCard/index.vue
@@ -12,25 +12,32 @@
- 合同编号: {{itemData.contractNumber}}
+ 收款编号: {{itemData.vendorReceiptNo}}
- 合同名称:{{itemData.contractName}}
+ 申请人:{{itemData.createName}}
- 供应商名称:{{itemData.supplierName}}
+ 申请部门:{{itemData.deptName}}
- 签约人员:{{itemData.signatoryName}}
+ 项目名称:{{itemData.projectName}}
- 合同金额:{{itemData.amount}}
+ 项目负责人:{{itemData.projectManager}}
- 合同起止时间: {{itemData.startTime && dayjs(itemData.startTime).format('YY/MM/DD')}} ~ {{itemData.endTime && dayjs(itemData.endTime).format('YY/MM/DD')}}
+ 账户类型:{{getDictDataLabel(DICT_TYPE.BS_BANK_TYPE,itemData.accountType) || ''}}
-
{{getDictDataLabel(DICT_TYPE.SR_CT_TYPE,itemData.contractType) || '未知'}}
+ 收款金额:{{itemData.amount}}
+
+
+ 审批节点:
+ {{ items }}
+
+
+ 创建时间:{{ dayjs(itemData.createTime).format('YYYY/MM/DD')}}
@@ -86,7 +93,7 @@ export default {
}
},
handleEdit(id, status) {
- if (status != 0 && status != 3 ) {
+ if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@@ -96,7 +103,7 @@ export default {
})
},
handleDel(id, status) {
- if (status != 0 && status != 3 ) {
+ if (status != 0 && status != 3) {
return
}
Dialog.confirm({
diff --git a/src/router/modules/contract.js b/src/router/modules/contract.js
index bf678d7..8049932 100644
--- a/src/router/modules/contract.js
+++ b/src/router/modules/contract.js
@@ -18,6 +18,8 @@ export default {
{ path: '/custom', name: `${pre}custom`, component: () => import('@/views/contract/custom'), meta: { cache: true, title: '客户合同审批' } },
{ path: '/pay', name: `${pre}pay`, component: () => import('@/views/contract/pay'), meta: { cache: true, title: '付款审批' } },
{ path: '/corporateReceipts', name: `${pre}corporateReceipts`, component: () => import('@/views/contract/corporateReceipts'), meta: { cache: true, title: '对公收款' } },
+ { path: '/receipts', name: `${pre}receipts`, component: () => import('@/views/contract/receipts'), meta: { cache: true, title: '收款审批' } },
{ path: '/corporatePayment', name: `${pre}corporatePayment`, component: () => import('@/views/contract/corporatePayment'), meta: { cache: true, title: '对公付款' } },
+ { path: '/payment', name: `${pre}payment`, component: () => import('@/views/contract/payment'), meta: { cache: true, title: '付款审批' } },
])('contract-')
}
diff --git a/src/utils/dict.js b/src/utils/dict.js
index e9c48b9..4b5929b 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -109,6 +109,14 @@ export const DICT_TYPE = {
BS_PROCUREMENT_TYPE: 'supplier_procurement_state',
// 合同类型(采购状态)
SR_CT_TYPE: 'supplier_ct_type',
+ // 银行账户类型
+ BS_BANK_TYPE: "bs_bank_account_info_account_type",
+ // 申请类型
+ BS_INDUSTRY: "bs_industry",
+ // 行业类型
+ PROJECT_TYPE: "project_type",
+ // 供应商等级
+ GYS_LEVEL: "gys_level",
}
/**
diff --git a/src/views/contract/corporatePayment/components/UserList.vue b/src/views/contract/corporatePayment/components/UserList.vue
index 68dd7e2..2b7c7b0 100644
--- a/src/views/contract/corporatePayment/components/UserList.vue
+++ b/src/views/contract/corporatePayment/components/UserList.vue
@@ -16,7 +16,7 @@
diff --git a/src/views/contract/corporateReceipts/components/UserList.vue b/src/views/contract/corporateReceipts/components/UserList.vue
index 016fedd..d6202cd 100644
--- a/src/views/contract/corporateReceipts/components/UserList.vue
+++ b/src/views/contract/corporateReceipts/components/UserList.vue
@@ -16,7 +16,7 @@
-
添加申请
+
添加收款
@@ -31,7 +31,7 @@
+
\ No newline at end of file
diff --git a/src/views/contract/receipts/index.vue b/src/views/contract/receipts/index.vue
new file mode 100644
index 0000000..542f3d3
--- /dev/null
+++ b/src/views/contract/receipts/index.vue
@@ -0,0 +1,628 @@
+
+
+
+
+
+
\ No newline at end of file