diff --git a/.env.test b/.env.test index 6c3d3c0..5c9a9e9 100644 --- a/.env.test +++ b/.env.test @@ -5,7 +5,8 @@ ENV = 'development' VUE_APP_TITLE = 链友融财务数字一体化信息系统 # 链友融财务数字一体化信息系统/开发环境 -VUE_APP_BASE_API = 'https://2537287x0n.imdo.co' +# VUE_APP_BASE_API = 'https://2537287x0n.imdo.co' +VUE_APP_BASE_API = 'https://351009q0x9.oicp.vip' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/bs/bankAccountInfo.js b/src/api/bs/bankAccountInfo.js new file mode 100644 index 0000000..aa74616 --- /dev/null +++ b/src/api/bs/bankAccountInfo.js @@ -0,0 +1,54 @@ +import request from '@/plugin/axios' + +// 创建银行账户信息 +export function createBankAccountInfo(data) { + return request({ + url: "/bs/bank-account-info/create", + method: "post", + data: data, + }); +} + +// 更新银行账户信息 +export function updateBankAccountInfo(data) { + return request({ + url: "/bs/bank-account-info/update", + method: "put", + data: data, + }); +} + +// 删除银行账户信息 +export function deleteBankAccountInfo(id) { + return request({ + url: "/bs/bank-account-info/delete?id=" + id, + method: "delete", + }); +} + +// 获得银行账户信息 +export function getBankAccountInfo(id) { + return request({ + url: "/bs/bank-account-info/get?id=" + id, + method: "get", + }); +} + +// 获得银行账户信息分页 +export function getBankAccountInfoPage(query) { + return request({ + url: "/bs/bank-account-info/page", + method: "get", + params: query, + }); +} + +// 导出银行账户信息 Excel +export function exportBankAccountInfoExcel(query) { + return request({ + url: "/bs/bank-account-info/export-excel", + method: "get", + params: query, + responseType: "blob", + }); +} diff --git a/src/api/bs/paymentApply.js b/src/api/bs/paymentApply.js index 949403d..c5718c3 100644 --- a/src/api/bs/paymentApply.js +++ b/src/api/bs/paymentApply.js @@ -61,10 +61,11 @@ export function getByPlanDetail(id) { } // 确认申请 -export function confirmApi(id) { +export function confirmApi(data) { return request({ - url: '/bs/payment-apply/paymentAffirm?id=' + id, - method: 'get', + url: '/bs/payment-apply/paymentAffirm', + method: 'post', + data }) } // 取消确认 diff --git a/src/api/bs/vendor.js b/src/api/bs/vendor.js new file mode 100644 index 0000000..c9322a2 --- /dev/null +++ b/src/api/bs/vendor.js @@ -0,0 +1,75 @@ +import request from '@/plugin/axios' + +// 创建报销-供应商信息 +export function createVendor(data) { + return request({ + url: '/bs/vendor/create', + method: 'post', + data: data + }) +} + +// 更新报销-供应商信息 +export function updateVendor(data) { + return request({ + url: '/bs/vendor/update', + method: 'put', + data: data + }) +} + +// 删除报销-供应商信息 +export function deleteVendor(id) { + return request({ + url: '/bs/vendor/delete?id=' + id, + method: 'delete' + }) +} + +// 获得报销-供应商信息 +export function getVendor(id) { + return request({ + url: '/bs/vendor/get?id=' + id, + method: 'get' + }) +} + +// 获得报销-供应商信息分页 +export function getVendorPage(query) { + return request({ + url: '/bs/vendor/page', + method: 'get', + params: query + }) +} + +// 导出报销-供应商信息 Excel +export function exportVendorExcel(query) { + return request({ + url: '/bs/vendor/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + + +// 百度云接口识别 +export function baiduScanApi(data) { + return request({ + url: '/bs/vendor/buildBusinessLicense', + method: 'post', + data + }) +} + + +// 对公 +export function vendorBankPage(query) { + return request({ + url: '/bs/vendor-bank/page', + method: 'get', + params: query + }) +} + diff --git a/src/api/bs/vendorPayment.js b/src/api/bs/vendorPayment.js new file mode 100644 index 0000000..dfe5d04 --- /dev/null +++ b/src/api/bs/vendorPayment.js @@ -0,0 +1,54 @@ +import request from '@/plugin/axios' + +// 创建对公付款 +export function createVendorPayment(data) { + return request({ + url: '/bs/vendor-payment/create', + method: 'post', + data: data + }) +} + +// 更新对公付款 +export function updateVendorPayment(data) { + return request({ + url: '/bs/vendor-payment/update', + method: 'put', + data: data + }) +} + +// 删除对公付款 +export function deleteVendorPayment(id) { + return request({ + url: '/bs/vendor-payment/delete?id=' + id, + method: 'delete' + }) +} + +// 获得对公付款 +export function getVendorPayment(id) { + return request({ + url: '/bs/vendor-payment/get?id=' + id, + method: 'get' + }) +} + +// 获得对公付款分页 +export function getVendorPaymentPage(query) { + return request({ + url: '/bs/vendor-payment/page', + method: 'get', + params: query + }) +} + +// 导出对公付款 Excel +export function exportVendorPaymentExcel(query) { + return request({ + url: '/bs/vendor-payment/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/bs/vendorReceipt.js b/src/api/bs/vendorReceipt.js new file mode 100644 index 0000000..0398726 --- /dev/null +++ b/src/api/bs/vendorReceipt.js @@ -0,0 +1,54 @@ +import request from '@/plugin/axios' + +// 创建对公收款 +export function createVendorReceipt(data) { + return request({ + url: '/bs/vendor-receipt/create', + method: 'post', + data: data + }) +} + +// 更新对公收款 +export function updateVendorReceipt(data) { + return request({ + url: '/bs/vendor-receipt/update', + method: 'put', + data: data + }) +} + +// 删除对公收款 +export function deleteVendorReceipt(id) { + return request({ + url: '/bs/vendor-receipt/delete?id=' + id, + method: 'delete' + }) +} + +// 获得对公收款 +export function getVendorReceipt(id) { + return request({ + url: '/bs/vendor-receipt/get?id=' + id, + method: 'get' + }) +} + +// 获得对公收款分页 +export function getVendorReceiptPage(query) { + return request({ + url: '/bs/vendor-receipt/page', + method: 'get', + params: query + }) +} + +// 导出对公收款 Excel +export function exportVendorReceiptExcel(query) { + return request({ + url: '/bs/vendor-receipt/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/components/CorporatePaymentCard/index.vue b/src/components/CorporatePaymentCard/index.vue new file mode 100644 index 0000000..8c5a1cc --- /dev/null +++ b/src/components/CorporatePaymentCard/index.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/src/components/CorporateReceiptsCard/index.vue b/src/components/CorporateReceiptsCard/index.vue new file mode 100644 index 0000000..52cf94d --- /dev/null +++ b/src/components/CorporateReceiptsCard/index.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/src/components/MyClaimListCard/index.vue b/src/components/MyClaimListCard/index.vue index 56b6444..a1aea47 100644 --- a/src/components/MyClaimListCard/index.vue +++ b/src/components/MyClaimListCard/index.vue @@ -37,11 +37,11 @@
- - - + +
@@ -98,7 +98,7 @@ export default { }, handleEdit(obj) { const { id, status, billType } = obj - if (status != 0 && status != 3) { + if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) { return } this.jumoStudentId = id @@ -107,8 +107,8 @@ export default { query: { id, type: 'edit', listType: this.listType, billType } }) }, - handleDel(id, status) { - if (status != 0 && status != 3) { + handleDel(id, status,creator) { + if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) { return } Dialog.confirm({ diff --git a/src/components/MyCustomerListCard/index.vue b/src/components/MyCustomerListCard/index.vue index 6c40ab2..c67ce15 100644 --- a/src/components/MyCustomerListCard/index.vue +++ b/src/components/MyCustomerListCard/index.vue @@ -33,8 +33,8 @@
- - + +
@@ -81,8 +81,8 @@ export default { return } }, - handleEdit(id, status) { - if (status != 0 && status != 3 ) { + handleEdit(id, status,creator) { + if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) { return } this.jumoStudentId = id @@ -91,8 +91,8 @@ export default { query: { id, type: 'edit' } }) }, - handleDel(id, status) { - if (status != 0 && status != 3 ) { + handleDel(id, status,creator) { + if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) { return } Dialog.confirm({ diff --git a/src/components/MyPayListCard/index.vue b/src/components/MyPayListCard/index.vue index 194e87a..63ca4bc 100644 --- a/src/components/MyPayListCard/index.vue +++ b/src/components/MyPayListCard/index.vue @@ -17,6 +17,9 @@
合同名称:{{itemData.contractName}}
+
+ 分期说明:{{itemData.periodName}} +
供应商名称:{{itemData.supplierName}}
@@ -36,24 +39,27 @@
+ + --> 查看 - 修改 - 删除 + 修改 + 删除 付款确认 + 取消确认 {{ itemData.payMentStatus == 1 && itemData.status == 2 ? '查看凭证' : itemData.files.length ? '修改凭证' : '上传凭证'}}
+ + + \ No newline at end of file diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue index cbb02db..6b32a57 100644 --- a/src/components/UploadFile/index.vue +++ b/src/components/UploadFile/index.vue @@ -1,13 +1,13 @@