Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-07 20:46:01 +08:00
parent 7f012015cd
commit a240d39e19
5 changed files with 143 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-30 14:00:43 * @Date : 2022-03-30 14:00:43
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -35,23 +35,53 @@
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_individual_income_page" [columns]="columns" <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="orderStatus" let-item let-index="index"> <ng-template st-row="putStatusLabel" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span> <span *ngIf="item?.putStatus !== '2'">{{item?.billStatusLabel}}</span>
<span style="color: red;" (click)="unnormal(item)">异常</span> <span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">异常</span>
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<ng-template st-row="localValid" let-item let-index="index"> <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
</ng-template>
<!-- <ng-template st-row="localValid" let-item let-index="index">
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span> <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
</ng-template> -->
<ng-template st-row="loadingPicture" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.loadingPicture">
<app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
</div>
</div>
</ng-template> </ng-template>
<ng-template st-row="amount" let-item let-index="index"> <ng-template st-row="unloadPicture" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div> <div class="imgBox">
<div *ngIf="item.unloadPicture">
<app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="loadingLadingBill" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.loadingLadingBill">
<app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="signatureForm" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.signatureForm">
<app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="orderAmount" let-item let-index="index">
<div class="text-right">{{item?.orderAmount | currency :' '}}</div>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

8
src/app/routes/tax-management/components/order-reporting/order-reporting.component.less
View File

@ -11,4 +11,12 @@
/* stylelint-disable-next-line order/properties-order */ /* stylelint-disable-next-line order/properties-order */
fill: currentColor; fill: currentColor;
} }
::ng-deep {
.imgBox {
display: flex;
img {
width: 60px !important;
}
}
}
} }

127
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -102,7 +102,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } }, _$expand: { type: 'boolean', ui: { hidden: true } },
billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
resourceCode: { wayBillCode: {
type: 'string', type: 'string',
title: '运单号', title: '运单号',
ui: { ui: {
@ -152,7 +152,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}, },
} }
}, },
carNo3: { collectionUserName: {
title: '收款人', title: '收款人',
type: 'string', type: 'string',
maxLength: 9, maxLength: 9,
@ -163,8 +163,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}, },
} }
}, },
putStatus: {
serviceType2: {
title: '上传状态', title: '上传状态',
type: 'string', type: 'string',
ui: { ui: {
@ -178,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
} }
}, },
serviceType1: { serviceType1: {
title: '本地校验', title: '精准',
type: 'string', type: 'string',
ui: { ui: {
placeholder: '请选择', placeholder: '请选择',
@ -190,7 +189,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}, },
} }
}, },
enterpriseInfoId: { networkTransporter: {
type: 'string', type: 'string',
title: '网络货运人', title: '网络货运人',
ui: { ui: {
@ -203,7 +202,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
asyncData: () => this.shipperservice.getNetworkFreightForwarder() asyncData: () => this.shipperservice.getNetworkFreightForwarder()
} }
}, },
createTime: { recentlyPutTime: {
title: '上传时间', title: '上传时间',
type: 'string', type: 'string',
ui: { ui: {
@ -215,7 +214,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}, },
} as SFDateWidgetSchema, } as SFDateWidgetSchema,
}, },
createTime3: { orderPayTime: {
title: '结束时间', title: '结束时间',
type: 'string', type: 'string',
ui: { ui: {
@ -241,57 +240,57 @@ export class TaxManagementOrderReportingComponent implements OnInit {
initST() { initST() {
this.columns = [ this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, { title: '上传状态', index: 'putStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, { title: '精准', index: 'platformCheckStatusLabel', className: 'text-center', width: '120px', },
{ {
title: '订单号', title: '订单号',
render: 'billComplianceVOS', index: 'billCode',
className: 'text-center', className: 'text-center',
width: '150px', width: '150px',
}, },
{ title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
{ {
title: '网络货运人', title: '网络货运人',
render: 'serviceType', render: 'serviceType',
className: 'text-center', className: 'text-center',
width: '180px', width: '180px',
}, },
{ title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, { title: '卸货地', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
{ title: '货主名称', render: 'driver', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' },
{ title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
{ title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' }, { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' },
{ title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
{ title: '到车时间', render: 'driver', className: 'text-center', width: '150px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },
{ title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' },
{ title: '订单金额', render: 'amount', className: 'text-center', width: '250px' }, { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' },
{ title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' },
{ title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' }, { title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' }, { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '运费金额', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' },
{ title: '装卸方式', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' },
{ title: '支付方式', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' },
{ title: '支付账号', render: 'transportInfo', className: 'text-center', width: '200px' }, { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' },
{ title: '银行流水号', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' },
{ title: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' }, { title: '收款人姓名', index: 'collectionUserName', className: 'text-center', width: '250px' },
{ title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '收款人身份证号码', index: 'collectionUserCertificateNumber', className: 'text-center', width: '180px' },
{ title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' }, { title: '装货照片', render: 'loadingPicture', className: 'text-center', width: '100px' },
{ title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '卸货照片', render: 'unloadPicture', className: 'text-center', width: '100px' },
{ title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' },
{ title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' },
{ title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' },
]; ];
} }
/** /**
*撤销 *撤回
* @param record 记录实例 * @param record 记录实例
*/ */
recall() { recall() {
@ -299,13 +298,17 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要撤回的数据'); this.openWainingModal('请选择需要撤回的数据');
return; return;
} }
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.modal.confirm({ this.modal.confirm({
nzTitle: '撤回提示', nzTitle: '撤回提示',
nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
nzOkText: '确定', nzOkText: '确定',
nzCancelText: '取消', nzCancelText: '取消',
nzOnOk: () => { 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) { if (res) {
this.service.msgSrv.success('撤销成功'); this.service.msgSrv.success('撤销成功');
this.search(); this.search();
@ -324,10 +327,14 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要更新的数据！'); this.openWainingModal('请选择需要更新的数据！');
return; 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) { if (res) {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');
this.search(); this.st.load(1);
} }
}) })
} }
@ -336,13 +343,22 @@ export class TaxManagementOrderReportingComponent implements OnInit {
* @param record 记录实例 * @param record 记录实例
*/ */
unnormal(value: any) { 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({ this.modal.confirm({
nzTitle: '税务审核结果', nzTitle: '税务审核结果',
nzContent: '订单结算时间所在月份与申报月份不一致', nzContent: '订单结算时间所在月份与申报月份不一致',
nzOkText: '确定', nzOkText: '确定',
nzCancelText: '', nzCancelText: '',
nzOnOk: () => { 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) { if (res) {
this.service.msgSrv.success('撤销成功'); this.service.msgSrv.success('撤销成功');
this.search(); this.search();
@ -356,7 +372,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
selectChange(item: any) { selectChange(item: any) {
this.selectedIndex = item?.representationsStatus || ''; this.selectedIndex = item?.representationsStatus || '';
setTimeout(() => { setTimeout(() => {
this.st.load(1); this.st.load();
}) })
} }
@ -399,12 +415,16 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要上传的数据'); this.openWainingModal('请选择需要上传的数据');
return; return;
} }
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { let params: any[] = [];
// if (res) { this.selectedRows.forEach(item => {
// this.service.msgSrv.success('上传成功'); params.push(item.id);
// this.search(); });
// } 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 nzFooter: null
}); });
modalRef.afterClose.subscribe(res => { modalRef.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
}) })
} }

12
src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-31 11:10:10
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 20:07:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div nz-row> <div nz-row>
<div style="width: 10%;"> <div style="width: 10%;">
<nz-tabset [nzTabPosition]="'left'" style="height: 100%;"> <nz-tabset [nzTabPosition]="'left'" style="height: 100%;">
@ -5,7 +15,7 @@
</nz-tabset> </nz-tabset>
</div> </div>
<div style="width: 90%;"> <div style="width: 90%;">
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_individual_income_page" [columns]="columns" <st #st [scroll]="{x:'1000px'}" [data]="service.$api_listOperationalReportPage" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
[bordered]="true"> [bordered]="true">

10
src/app/routes/tax-management/services/tax-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-27 10:30:56 * @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -27,6 +27,14 @@ export class TaxManagementService extends BaseService {
// 查询运营报表 // 查询运营报表
$api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
$api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 $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_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报 $api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置 $api_get_upload_setting = ``; // 修改上传设置