diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 789d9c54..30b22de8 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 15:29:14 + * @LastEditTime : 2022-04-07 20:31:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,23 +35,53 @@ - - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - 异常 + + + {{item?.billStatusLabel}} + 异常 - - + +
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+ + + +
+
+ +
+
- -
{{item?.amount | currency :' '}}
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
{{item?.orderAmount | currency :' '}}
 diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less index 59e4c77b..94ec07e0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less @@ -11,4 +11,12 @@ /* stylelint-disable-next-line order/properties-order */ fill: currentColor; } + ::ng-deep { + .imgBox { + display: flex; + img { + width: 60px !important; + } + } + } } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index eae59243..e41596d9 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -102,7 +102,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + wayBillCode: { type: 'string', title: '运单号', ui: { @@ -152,7 +152,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - carNo3: { + collectionUserName: { title: '收款人', type: 'string', maxLength: 9, @@ -163,8 +163,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - - serviceType2: { + putStatus: { title: '上传状态', type: 'string', ui: { @@ -178,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { } }, serviceType1: { - title: '本地校验', + title: '精准', type: 'string', ui: { placeholder: '请选择', @@ -190,7 +189,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - enterpriseInfoId: { + networkTransporter: { type: 'string', title: '网络货运人', ui: { @@ -203,7 +202,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, - createTime: { + recentlyPutTime: { title: '上传时间', type: 'string', ui: { @@ -215,7 +214,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime3: { + orderPayTime: { title: '结束时间', type: 'string', ui: { @@ -241,57 +240,57 @@ export class TaxManagementOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '上传状态', index: 'putStatus', className: 'text-center', width: '120px', }, + { title: '精准', index: 'platformCheckStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', - render: 'billComplianceVOS', + index: 'billCode', className: 'text-center', width: '150px', }, - { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '网络货运人', render: 'serviceType', className: 'text-center', width: '180px', }, - { title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '货主名称', render: 'driver', className: 'text-center', width: '180px' }, - { title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '到车时间', render: 'driver', className: 'text-center', width: '150px' }, - { title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '订单金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '卸货地', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' }, + { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, + { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, + { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, + { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, + { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, + { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, + { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, + { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' }, + { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' }, + { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' }, + { title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' }, { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '运费金额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '装卸方式', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '支付方式', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '支付账号', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '银行流水号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' }, + { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' }, + { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' }, + { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' }, + { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' }, + { title: '收款人姓名', index: 'collectionUserName', className: 'text-center', width: '250px' }, + { title: '收款人身份证号码', index: 'collectionUserCertificateNumber', className: 'text-center', width: '180px' }, + { title: '装货照片', render: 'loadingPicture', className: 'text-center', width: '100px' }, + { title: '卸货照片', render: 'unloadPicture', className: 'text-center', width: '100px' }, + { title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' }, + { title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' }, + { title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' }, + { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, ]; } /** - *撤销 + *撤回 * @param record 记录实例 */ recall() { @@ -299,13 +298,17 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要撤回的数据'); return; } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); this.modal.confirm({ nzTitle: '撤回提示', nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -324,10 +327,14 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要更新的数据！'); return; } - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); - this.search(); + this.st.load(1); } }) } @@ -336,13 +343,22 @@ export class TaxManagementOrderReportingComponent implements OnInit { * @param record 记录实例 */ unnormal(value: any) { + // if (this.selectedRows.length === 0) { + // this.openWainingModal('请选择需要更新的数据！'); + // return; + // } + console.log(this.selectedRows); + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); this.modal.confirm({ nzTitle: '税务审核结果', nzContent: '订单结算时间所在月份与申报月份不一致', nzOkText: '确定', nzCancelText: '', nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -356,7 +372,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { selectChange(item: any) { this.selectedIndex = item?.representationsStatus || ''; setTimeout(() => { - this.st.load(1); + this.st.load(); }) } @@ -399,12 +415,16 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要上传的数据'); return; } - // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('上传成功'); - // this.search(); - // } - // }) + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('上传成功'); + this.st.load(); + } + }) } @@ -421,6 +441,9 @@ export class TaxManagementOrderReportingComponent implements OnInit { nzFooter: null }); modalRef.afterClose.subscribe(res => { + if (res) { + this.st.load(); + } }) } diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html index 91c1d871..cd20c559 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -1,3 +1,13 @@ +
@@ -5,7 +15,7 @@
- diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index ed893c38..adc54df3 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:18:01 + * @LastEditTime : 2022-04-07 20:41:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,14 @@ export class TaxManagementService extends BaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + // 订单上报列表 + $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; + // 根据订单Id更新税务订单 + $api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`; + // 撤回税务订单 + $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`; + // 上传税务订单 + $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`; $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置