diff --git a/src/api/mine.js b/src/api/mine.js index 468756f2..e402313c 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -253,6 +253,42 @@ export function createBatch(data) { }) } +// 开票信息列表 +export function getFinanceBatchList(data) { + return request({ + url:'/order/taskInvoiceFinanceBatch/selectFinanceBatchPageList', + method:'POST', + data, + }) +} + +// 批次对应发票信息列表 +export function financeInvoiceList(data) { + return request({ + url:'/order/taskInvoiceBatch/selectInvoicePageList', + method:'POST', + data, + }) +} + +// 查看发票 +export function selectInvoiceDetailInfo(data) { + return request({ + url:'/order/taskInvoiceBatch/selectInvoiceDetailInfo', + method:'POST', + data, + }) +} + +// 填写快递 +export function saveBatchCourierNumber(data) { + return request({ + url:'/order/taskInvoiceBatch/supplierSaveBatchCourierNumber', + method:'POST', + data, + }) +} + // 获取服务商发票信息 export function getBillingInfo(url, data) { return request({ diff --git a/src/router/index.js b/src/router/index.js index 6babee8c..3be42fd9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -88,6 +88,14 @@ const routes = [ title: '工单批次' } }, + { + path: "/invoiceListInfo", + name: 'invoiceListInfo', + component: () => import('@/views/index/invoiceListInfo.vue'), + meta: { + title: '开票信息' + } + }, { path: "/invoiceInfo", name: 'invoiceInfo', diff --git a/src/views/index/invoiceInfo.vue b/src/views/index/invoiceInfo.vue index 4074a8a1..a5a4479f 100644 --- a/src/views/index/invoiceInfo.vue +++ b/src/views/index/invoiceInfo.vue @@ -8,7 +8,7 @@ :border="false" :fixed="true" :safe-area-inset-top="true" - @click-left="goBack" + @click-left="h5GoBack" />
@@ -18,8 +18,8 @@
财务编号
- 11 - + {{invoiceInfo.financeBatchCode}} +
@@ -31,7 +31,7 @@
总金额
- {{invoiceInfo.orderNum}} + {{invoiceInfo.totalMoney}}
@@ -61,7 +61,7 @@
失败原因
- {{invoiceInfo.remark || ''}} + {{invoiceInfo.failRemark || ''}}
@@ -73,86 +73,145 @@
对账状况
- {{invoiceInfo.statusString}} + {{ statusStr(invoiceInfo.status, invoiceInfo.createTime) }}
-
-
批次信息
-
-
-
财务编号
-
- 11 - -
+
+
发票信息
+
+
+
{{item.accountName}}
+
查看
-
-
工单数量
-
- {{invoiceInfo.orderNum}} -
+
+ 发票号码: + {{item.financeBatchCode}}
-
-
总金额
-
- {{invoiceInfo.orderNum}} -
+
+ 发票金额: + ￥{{item.invoiceMoney}}元
-
-
扣款
-
- {{invoiceInfo.cutMoney || ''}} -
-
-
-
税额扣款
-
- {{invoiceInfo.taxCutMoney || ''}} -
-
-
-
开票金额
-
- {{invoiceInfo.invoiceMoney || ''}} -
-
-
-
备注
-
- {{invoiceInfo.remark || ''}} -
-
-
-
失败原因
-
- {{invoiceInfo.remark || ''}} -
-
-
-
创建时间
-
- {{invoiceInfo.createTime}} -
-
-
-
对账状况
-
- {{invoiceInfo.statusString}} -
+
+ 开票日期: + {{ item.invoiceDate }}
+ +
+
快递信息
+
+
+ 发票类型: + + + 电子发票 + 纸质发票 + + +
+
+ 补录快递单号: + + + +
+
+
+ +
+
保存
+
@@ -164,7 +223,6 @@ background-color: #F4F5F7; overflow-y: auto; box-sizing: border-box; - padding-bottom: 30px; } .navBar{ margin-bottom: 46px; @@ -175,6 +233,7 @@ background-color: #fff; width: 100%; padding: 15px 15px; + box-sizing: border-box; .tab_title { font-size: 14px; font-weight: bold; @@ -184,7 +243,7 @@ .item_wrap { display: flex; align-items: center; - line-height: 30px; + line-height: 26px; font-size: 12px; .item_label { color: rgba(0,0,0,0.5); @@ -204,4 +263,82 @@ height: 15px; margin-left: 10px } + + .itemWrap{ + /*background: #FFFFFF;*/ + background-color: #EBF2F7; + padding: 10px 20px; + border: 1px solid #EBF2F7; + border-radius: 4px; + position: relative; + width: 100%; + box-sizing: border-box; + line-height: 26px; + @include flexBetween; + margin-bottom: 10px; + .line1{ + width: 100%; + @include flexColBet; + .checkBtn{ + @include bgFontColor(#FFFFFF,#354D93); + @include wh(48px,18px); + border-radius: 3px; + line-height: 18px; + text-align: center; + } + } + } + .item{ + display: flex; + @include fontWeightSize(400,12px); + span{ + display: inline-block; + } + .title{ + opacity: 0.5; + margin-right: 5px; + } + .own_title { + font-weight: bold; + font-size: 14px; + opacity: 1; + } + } + .mt10 { + margin-top: 10px; + } + .bg_cls { + background-color: #fff; + } + .pd_cls { + padding-top: 15px; + padding-bottom: 15px; + } + ::v-deep .van-cell { + padding: 0; + border: 1px solid #EBF2F7; + } + .width_cls { + width: 80px; + } + .invoice_btn_wrap { + width: 100%; + padding: 20px; + box-sizing: border-box; + background-color: #fff; + .btn { + width: 100%; + background-color: #2C395F; + color: #fff; + padding: 15px 0; + text-align: center; + border-radius: 6px; + } + } + .mb10 { + margin-bottom: 10px; + } + ::v-deep .van-radio__icon { + margin-right: 10px; + } diff --git a/src/views/index/invoiceListInfo.vue b/src/views/index/invoiceListInfo.vue new file mode 100644 index 00000000..1e22977c --- /dev/null +++ b/src/views/index/invoiceListInfo.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/views/index/invoicingNotify.vue b/src/views/index/invoicingNotify.vue index 7ba8d977..048f8567 100644 --- a/src/views/index/invoicingNotify.vue +++ b/src/views/index/invoicingNotify.vue @@ -184,6 +184,7 @@ export default { dispatchAppSearchInvoiced: this.dispatchAppSearchInvoiced, total: this.total, batchCode: this.batchCode, + supplierId: this.supplierId, current: 1, }) if(res.code == 200){ diff --git a/src/views/index/showInvoice.vue b/src/views/index/showInvoice.vue index 268d5a44..4ae013bf 100644 --- a/src/views/index/showInvoice.vue +++ b/src/views/index/showInvoice.vue @@ -16,11 +16,11 @@
付款方
-
{{invoiceInfo.accountName}}
+
中道汽车救援股份有限公司
收款方
-
{{invoiceInfo.payName}}
+
{{invoiceInfo.accountName}}
发票号码
diff --git a/src/views/index/uploadInvoice.vue b/src/views/index/uploadInvoice.vue index 13907101..80c9e734 100644 --- a/src/views/index/uploadInvoice.vue +++ b/src/views/index/uploadInvoice.vue @@ -97,21 +97,16 @@ form: { courierNumber: '', invoiceType: '', //电子发票还是纸质发票 - } + }, + show: true, } }, async mounted() { - this.list = JSON.parse(localStorage.getItem('list')); - this.batchIds = []; - this.list.map(a => { - this.batchIds.push(a.id) - }) - console.log('this.batchIds', this.batchIds) - this.shouldRate = this.list[0]?.shouldRate - this.realRate = this.list[0]?.realRate - this.invoiceType = this.list[0]?.invoiceType - this.supplierId = this.list[0]?.supplierId - await this.getInfo(); + await this.initData(); + }, + async activated() { + await this.initData(); + this.show = true; }, watch: { tableData: { @@ -130,7 +125,25 @@ return total } }, + deactivated() { + if (this.show) { + this.tableData = []; + } + }, methods: { + async initData() { + this.list = JSON.parse(localStorage.getItem('list')); + this.batchIds = []; + this.list.map(a => { + this.batchIds.push(a.id) + }) + console.log('this.batchIds', this.batchIds) + this.shouldRate = this.list[0]?.shouldRate + this.realRate = this.list[0]?.realRate + this.invoiceType = this.list[0]?.invoiceType + this.supplierId = this.list[0]?.supplierId + await this.getInfo(); + }, async getInfo() { if(this.supplierId) { let res = await getBillingInfo('/supplier/info/billing/getBySupplierId/' + this.supplierId ) @@ -325,6 +338,7 @@ }, goInvoiceDetail (item) { localStorage.setItem('invoiceDetail', JSON.stringify(item)) + this.show = false; this.goPage('showInvoice') }, getInvoiceMoney() {