diff --git a/src/components/MyInvoiceListCard/index.vue b/src/components/MyInvoiceListCard/index.vue index e3a4e61..5728c24 100644 --- a/src/components/MyInvoiceListCard/index.vue +++ b/src/components/MyInvoiceListCard/index.vue @@ -7,25 +7,81 @@
发票
-->
-
-
{{getDictDataLabel(DICT_TYPE.BS_INVOICE_KIND,itemData.type) || '未知'}}
-
+ + + -
-
- 不含税金额： {{itemData.excludingTaxAmount || '-'}} -
-
- 发票代码： {{itemData.invoiceCode || '-'}} -
-
- 开票日期： {{itemData.invoiceDate && dayjs(itemData.invoiceDate).format('YY/MM/DD HH:ss')}} -
-
- 验真状态： {{ itemData.status == 1 ? '已验真' : '未验真' }} -
+
+
发票消费类型： {{itemData.serviceType || '-'}}
+
发票代码： {{itemData.invoiceCode || '-'}}
+
发票号码： {{itemData.invoiceNum || '-'}}
+
开票日期： {{itemData.invoiceDate && dayjs(itemData.invoiceDate).format('YY/MM/DD HH:ss')}}
+
不含税金额： {{itemData.totalAmount || '-'}}
+
价税合计： {{itemData.amountInFiguers || '-'}}
+
税额： {{itemData.totalTax || '-'}}
+
发票种类： {{itemData.invoiceType || '-'}}
+
购方名称： {{itemData.purchaserName || '-'}}
+
购方纳税人识别号： {{itemData.purchaserRegisterNum || '-'}}
+
税率： {{itemData.commodityTaxRate || '-'}}
+
是否代开： {{itemData.agent || '-'}}
+
销售方名称： {{itemData.sellerName || '-'}}
+
销售方纳税人识别号： {{itemData.sellerRegisterNum || '-'}}
+
+
+
车票号： {{itemData.ticketNum || '-'}}
+
始发站： {{itemData.startingStation || '-'}}
+
到达站： {{itemData.destinationStation || '-'}}
+
出发日期： {{itemData.startingDate && dayjs(itemData.startingDate).format('YY/MM/DD HH:ss')}}
+
车次号： {{itemData.trainNum || '-'}}
+
车票金额： {{itemData.ticketRates || '-'}}
+
乘客姓名： {{itemData.name || '-'}}
+
时间： {{itemData.startingTime || '-'}}
+
座位号： {{itemData.seatNum || '-'}}
+
+
+
姓名： {{itemData.name || '-'}}
+
始发站： {{itemData.startingStation || '-'}}
+
目的站： {{itemData.destinationStation || '-'}}
+
航班号： {{itemData.flight || '-'}}
+
承运人： {{itemData.carrier || '-'}}
+
座位等级： {{itemData.seatClass || '-'}}
+
日期： {{itemData.startingDate && dayjs(itemData.startingDate).format('YY/MM/DD HH:ss')}}
+
时间： {{itemData.startingTime || '-'}}
+
电子客票号码： {{itemData.ticketNumber || '-'}}
+
票价： {{itemData.fare || '-'}}
+
燃油附加费： {{itemData.fuelSurcharge || '-'}}
+
民航发展基金/基建费： {{itemData.devFund || '-'}}
+
合计金额： {{itemData.ticketRates || '-'}}
+
签注： {{itemData.endorsement || '-'}}
+
+
+
服务商： {{itemData.serviceProvider || '-'}}
+
行程开始时间： {{itemData.startTime && dayjs(itemData.startTime).format('YY/MM/DD HH:ss')}}
+
行程结束时间： {{itemData.endTime && dayjs(itemData.endTime).format('YY/MM/DD HH:ss')}}
+
行程人手机号： {{itemData.phone || '-'}}
+
申请日期： {{itemData.applicationDate && dayjs(itemData.applicationDate).format('YY/MM/DD HH:ss')}}
+
上车日期： {{itemData.items[0].pickupDate && dayjs(itemData.items[0].pickupDate).format('YY/MM/DD HH:ss')}}
+
车型： {{itemData.items[0].carType || '-'}}
+
里程： {{itemData.items[0].distance || '-'}}
+
起点： {{itemData.items[0].startPlace || '-'}}
+
终点： {{itemData.items[0].destinationPlace || '-'}}
+
城市： {{itemData.items[0].city || '-'}}
+
金额： {{itemData.items[0].fare || '-'}}
+
总金额： {{itemData.totalFare || '-'}}
+
+
+
发票代码： {{itemData.invoiceCode || '-'}}
+
发票号码： {{itemData.invoiceNum || '-'}}
+
车牌号： {{itemData.taxiNum || '-'}}
+
日期： {{itemData.startingDate && dayjs(itemData.startingDate).format('YY/MM/DD HH:ss')}}
+
上车时间： {{itemData.pickupTime || '-'}}
+
下车时间： {{itemData.dropoffTime || '-'}}
+
总金额： {{itemData.totalFare || '-'}}
+
开票城市： {{itemData.location || '-'}}
+
单价： {{itemData.pricePerkm || '-'}}
+
里程： {{itemData.distance || '-'}}
@@ -50,7 +106,9 @@ export default { required: true, default: () => { } }, - + invoiceType:{ + default:String + } }, components: { @@ -78,14 +136,14 @@ export default { handleShow(id) { this.$router.push({ path: '/invoice', - query: { id, type: 'show' } + query: { id, type: 'show',invoiceType:this.invoiceType } }) }, handleEdit(id) { this.jumoStudentId = id this.$router.push({ path: '/invoice', - query: { id, type: 'edit' } + query: { id, type: 'edit',invoiceType:this.invoiceType } }) }, handleDel(id) { diff --git a/src/views/company/invoice/index.vue b/src/views/company/invoice/index.vue index c8064a9..93a8026 100644 --- a/src/views/company/invoice/index.vue +++ b/src/views/company/invoice/index.vue @@ -343,7 +343,12 @@ export default { let backRes = res.data || {} this.form = { ...backRes, - time: `${backRes.invoiceDate ? dayjs(backRes.invoiceDate).format('YYYY/MM/DD') : ''}`, + invoiceDate1: `${res.data.invoiceDate ? dayjs(res.data.invoiceDate).format('YYYY/MM/DD') : ''}`, + startingDate1:`${res.data.startingDate ? dayjs(res.data.startingDate).format('YYYY/MM/DD') : ''}`, + startTime1:`${res.data.startTime ? dayjs(res.data.startTime).format('YYYY/MM/DD') : ''}`, + endTime1:`${res.data.endTime ? dayjs(res.data.endTime).format('YYYY/MM/DD') : ''}`, + applicationDate1:`${res.data.applicationDate ? dayjs(res.data.applicationDate).format('YYYY/MM/DD') : ''}`, + agent1:res.data.agent, type: backRes.type } this.fileList = res.data.files || [] diff --git a/src/views/company/myInvoice/components/HeaderFilter.vue b/src/views/company/myInvoice/components/HeaderFilter.vue index e6b4bc6..dc36ddc 100644 --- a/src/views/company/myInvoice/components/HeaderFilter.vue +++ b/src/views/company/myInvoice/components/HeaderFilter.vue @@ -5,37 +5,190 @@
- -
-
-
- - {{item.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ 重置 + 确定
-
- 重置 - 确定 + + +
+
+ +
+
+ 重置 + 确定 +
-
- - - -
-
-
- -
- -
+ +
+
+ +
+
+ +
+
+ 重置 + 确定
-
- 重置 - 确定 + + +
+
+ +
+
+ 重置 + 确定 +
+
+ +
+
+ +
+
+ +
+
+ 重置 + 确定 +
+
+ + +
+
+ +
+
+ 重置 + 确定 +
+
+ + +
+
+ +
+
+ 重置 + 确定 +
+
+ +
+
+ +
+
+ +
+
+ 重置 + 确定 +
-
- + + +
+
+ +
+
+ 重置 + 确定 +
+
+ + +
+
+ +
+
+ 重置 + 确定 +
+
+ +
+
+ +
+
+ +
+
+ 重置 + 确定 +
+
+ + +
+
+ +
+
+ 重置 + 确定 +
+
+ + +
+
+ +
+
+ 重置 + 确定 +
+
+ +
@@ -84,6 +237,7 @@ export default { props: { listType: String, // 'detail' 详情 paramProp: Object, + type:String, }, components: { ReQuickDateBtns: () => import('@/components/ReComponents/ReQuickDateBtns'), @@ -156,7 +310,7 @@ export default { this.listQuery.endDate = `${e.time[1]} 23:59:59` }, handleConfirm() { - this.$refs.vanDropItem4 && this.$refs.vanDropItem4.toggle(false) + // this.$refs.vanDropItem4 && this.$refs.vanDropItem4.toggle(false) this.$refs.vanDropItem1 && this.$refs.vanDropItem1.toggle(false) this.$emit('onListQuery', this.listQuery) }, @@ -237,10 +391,12 @@ export default { }, handleMoreConfirm() { this.$emit('onListQuery', this.listQuery) - this.moreFilterShow = false + }, handleReset() { - this.listQuery.type = null + this.listQuery = {} + this.$emit('onListQuery', this.listQuery) + }, diff --git a/src/views/company/myInvoice/components/UserList.vue b/src/views/company/myInvoice/components/UserList.vue index 5e8fbc6..cd93e08 100644 --- a/src/views/company/myInvoice/components/UserList.vue +++ b/src/views/company/myInvoice/components/UserList.vue @@ -2,7 +2,7 @@
- + @@ -10,10 +10,10 @@
- +
- +
@@ -45,7 +45,8 @@ import { getScrollTop, findAreaIdName } from '@/utils' // import { getOrderListApi, getDataStatisticsApi, updateOrderSingleListApi } from '@/api/potentialGuest/order' // import { getInvoicePage, } from "@/api/bs/expenseApply"; -import { deleteInvoice, getInvoice, getInvoicePage, exportInvoiceExcel } from "@/api/bs/invoice"; +// import { deleteInvoice, getInvoice, getInvoicePage, exportInvoiceExcel } from "@/api/bs/invoice"; +import { deleteInvoice01, getInvoicePage01, exportInvoiceExcel01, deleteInvoice02, getInvoicePage02, exportInvoiceExcel02, deleteInvoice03, getInvoicePage03, exportInvoiceExcel03, deleteInvoice04, getInvoicePage04, exportInvoiceExcel04, deleteInvoice05, getInvoicePage05, exportInvoiceExcel05 } from "@/api/bs/invoice"; import { mapState, mapMutations } from 'vuex' import dayjs from 'dayjs' export default { @@ -114,6 +115,7 @@ export default { pageNo: 1, pageSize: this.singlePageSize, } + const getInvoicePage = this.type == '01' ? getInvoicePage01 : this.type == '02' ? getInvoicePage02 : this.type == '03' ? getInvoicePage03 : this.type == '04' ? getInvoicePage04 : getInvoicePage05; getInvoicePage(listQuery).then((res) => { let arr = (res.data && res.data.list || []).filter(item => item.id == id) resolve(arr) @@ -186,10 +188,12 @@ export default { getTableList(val) { // const { shellIdsLocal, collegeInfoIdLocal, startDate, endDate, keyword, type, method, targets, usePersonId, teacherIds, chargePersonIds } = this.listQuery const query = { - ...this.listQuery + ...this.listQuery, + type:this.type } this.moreLoading = true this.$loading(true, 'tableLoading') + const getInvoicePage = this.type == '01' ? getInvoicePage01 : this.type == '02' ? getInvoicePage02 : this.type == '03' ? getInvoicePage03 : this.type == '04' ? getInvoicePage04 : getInvoicePage05; getInvoicePage(query).then(res => { let resList = res.data && res.data.list || [] if (['init', 'refresh'].includes(val)) { @@ -221,6 +225,11 @@ export default { invoiceType:`0${index+1}` } }) + }, + vanTabsChange(){ + this.listQuery.pageNo = 1 + this.finished = false + this.getTableList('init') } } }