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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
weiyu
2022-05-13 14:58:54 +08:00
parent f5b57e40c0 f6759047b9
commit e28f6a638b
20 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-05-13 09:36:19
* @LastEditTime : 2022-05-13 14:44:24
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

2
src/app/routes/commom/components/basic-table/basic-table.component.ts
View File

@ -59,8 +59,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes
}
openDrawer() {
console.log(this.sfValue);
if (this.searchDrawerService.drawer?.length > 0) {
this.searchDrawerService.create(this.sfValue, this.schema);
} else {

2
src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
View File

@ -142,7 +142,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '序号', render: 'no', width: 80 },
{ title: '费用号', index: 'feeLId', width: 100 },
{ title: '费用号', index: 'feeHCode', width: 100 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 },
{ title: '订单号', index: 'billHCode', width: 100 },
// { title: '订单日期', index: 'billTime', width: 150 },

4
src/app/routes/partner/channel-sales/components/edit/edit.component.ts
View File

@ -53,7 +53,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
delete value1.employeeVO;
let value = res.employeeVO;
List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
res.roleInfoVOList.forEach((element: any) => {
res?.roleInfoVOList?.forEach((element: any) => {
List3.push(element.id);
});
setTimeout(() => {
@ -222,7 +222,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
delete params.telephone;
this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => {
if (res) {
this.service.msgSrv.success(res.msg);
this.service.msgSrv.success('新增成功！');
this.modalRef.destroy(true);
}
});

4
src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
View File

@ -114,7 +114,7 @@ export class AddPersonalPartnerComponent {
side: isFront
};
this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
if (res) {
if (res.name) {
console.log(res);
// 法定代表人证件照
@ -140,6 +140,8 @@ export class AddPersonalPartnerComponent {
this.sf.setValue('/adminUserInfo/_isLoingDate', true);
}
}
} else {
this.sf.setValue('/adminUserInfo/_isLoingDate', false);
}
});
}

2
src/app/routes/partner/recorded/components/detail/detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 15:06:17
* @LastEditTime : 2022-05-13 14:21:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\detail\\detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

53
src/app/routes/partner/recorded/components/detail/detail.component.ts
View File

@ -36,53 +36,38 @@ export class PartnerRecordedDetailComponent implements OnInit {
console.log(res);
// submitTime creattime
let isEnd = false;
if (res.reAuditTime) {
isEnd = true;
if (res.sts === '3') {
this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
} else {
this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
}
}
if (res.agreeTime && res.refundStatus !== '4') {
this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
}
if (res.reAuditTime) {
if (res.refundStatus === '4') {
if (res.sts == '2') {
isEnd = true;
this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
} else if (res.sts == '3'){
isEnd = true;
this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
}
// if (res.agreeTime && res.refundStatus !== '4') {
// this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
// }
if (res.reAuditTime) {
if (res.sts === '2') {
this.timeLineData.push({
time: res.reAuditTime,
value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
color: 'red'
});
} else {
this.timeLineData.push({
time: res.reAuditTime,
value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
value: `审核通过<br/>操作人员：${res.reAuditName}`,
color: 'gray'
});
}
}
if (res.agreeTime) {
if (res.refundStatus === '4') {
isEnd = true;
if (res.firstAuditTime) {
if (res.sts === '1') {
this.timeLineData.push({
time: res.agreeTime,
value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
color: 'red'
});
} else {
this.timeLineData.push({
time: res.agreeTime,
value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
time: res.firstAuditTime,
value: `审核通过<br/>操作人员：${res.fristAuditName}`,
color: 'gray'
});
}
}
if (res.createTime) {
if (res.sts) {
this.timeLineData.push({
time: res.createTime,
value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
time: res.submitTime,
value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员：${res.submitUserName}`,
color: 'gray'
});
}

2
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -354,7 +354,7 @@ export class NetworkFreightNewComponent implements OnInit {
type: 'string',
title: '行业',
enum: [
{ label: '道路运输业', value: 54},
{ label: '普通货物道路运输', value: 5431},
],
default: 0,
ui: {

2
src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
View File

@ -299,7 +299,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
unnormal(value: any) {
this.modal.confirm({
nzTitle: '税务审核结果',
nzContent: '订单结算时间所在月份与申报月份不一致',
nzContent: `${value?.exceptionInfo}`,
nzOkText: '确定',
nzCancelText: '',
nzOnOk: () => {

2
src/app/routes/tax-management/components/individual-income/individual-income.component.ts
View File

@ -322,7 +322,7 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
}
// this.modal.warning({
// nzTitle: '申报提示',
// nzContent: '订单结算时间所在月份与申报月份不一致......'
// nzContent: `${value?.exceptionInfo}`,
// });
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
// if (res) {

2
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
View File

@ -56,7 +56,7 @@
</div>
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']"
(click)="openDrawer()">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['TAX_INVOICE_REPORT-export']"> 导出</button>
<button nz-button nzDanger acl [acl-ability]="['TAX_INVOICE_REPORT-export']" (click)="export()"> 导出</button>
<button nz-button *ngIf="selectedIndex && selectedIndex !== '2'" nz-dropdown [nzDropdownMenu]="menu"
nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>

2
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
View File

@ -251,7 +251,7 @@ export class TaxManagementInvoiceReportingComponent extends BasicTableComponent
});
this.modal.confirm({
nzTitle: '税务审核结果',
nzContent: '订单结算时间所在月份与申报月份不一致',
nzContent: `${value?.exceptionInfo}`,
nzOkText: '确定',
nzCancelText: '',
nzOnOk: () => {

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

@ -109,7 +109,7 @@
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
>筛选</button
>
<button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button>
<button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']" (click)="exportList()"> 导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i
></button>

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

@ -290,14 +290,14 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
resetData() {
let params: any = {};
if (this.selectedRows.length === 0) {
params ={}
} else{
params =[]
params = {};
} else {
params = [];
this.selectedRows.forEach(item => {
params.push(item.billId);
});
}
this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('更新成功');
@ -321,7 +321,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
});
this.modal.confirm({
nzTitle: '税务审核结果',
nzContent: '订单结算时间所在月份与申报月份不一致',
nzContent: `${value?.exceptionInfo}`,
nzOkText: '确定',
nzCancelText: '',
nzOnOk: () => {
@ -436,6 +436,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
const modalRef = this.modal.create({
nzTitle: '本地校验结果',
nzWidth: 1200,
nzNoAnimation: true,
nzContent: TaxManagementOrderVerifyResultComponent,
nzComponentParams: {
record: item
@ -467,7 +468,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
* 异步导出
*/
export() {
this.service.exportStart({...this.reqParams, pageSize: -1} ,this.service.$api_async_export_order_reporting_list);
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_async_export_order_reporting_list);
}
openWainingModal(content: string, title = '提示') {
@ -479,10 +480,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
}
viewPhoto(images: any[]) {
if (images.length > 0) {
const imgs = images.map(item => ({ src: item }));
this.imageService.preview(imgs);
}
}
exportList() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_getTaxOrderPage_page_export);
}
}

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 14:53:31
* @LastEditTime : 2022-05-13 14:06:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -37,6 +37,8 @@ export class TaxManagementService extends ShipperBaseService {
// 订单上报列表
$api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
// 订单上报列表
$api_getTaxOrderPage_page_export = `/api/sdc/taxOrder/asyncExport`;
// 根据订单Id更新税务订单
$api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
// 撤回税务订单
@ -59,7 +61,7 @@ export class TaxManagementService extends ShipperBaseService {
// 获取发票上传列表
$api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
// 发票上传列表导出
$api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/reportList';
$api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/exportInvoiceUpload';
// 个税明细导出接口
$api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
// 个税汇总导出接口

45
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html
View File

@ -21,23 +21,32 @@
</nz-card> -->
<nz-card class="table-box">
<div class="header_box">
<label class="page_title"> <label class="driver">|</label> 运单开票记录</label>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
<button nz-button nzDanger (click)="exprot()" acl
[acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">导出</button>
</div>
<div class="header_box">
<label class="page_title"> <label class="driver">|</label> 运单开票记录</label>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl [acl-ability]="['FINANCIAL-VOUCHER-list']"
>筛选</button
>
<button nz-button nzDanger (click)="exprot()" acl [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">导出</button>
<button nz-button nzDanger (click)="sureInvoice()" acl [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">确认开票</button>
</div>
</div>
<st #st [data]="service.$api_get_invoice_record_page" [columns]="columns" [req]="{ process: beforeReq }"
[page]="{}" [loading]="false" [scroll]="{ x:'1200px' }">
<ng-template st-row="call1No" let-item let-index="index" let-column="column">
{{item.driverName}}<br>{{item.driverTelephone}}
</ng-template>
<ng-template st-row="call12No" let-item let-index="index" let-column="column">
{{item.licenseCarNo}}<br>{{item.licenseBelonging}}
</ng-template>
</st>
</nz-card>
<st
#st
[data]="service.$api_get_invoice_record_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
[page]="{}"
[loading]="false"
[scroll]="{ x: '1200px' }"
>
<ng-template st-row="call1No" let-item let-index="index" let-column="column">
{{ item.driverName }}<br />{{ item.driverTelephone }}
</ng-template>
<ng-template st-row="call12No" let-item let-index="index" let-column="column">
{{ item.licenseCarNo }}<br />{{ item.licenseBelonging }}
</ng-template>
</st>
</nz-card>

26
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -38,7 +38,15 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
}
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
return data.map(item => ({
...item,
disabled: item.invoicingStatus !== '1' || item.invoicingStatus !== '9'
}));
};
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
showDetail(item: any) {
const modal = this.nzModalService.create({
nzTitle: '运单交易明细',
@ -129,6 +137,7 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
private initST(): STColumn[] {
return [
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{ title: '运单号', index: 'wayBillCode', width: 200 },
{ title: '订单号', index: 'billCode', width: 200 },
{
@ -177,4 +186,19 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
exprot() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportEtcApplyRecordList);
}
sureInvoice() {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.service.request(this.service.$api_updateEtcRecordStatus, params).subscribe(res => {
if (res) {
this.st.load(1);
}
});
}
}

4
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-29 13:12:35
* @LastEditTime : 2022-05-10 09:51:30
* @LastEditTime : 2022-05-13 10:38:32
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@ -152,6 +152,8 @@ export class TicketService extends ShipperBaseService {
$api_export_InvoicedBillInfoPage = '/api/fcc/invoicedBillInfo/exportInvoicedBillInfoPage'
// 批量生成进项发票
$api_createFicoInpinv = '/api/fcc/ficoEtcInvoiceL/createFicoInpinv'
// 开票记录-确认开票
$api_updateEtcRecordStatus = '/api/fcc/ficoEtcRecord/updateEtcRecordStatus'
constructor(public injector: Injector) {
super(injector);

8
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -48,12 +48,12 @@
</nz-select>
</sv>
<sv label="车辆类型">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<!-- <nz-select *ngIf="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</nz-select> -->
</sv>
<sv label="车长(米)">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit"

3
src/app/shared/components/search-drawer/search-drawer.service.ts
View File

@ -13,7 +13,7 @@ export class SearchDrawerService {
visible = false;
drawer: Subscription[] = [];
constructor() {}
constructor() { }
create(defaultValue: Record<string, any>, newSchema?: SFSchema, newUI?: SFUISchema) {
this.createEvent.next({ defaultValue, newSchema, newUI });
@ -22,5 +22,6 @@ export class SearchDrawerService {
unsubscribe() {
this.drawer.forEach(sub => sub.unsubscribe());
this.drawer = [];
}
}