diff --git a/src/api/bs/vendorReceipt.js b/src/api/bs/vendorReceipt.js index 0398726..67d5f3e 100644 --- a/src/api/bs/vendorReceipt.js +++ b/src/api/bs/vendorReceipt.js @@ -27,10 +27,11 @@ export function deleteVendorReceipt(id) { } // 获得对公收款 -export function getVendorReceipt(id) { +export function getVendorReceipt(query) { return request({ - url: '/bs/vendor-receipt/get?id=' + id, - method: 'get' + url: '/bs/vendor-receipt/get', + method: 'get', + params: query }) } diff --git a/src/components/CorporateReceiptsCard/index.vue b/src/components/CorporateReceiptsCard/index.vue index 396d156..ecbeffd 100644 --- a/src/components/CorporateReceiptsCard/index.vue +++ b/src/components/CorporateReceiptsCard/index.vue @@ -7,44 +7,107 @@
{{}}
-->
-
-
{{handleFilterStatus(DICT_TYPE.BS_EXPENSE_APPLY_STATUS,itemData.status).label}}
+
+
+ {{ + handleFilterStatus( + DICT_TYPE.BS_EXPENSE_APPLY_STATUS, + itemData.status + ).label + }} +
-
- 收款编号: {{itemData.vendorReceiptNo}} +
+ 收款编号: {{ itemData.vendorReceiptNo }}
-
- 申请人:{{itemData.createName}} +
+ 申请人:{{ itemData.createName }}
-
- 申请部门:{{itemData.deptName}} +
+ 申请部门:{{ itemData.deptName }}
-
- 项目名称:{{itemData.projectName}} +
+ 项目名称:{{ itemData.projectName }}
-
- 项目负责人:{{itemData.projectManager}} +
+ 项目负责人:{{ itemData.projectManager }}
-
- 账户类型:{{getDictDataLabel(DICT_TYPE.BS_BANK_TYPE,itemData.accountType) || ''}} +
+ 账户类型:{{ + getDictDataLabel( + DICT_TYPE.BS_BANK_TYPE, + itemData.accountType + ) || '' + }}
-
- 收款金额:{{itemData.amount}} +
+ 收款金额:{{ itemData.amount }}
-
+
审批节点: - {{ items }} + {{ items }} +
-
- 创建时间:{{ dayjs(itemData.createTime).format('YYYY/MM/DD')}} +
+ 创建时间:{{ dayjs(itemData.createTime).format('YYYY/MM/DD') }}
+
- - - + + +
@@ -53,34 +116,30 @@ diff --git a/src/components/FollowPeoPle/index.vue b/src/components/FollowPeoPle/index.vue index 6094f2b..8485f67 100644 --- a/src/components/FollowPeoPle/index.vue +++ b/src/components/FollowPeoPle/index.vue @@ -1,4 +1,5 @@