diff --git a/.env.development b/.env.development index 440a1a4..f5c3fc0 100644 --- a/.env.development +++ b/.env.development @@ -14,4 +14,7 @@ VUE_APP_API= '/' # 方楠 # VUE_APP_BASE_API = 'https://2537287x0n.imdo.co' -VUE_APP_BASE_API = '/proxy-api' \ No newline at end of file +VUE_APP_BASE_API = '/proxy-api' + +#线上预览 +VUE_APP_ONLINE_API = 'http://139.224.253.31:48012' \ No newline at end of file diff --git a/.env.production b/.env.production index 8797bcf..1a17744 100644 --- a/.env.production +++ b/.env.production @@ -14,4 +14,10 @@ VUE_APP_API= '/' # 方楠 VUE_APP_BASE_API = 'http://139.224.253.31:8081' +# VUE_APP_BASE_API = 'http://one-h5.lyrfp.com' +# 开发环境 不要删 +# VUE_APP_BASE_API = 'http://192.168.3.128:58088' # VUE_APP_BASE_API = 'http://60.204.223.58:8080' + +#线上预览 +VUE_APP_ONLINE_API = 'http://139.224.253.31:48012' diff --git a/package.json b/package.json index 4f11f8b..d3cbc1b 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "crypto-js": "^4.1.1", "dayjs": "^1.11.5", "dingtalk-jsapi": "^2.15.2", + "echarts": "^5.5.0", "exif-js": "^2.3.0", "html2canvas": "^1.4.1", "js-base64": "^3.7.5", diff --git a/src/api/bs/chart.js b/src/api/bs/chart.js new file mode 100644 index 0000000..0e38dba --- /dev/null +++ b/src/api/bs/chart.js @@ -0,0 +1,58 @@ +import request from '@/plugin/axios' + +// 申请单报表 +export function applyReportApi(query) { + return request({ + url: 'bs/expense-apply/getreport', + method: 'get', + params: query, + }) +} +// 申请单报表 +export function claimReportApi(query) { + return request({ + url: 'bs/expense-claim/getreport', + method: 'get', + params: query, + }) +} + +// 报表 +export function gatherMsgApi(query) { + return request({ + url: 'bs/statement/gathering ', + method: 'get', + }) +} + +// 申请单报表 +export function paymentMsgApi(query) { + return request({ + url: 'bs/statement/payment', + method: 'get', + }) +} + +// 付款饼图 +export function paymentPieApi(query) { + return request({ + url: '/bs/statement/paymentPie', + method: 'get', + }) +} +// 收款饼图 +export function gatheringPieApi(query) { + return request({ + url: '/bs/statement/gatheringPie', + method: 'get', + }) +} + +// 供应商柱状图 +export function paymentColumnarApi(query) { + return request({ + url: '/bs/statement/paymentColumnar', + method: 'get', + }) +} + diff --git a/src/api/bs/vendorPayment.js b/src/api/bs/vendorPayment.js index dfe5d04..6a55b6c 100644 --- a/src/api/bs/vendorPayment.js +++ b/src/api/bs/vendorPayment.js @@ -27,10 +27,11 @@ export function deleteVendorPayment(id) { } // 获得对公付款 -export function getVendorPayment(id) { +export function getVendorPayment(query) { return request({ - url: '/bs/vendor-payment/get?id=' + id, - method: 'get' + url: '/bs/vendor-payment/get', + method: 'get', + params: query }) } diff --git a/src/api/system/bankInfo.js b/src/api/system/bankInfo.js new file mode 100644 index 0000000..7915f00 --- /dev/null +++ b/src/api/system/bankInfo.js @@ -0,0 +1,34 @@ +import request from '@/plugin/axios' +// 创建银行账户信息 +export function createBankInfo(data) { + return request({ + url: "/system/bank-info/create", + method: "post", + data: data, + }); +} + +// 更新银行账户信息 +export function updateBankInfo(data) { + return request({ + url: "/system/bank-info/update", + method: "put", + data: data, + }); +} + +// 删除银行账户信息 +export function deleteBankAccountInfo(id) { + return request({ + url: "/system/bank-info/delete?id=" + id, + method: "delete", + }); +} + +// 获取银行账户信息详情 +export function getDetail(id) { + return request({ + url: "/system/bank-info/get?id=" + id, + method: "get", + }); +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 5dc5d18..475610e 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -36,14 +36,21 @@ export function addUser(data) { } // 修改用户 -export function updateUser(data) { +// export function updateUser(data) { +// return request({ +// url: '/system/user/update', +// method: 'put', +// data: data +// }) +// } +// 修改用户个人信息 +export function updateUserProfile(data) { return request({ - url: '/system/user/update', + url: '/system/user/profile/update', method: 'put', data: data }) } - // 删除用户 export function delUser(userId) { return request({ @@ -96,14 +103,14 @@ export function getUserProfile() { }) } -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile/update', - method: 'put', - data: data - }) -} +// // 修改用户个人信息 +// export function updateUserProfile(data) { +// return request({ +// url: '/system/user/profile/update', +// method: 'put', +// data: data +// }) +// } // 用户密码重置 export function updateUserPwd(oldPassword, newPassword) { @@ -135,3 +142,4 @@ export function importTemplate() { responseType: 'blob' }) } + diff --git a/src/components/ApprovalProcess/index.vue b/src/components/ApprovalProcess/index.vue index 35e2971..0fc9153 100644 --- a/src/components/ApprovalProcess/index.vue +++ b/src/components/ApprovalProcess/index.vue @@ -19,9 +19,9 @@
-
{{ step.assigneeUser.nickname }}
+
{{ step.assigneeUser?.nickname }}
审批时间: {{ parseTime(step.endTime) || '-' }}
-
部门:{{ step.assigneeUser.deptName }}
+
部门:{{ step.assigneeUser?.deptName }}
审批意见:{{ step.reason }}
@@ -95,6 +95,9 @@ export default { if (this.processInstanceId) { getProcessInstance(this.processInstanceId).then((res) => { this.startObj = res.data || {} + console.log( + this.startObj + ); }) getTaskListByProcessInstanceId(this.processInstanceId).then(response => { // 审批记录 @@ -136,6 +139,7 @@ export default { }) }); this.$emit('onSetId', (Array.isArray(this.runningTasks) && this.runningTasks.length ? this.runningTasks[this.runningTasks.length - 1] : {}).id) + console.log(this.tasks ,'tasks'); }); } } diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue index 69202d3..12505f9 100644 --- a/src/components/UploadFile/index.vue +++ b/src/components/UploadFile/index.vue @@ -143,7 +143,7 @@ export default { this.$loading(true, 'file') this.uploadFiles(newList) .then((res) => { - ;(res || []).map((item) => { + (res || []).map((item) => { this.list.push(item) }) this.$loading(false, 'file') diff --git a/src/router/modules/contract.js b/src/router/modules/contract.js index 72dee85..de380de 100644 --- a/src/router/modules/contract.js +++ b/src/router/modules/contract.js @@ -18,9 +18,10 @@ 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: '/corporateReceiptsApproval', name: `${pre}corporateReceipts`, component: () => import('@/views/contract/corporateReceipts'), meta: { cache: true, title: '对公收款' } }, + { path: '/corporateReceiptsApproval', name: `${pre}corporateReceiptsApproval`, 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: '/corporatePaymentApproval', name: `${pre}corporatePaymentApproval`, 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/router/modules/reportForms.js b/src/router/modules/reportForms.js new file mode 100644 index 0000000..ac2817a --- /dev/null +++ b/src/router/modules/reportForms.js @@ -0,0 +1,15 @@ +import layoutHome from '../../layout/index.vue' + +const meta = { requiresAuth: true } + +export default { + path: '/reportForms', + name: 'reportForms', + meta, + redirect: { name: 'reportForms' }, + component: layoutHome, + children: (pre => [ + { path: '/myReportForms', name: `${pre}myReportForms`, component: () => import('@/views/reportForms/myReportForms'), meta: { cache: true, title: '我的报表' } }, + { path: '/userInfo', name: `${pre}UserInfo`, component: () => import('@/views/reportForms/userInfo'), meta: { cache: true, title: '个人信息' } }, + ])('reportForms-') +} diff --git a/src/router/routes.js b/src/router/routes.js index 9c42c7b..3b0ed5b 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,6 +1,7 @@ import layoutHome from '../layout/index.vue' import company from './modules/company' import contract from './modules/contract' +import reportForms from './modules/reportForms' export const frameInRoutes = [ { path: '/', @@ -13,7 +14,8 @@ export const frameInRoutes = [ ])('home-') }, company, - contract + contract, + reportForms ] export const frameOutRoutes = [ diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue index 111ee1e..5b11b86 100644 --- a/src/views/company/claim/index.vue +++ b/src/views/company/claim/index.vue @@ -373,17 +373,28 @@
费用  {{ nIndex + 1 }} - + 报销规则报销规则 + + + + 新增发票 +
+
{ let tree = res.data || [] diff --git a/src/views/company/fileShow/index.vue b/src/views/company/fileShow/index.vue index 24c721a..72f9029 100644 --- a/src/views/company/fileShow/index.vue +++ b/src/views/company/fileShow/index.vue @@ -1,13 +1,27 @@