From e81c0a383b7ab3268684c213d8f9f3bf0de1f594 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 7 Apr 2023 14:00:14 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/anruifinmanagement/fininvoiceapply.js | 23 ++- .../src/router/modules/codemenu.js | 4 +- .../billingmanagement/billingmanagement.vue | 178 +++++++++--------- .../billingmanagementAdd.vue | 112 +++++++++-- .../billingmanagementInfo.vue | 54 ++++-- 5 files changed, 245 insertions(+), 126 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js index abd0858fa5..ae6a726e32 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 开票管理列表条件查询 export function listPage(data) { return request({ - url: '/fin/v1/finginvoiceapply/listPage', + url: '/fin/v1/finvehicleinvoice/listPage', data, method: 'post', headers: { @@ -11,3 +11,24 @@ export function listPage(data) { } }) } + +// 开票管理--初始化 +export function fetchDetailsBySid(data) { + return request({ + url: '/fin/v1/finvehicleinvoice/fetchSid/' + data, + method: 'get' + }) +} + +// 开票管理--编辑 +export function saveOrUpdate(data) { + return request({ + url: '/fin/v1/finvehicleinvoice/saveOrUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index d172a9badd..bbd0d79cf3 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -177,13 +177,13 @@ const codemenu = [ component: Layout, redirect: '/finginvoiceapply', meta: { - title: '开票' + title: '开票管理' }, children: [{ path: '/anruifinmanagement/finginvoiceapply/billingmanagement', component: () => import('@/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue'), name: 'KaiPiaoGuanLi', - meta: { title: '开票', noCache: true } + meta: { title: '开票管理', noCache: true } }] }, // 费用申请管理编辑 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue index cac3389a42..1f29c61a61 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue @@ -9,42 +9,42 @@
- + - - + + - + - + - + - - + + - - + + - + - + - + 至 - +
@@ -60,78 +60,80 @@
- + + + + - + @@ -143,11 +145,11 @@
- + - +
@@ -158,7 +160,6 @@ import { getOrgSidByPath, typeValues } from '@/api/jichuxinxi/dictcommons' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import FileUpload from '@/components/uploadFile/FileUpload' import billingmanagementAdd from './billingmanagementAdd' import billingmanagementInfo from './billingmanagementInfo' @@ -167,7 +168,6 @@ export default { components: { Pagination, pageye, - FileUpload, ButtonBar, billingmanagementAdd, billingmanagementInfo @@ -193,49 +193,30 @@ export default { tableKey: 0, list: [], srcList: [], - state_list: [ - { - dictKey: 0, - dictValue: '未认款' - }, - { - dictKey: 1, - dictValue: '已认款' - } - ], - paymentState_list: [ - { - dictKey: 0, - dictValue: '未打款' - }, - { - dictKey: 1, - dictValue: '已打款' - }, - { - dictKey: 2, - dictValue: '无需打款' - } - ], - applyType_list: [], + invoiceType_list: [], + state_list: [], + invoiceState_list: [], FormLoading: false, listLoading: false, listQuery: { params: { - state: 0, - paymentState: '', - subscriptionStartDate: '', - subscriptionEndDate: '', - proSchAppNo: '', - applyTypeKey: '', + invoiceTitle: '', + invoiceTypeKey: '', + contractNo: '', + customerName: '', + vinNo: '', + billingStateKey: '', + transferStateKey: '', + invoicingName: '', + invoiceCode: '', + createStartTime: '', + createEndTime: '', createOrgSid: '' }, current: 1, size: 10, total: 0 }, - dialogImageUrl: '', - imgList: [], rules: {} } }, @@ -268,9 +249,19 @@ export default { } }, init() { - typeValues({ type: 'applyType' }).then((resp) => { + typeValues({ type: 'invoiceType' }).then((resp) => { + if (resp.success) { + this.invoiceType_list = resp.data + } + }) + typeValues({ type: 'transferState' }).then((resp) => { + if (resp.success) { + this.invoiceState_list = resp.data + } + }) + typeValues({ type: 'billingState' }).then((resp) => { if (resp.success) { - this.applyType_list = resp.data + this.state_list = resp.data } }) getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { @@ -289,18 +280,18 @@ export default { }, // 查询列表信息 getList() { - // this.listLoading = true - // listPage(this.listQuery).then((response) => { - // console.log('列表查询结果：', response) - // this.listLoading = false - // if (response.success) { - // this.list = response.data.records - // this.listQuery.total = response.data.total - // } else { - // this.list = [] - // this.listQuery.total = 0 - // } - // }) + this.listLoading = true + listPage(this.listQuery).then((response) => { + console.log('列表查询结果：', response) + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) }, // 查询按钮 handleFilter() { @@ -310,12 +301,17 @@ export default { handleReset() { this.listQuery = { params: { - state: 0, - paymentState: '', - subscriptionStartDate: '', - subscriptionEndDate: '', - proSchAppNo: '', - applyTypeKey: '', + invoiceTitle: '', + invoiceTypeKey: '', + contractNo: '', + customerName: '', + vinNo: '', + billingStateKey: '', + transferStateKey: '', + invoicingName: '', + invoiceCode: '', + createStartTime: '', + createEndTime: '', createOrgSid: '' }, current: 1, @@ -334,7 +330,7 @@ export default { }, handleGetCheck(row) { this.dialogImgVisible = true - this.dialogImageUrl = row.witMatUrl + this.srcList = row.filePaths }, reseaState() { this.viewState = 1 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue index 4e10163f1e..50952903c4 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue @@ -12,45 +12,45 @@
发票信息
- +
开票单位
- {{ formobj.name }} + {{ formobj.invoiceTitle }}
合同编号
- {{ formobj.name }} + {{ formobj.contractNo }}
客户名称
- {{ formobj.name }} + {{ formobj.customerName }}
车架号
- {{ formobj.name }} + {{ formobj.vinNo }}
开票类型
- {{ formobj.name }} + {{ formobj.invoiceType }}
开票金额
- {{ formobj.name }} + {{ formobj.invoiceAmount }}
开票状态
- {{ formobj.name }} + {{ formobj.billingState }}
开票名称
- {{ formobj.name }} + {{ formobj.invoicingName }} @@ -60,17 +60,17 @@
开票日期
- +
发票号
- +
发票代码
- + @@ -87,11 +87,11 @@