Merge branch 'weiyu' into develop
This commit is contained in:
@ -19,67 +19,23 @@
|
|||||||
</nz-card>
|
</nz-card>
|
||||||
<nz-card>
|
<nz-card>
|
||||||
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
|
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
|
||||||
|
|
||||||
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
|
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
|
||||||
</nz-tab>
|
</nz-tab>
|
||||||
</nz-tabset>
|
</nz-tabset>
|
||||||
<!-- 数据列表 -->
|
<!-- 数据列表 -->
|
||||||
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
|
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_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="putStatus" let-item let-index="index">
|
<ng-template st-row="putStatus" 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?.putStatus == '0'">待上传</span>
|
<span *ngIf="item?.uploadSts == '1'">待上传</span>
|
||||||
<span *ngIf="item?.putStatus == '1'">已上传</span>
|
<span *ngIf="item?.uploadSts == '3'">已上传</span>
|
||||||
<span *ngIf="item?.putStatus == '3'">上传中</span>
|
<span *ngIf="item?.uploadSts == '2'">上传中</span>
|
||||||
<span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
|
<span *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="invoiceNO" let-item let-index="index">
|
<ng-template st-row="invoiceNO" let-item let-index="index">
|
||||||
<a href="/">{{item.billCode}}</a>
|
<a href="/">{{item.invoiceno}}</a>
|
||||||
</ng-template>
|
|
||||||
<ng-template st-row="checkStatus" let-item let-index="index">
|
|
||||||
<!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
|
|
||||||
<span *ngIf="item?.checkStatus == '0'">校验中</span>
|
|
||||||
<span *ngIf="item?.checkStatus == '1'">通过</span>
|
|
||||||
<!-- <span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
|
|
||||||
<span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>
|
|
||||||
|
|
||||||
</ng-template>
|
|
||||||
<ng-template st-row="driverName" 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>
|
|
||||||
<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 st-row="unloadPicture" let-item let-index="index">
|
|
||||||
<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>
|
||||||
<ng-template st-row="orderAmount" let-item let-index="index">
|
<ng-template st-row="orderAmount" let-item let-index="index">
|
||||||
<div class="text-right">{{item?.orderAmount | currency }}</div>
|
<div class="text-right">{{item?.orderAmount | currency }}</div>
|
||||||
@ -92,7 +48,7 @@
|
|||||||
已选择
|
已选择
|
||||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
|
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
|
||||||
</div>
|
</div>
|
||||||
<button *ngIf="selectedIndex === '0' || selectedIndex === '2'" nz-button nzType="primary" (click)="upload()">上传</button>
|
<button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()">上传</button>
|
||||||
<button *ngIf="selectedIndex === '1' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
|
<button *ngIf="selectedIndex === '2' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|||||||
@ -1,16 +1,10 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { STColumn, STComponent, STData } from '@delon/abc/st';
|
import { STColumn, STComponent, STData } from '@delon/abc/st';
|
||||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||||
import { ShipperBaseService } from '@shared';
|
import { ShipperBaseService } from '@shared';
|
||||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||||
import { of } from 'rxjs';
|
|
||||||
import { map } from 'rxjs/operators';
|
|
||||||
import { TaxManagementService } from '../../services/tax-management.service';
|
import { TaxManagementService } from '../../services/tax-management.service';
|
||||||
import { TaxManagementInvoiceUploadSettingComponent } from './upload-setting/upload-setting.component';
|
|
||||||
import { TaxManagementInvoiceVerifyResultComponent } from './verify-result/verify-result.component';
|
|
||||||
// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
|
|
||||||
// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-tax-management-invoice-reporting',
|
selector: 'app-tax-management-invoice-reporting',
|
||||||
@ -27,13 +21,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
tabType!: string;
|
tabType!: string;
|
||||||
isLoading: boolean = false;
|
isLoading: boolean = false;
|
||||||
tabs: any[] = [
|
tabs: any[] = [
|
||||||
{ name: '待上传', value: '0' },
|
{ name: '待上传', value: '1' },
|
||||||
{ name: '上传中', value: '3' },
|
{ name: '上传中', value: '2' },
|
||||||
{ name: '已上传', value: '1' },
|
{ name: '已上传', value: '3' },
|
||||||
{ name: '异常', value: '2' },
|
{ name: '异常', value: '4' },
|
||||||
{ name: '全部', value: '' }
|
{ name: '全部', value: '' }
|
||||||
];
|
];
|
||||||
selectedIndex = '0'; //选择的项目
|
selectedIndex = ''; //选择的项目
|
||||||
serviceTel = '';
|
serviceTel = '';
|
||||||
constructor(
|
constructor(
|
||||||
public service: TaxManagementService,
|
public service: TaxManagementService,
|
||||||
@ -56,9 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
* 查询参数
|
* 查询参数
|
||||||
*/
|
*/
|
||||||
get reqParams() {
|
get reqParams() {
|
||||||
const params = Object.assign({}, this.sf?.value || {}, {
|
const params = Object.assign({}, this.sf?.value || {});
|
||||||
putStatus: this.selectedIndex,
|
|
||||||
});
|
|
||||||
delete params._$expand;
|
delete params._$expand;
|
||||||
return { ...params };
|
return { ...params };
|
||||||
}
|
}
|
||||||
@ -101,25 +93,25 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
this.schema = {
|
this.schema = {
|
||||||
properties: {
|
properties: {
|
||||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||||
putStatus: {
|
// uploadSts: {
|
||||||
title: '上传状态',
|
// title: '上传状态',
|
||||||
type: 'string',
|
// type: 'string',
|
||||||
default: 0,
|
// default: '1',
|
||||||
enum: [
|
// enum: [
|
||||||
{ label: '全部', value: 0 },
|
// { label: '全部', value: '' },
|
||||||
{ label: '待上传', value: 1 },
|
// { label: '待上传', value: '1'},
|
||||||
{ label: '上传中', value: 2 },
|
// { label: '上传中', value: '2' },
|
||||||
{ label: '已上传', value: 3 },
|
// { label: '已上传', value: '3' },
|
||||||
{ label: '异常', value: 4 }
|
// { label: '异常', value: '4' }
|
||||||
],
|
// ],
|
||||||
|
|
||||||
ui: {
|
// ui: {
|
||||||
placeholder: '请选择',
|
// placeholder: '请选择',
|
||||||
widget: 'select',
|
// widget: 'select',
|
||||||
allowClear: true
|
// allowClear: true
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
networkTransporter: {
|
ltdId: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
title: '网络货运人',
|
title: '网络货运人',
|
||||||
ui: {
|
ui: {
|
||||||
@ -129,7 +121,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
hrto: {
|
arto: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
title: '购买方',
|
title: '购买方',
|
||||||
ui: {
|
ui: {
|
||||||
@ -139,14 +131,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
asyncData: () => this.service.getCRMCustomerId()
|
asyncData: () => this.service.getCRMCustomerId()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
billCode: {
|
billHCode: {
|
||||||
title: '订单号', type: 'string', ui: {
|
title: '订单号', type: 'string',
|
||||||
placeholder: '请输入', visibleIf: {
|
ui: {
|
||||||
_$expand: (value: boolean) => value
|
placeholder: '请输入'
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
recentlyPutTime: {
|
invoicedate: {
|
||||||
title: '开票日期',
|
title: '开票日期',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -158,7 +149,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
orderPayTime: {
|
uoloadDate: {
|
||||||
title: '上传日期',
|
title: '上传日期',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -170,7 +161,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
wayBillCode: {
|
invoiceno: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
title: '发票号码',
|
title: '发票号码',
|
||||||
ui: {
|
ui: {
|
||||||
@ -180,7 +171,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
wayBillCode1: {
|
invoiceno2: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
title: '发票代码',
|
title: '发票代码',
|
||||||
ui: {
|
ui: {
|
||||||
@ -217,31 +208,31 @@ export class TaxManagementInvoiceReportingComponent 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: 'putStatus', className: 'text-center', width: '120px', },
|
{ title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', },
|
||||||
{ title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', },
|
{ title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', },
|
||||||
{
|
{
|
||||||
title: '发票号码',
|
title: '发票号码',
|
||||||
index: 'billCode',
|
index: 'invoiceno',
|
||||||
render: 'invoiceNO',
|
render: 'invoiceNO',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '150px',
|
width: '150px',
|
||||||
},
|
},
|
||||||
{ title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', },
|
{ title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
|
||||||
{
|
{
|
||||||
title: '网络货运人',
|
title: '网络货运人',
|
||||||
index: 'networkTransporterName',
|
index: 'ltdName',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '180px',
|
width: '180px',
|
||||||
},
|
},
|
||||||
{ title: '购买方企业名称', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
{ title: '购买方企业名称', index: 'loadingAddress', render: 'artoname', className: 'text-center', width: '200px' },
|
||||||
{ title: '购买方统一社会信用代码', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
{ title: '购买方统一社会信用代码', index: 'artotaxno', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||||
{ title: '订单号', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
|
{ title: '订单号', index: 'unloadAddress', render: 'billHCode', className: 'text-center', width: '120px' },
|
||||||
{ title: '货物名称', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
|
{ title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
|
||||||
{ title: '价税合计', index: 'shipperName', className: 'text-center', width: '180px' },
|
{ title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
|
||||||
{ title: '开票日期', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
|
{ title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
|
||||||
{ title: '发票所属月份', index: 'recordTime', className: 'text-center', width: '250px' },
|
{ title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
|
||||||
{ title: '发票状态', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
|
{ title: '发票状态', index: 'sts', className: 'text-center', width: '200px' },
|
||||||
{ title: '上传日期', index: 'loadTime', className: 'text-center', width: '200px' },
|
{ title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -349,24 +340,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// appeal(item: any) {
|
|
||||||
// const modalRef = this.modal.create({
|
|
||||||
// nzTitle: '申诉',
|
|
||||||
// nzWidth: '40%',
|
|
||||||
// nzContent: CtcAppealComponent,
|
|
||||||
// nzComponentParams: {
|
|
||||||
// i: item,
|
|
||||||
// status: 'add'
|
|
||||||
// },
|
|
||||||
// nzFooter: null
|
|
||||||
// });
|
|
||||||
// modalRef.afterClose.subscribe(res => {
|
|
||||||
// if (res) {
|
|
||||||
// this.search({ representationsStatus: '' });
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传
|
* 上传
|
||||||
*/
|
*/
|
||||||
@ -388,45 +361,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param params 上传设置
|
|
||||||
*/
|
|
||||||
uploadSetting() {
|
|
||||||
const modalRef = this.modal.create({
|
|
||||||
nzTitle: '税务上传设置',
|
|
||||||
nzWidth: 600,
|
|
||||||
nzContent: TaxManagementInvoiceUploadSettingComponent,
|
|
||||||
nzComponentParams: {},
|
|
||||||
nzFooter: null
|
|
||||||
});
|
|
||||||
modalRef.afterClose.subscribe(res => {
|
|
||||||
if (res) {
|
|
||||||
this.st.load();
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查看校验结果
|
|
||||||
*/
|
|
||||||
viewResult(item: any) {
|
|
||||||
const modalRef = this.modal.create({
|
|
||||||
nzTitle: '本地校验结果',
|
|
||||||
nzWidth: 1200,
|
|
||||||
nzContent: TaxManagementInvoiceVerifyResultComponent,
|
|
||||||
nzComponentParams: {
|
|
||||||
record: item
|
|
||||||
},
|
|
||||||
nzFooter: null
|
|
||||||
});
|
|
||||||
modalRef.afterClose.subscribe(res => {
|
|
||||||
if (res) {
|
|
||||||
this.st.load();
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查看监管审核结果
|
* 查看监管审核结果
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
<nz-spin [nzSpinning]="!i"></nz-spin>
|
|
||||||
<sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button nz-button type="button" (click)="close()">取消</button>
|
|
||||||
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
|
|
||||||
[nzLoading]="service.http.loading">修改</button>
|
|
||||||
</div>
|
|
||||||
</sf>
|
|
||||||
@ -1,110 +0,0 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
import { SFSchema, SFUISchema } from '@delon/form';
|
|
||||||
import { NzModalRef } from 'ng-zorro-antd/modal';
|
|
||||||
import { TaxManagementService } from '../../../services/tax-management.service';
|
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-datatable-invoice-upload-setting',
|
|
||||||
templateUrl: './upload-setting.component.html',
|
|
||||||
})
|
|
||||||
export class TaxManagementInvoiceUploadSettingComponent implements OnInit {
|
|
||||||
record: any = {};
|
|
||||||
i: any = {};
|
|
||||||
schema!: SFSchema;
|
|
||||||
ui!: SFUISchema;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private modal: NzModalRef,
|
|
||||||
public service: TaxManagementService
|
|
||||||
) { }
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.initSF();
|
|
||||||
// this.loadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 初始化查询表单
|
|
||||||
*/
|
|
||||||
initSF() {
|
|
||||||
this.schema = {
|
|
||||||
properties: {
|
|
||||||
no: {
|
|
||||||
type: 'string',
|
|
||||||
title: '订单数据',
|
|
||||||
enum: [
|
|
||||||
{
|
|
||||||
label: '手动上传',
|
|
||||||
value: '1'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '自动上传',
|
|
||||||
value: '2'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
description: '开启自动上传后,订单将在支付完成且风险单校验通过后自动上传',
|
|
||||||
ui: {
|
|
||||||
widget: 'radio',
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
|
||||||
owner: {
|
|
||||||
type: 'string',
|
|
||||||
title: '资金数据',
|
|
||||||
enum: [
|
|
||||||
{
|
|
||||||
label: '手动上传',
|
|
||||||
value: '1'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '自动上传',
|
|
||||||
value: '2'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
description: '开启自动上传后,订单将在支付完成且风险单校验通过后自动上传',
|
|
||||||
ui: {
|
|
||||||
widget: 'radio',
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
required: ['owner', 'no'],
|
|
||||||
}
|
|
||||||
this.ui = {
|
|
||||||
'*': {
|
|
||||||
spanLabelFixed: 100,
|
|
||||||
grid: { span: 24 },
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取设置数据
|
|
||||||
*/
|
|
||||||
loadData() {
|
|
||||||
this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => {
|
|
||||||
if (res) {
|
|
||||||
this.i = res;
|
|
||||||
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改
|
|
||||||
* @param value
|
|
||||||
*/
|
|
||||||
save(value: any): void {
|
|
||||||
this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => {
|
|
||||||
if (res) {
|
|
||||||
this.service.msgSrv.success('保存成功');
|
|
||||||
this.modal.close(true);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
close(): void {
|
|
||||||
this.modal.destroy();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
<div nz-row>
|
|
||||||
<div style="width: 10%">
|
|
||||||
<nz-tabset [nzTabPosition]="'left'" style="height: 100%">
|
|
||||||
<nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
|
|
||||||
</nz-tabset>
|
|
||||||
</div>
|
|
||||||
<div style="width: 90%">
|
|
||||||
<st
|
|
||||||
#st
|
|
||||||
[scroll]="{ x: '1000px', y: '600px' }"
|
|
||||||
[data]="service.$api_get_getTaxFieldCheckList"
|
|
||||||
[columns]="columns"
|
|
||||||
[req]="{ process: beforeReq }"
|
|
||||||
[res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
|
|
||||||
[page]="{ show: false }"
|
|
||||||
[loading]="false"
|
|
||||||
[bordered]="true"
|
|
||||||
>
|
|
||||||
<ng-template st-row="freightDetails" let-item>
|
|
||||||
<div *ngFor="let item of item.freightDetails">
|
|
||||||
<div>{{ item.expenseName }}:{{ item.price | currency }} </div>
|
|
||||||
</div>
|
|
||||||
</ng-template>
|
|
||||||
</st>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button nz-button type="button" (click)="close()">取消</button>
|
|
||||||
<button nz-button type="submit" nzType="primary" (click)="update()" [nzLoading]="service.http.loading">修改</button>
|
|
||||||
</div>
|
|
||||||
@ -1,139 +0,0 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
|
||||||
import { Router } from '@angular/router';
|
|
||||||
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
|
|
||||||
import { SFSchema } from '@delon/form';
|
|
||||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
|
||||||
import { NzModalRef } from 'ng-zorro-antd/modal';
|
|
||||||
import { TaxManagementService } from '../../../services/tax-management.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-tax-management-Invoice-reporting-verify-result',
|
|
||||||
templateUrl: './verify-result.component.html',
|
|
||||||
})
|
|
||||||
export class TaxManagementInvoiceVerifyResultComponent implements OnInit {
|
|
||||||
searchSchema: SFSchema = {
|
|
||||||
properties: {
|
|
||||||
no: {
|
|
||||||
type: 'string',
|
|
||||||
title: '编号'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ViewChild('st') private readonly st!: STComponent;
|
|
||||||
columns: STColumn[] = [];
|
|
||||||
record: any = {}
|
|
||||||
subjectType: string = '0';
|
|
||||||
tabs: any[] = [
|
|
||||||
{ name: '平台信息', value: '0' },
|
|
||||||
{ name: '货主信息', value: '1' },
|
|
||||||
{ name: '司机信息', value: '2' },
|
|
||||||
{ name: '订单信息', value: '3' },
|
|
||||||
];
|
|
||||||
|
|
||||||
// get reqParams() {
|
|
||||||
// console.log(this.subjectType);
|
|
||||||
// const params ={
|
|
||||||
// subjectId: this.record?.shipperId,
|
|
||||||
// subjectType: this.subjectType,
|
|
||||||
// }
|
|
||||||
// return params;
|
|
||||||
// }
|
|
||||||
beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
|
|
||||||
switch (this.subjectType) {
|
|
||||||
case '0':
|
|
||||||
a = this.record?.networkTransporterId;
|
|
||||||
break
|
|
||||||
case '1':
|
|
||||||
a = this.record?.shipperId;
|
|
||||||
break
|
|
||||||
case '2':
|
|
||||||
a = this.record?.driverId;
|
|
||||||
break
|
|
||||||
case '3':
|
|
||||||
a = this.record?.wayBillId;
|
|
||||||
break
|
|
||||||
}
|
|
||||||
Object.assign(requestOptions.body, {
|
|
||||||
subjectId: a ,
|
|
||||||
subjectType: this.subjectType,
|
|
||||||
});
|
|
||||||
return requestOptions;
|
|
||||||
};
|
|
||||||
afterRes = (data: any[], rawData?: any) => {
|
|
||||||
console.log(data)
|
|
||||||
return data.map(item => ({
|
|
||||||
...item,
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
console.log(this.record);
|
|
||||||
|
|
||||||
this.initST();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 初始化数据列表
|
|
||||||
*/
|
|
||||||
initST() {
|
|
||||||
this.columns = [
|
|
||||||
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
|
|
||||||
{ title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
|
|
||||||
{
|
|
||||||
title: '是否必填',
|
|
||||||
index: 'requiredStatus',
|
|
||||||
className: 'text-center',
|
|
||||||
width: '100px',
|
|
||||||
type: 'enum',
|
|
||||||
enum: {
|
|
||||||
0: '否',
|
|
||||||
1: '是'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
|
|
||||||
{
|
|
||||||
title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
|
|
||||||
type: 'enum',
|
|
||||||
enum: {
|
|
||||||
0: '校验中',
|
|
||||||
1: '通过',
|
|
||||||
2: '不通过'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
add(): void {
|
|
||||||
// this.modal
|
|
||||||
// .createStatic(FormEditComponent, { i: { id: 0 } })
|
|
||||||
// .subscribe(() => this.st.reload());
|
|
||||||
}
|
|
||||||
|
|
||||||
selectTab(e: any) {
|
|
||||||
setTimeout(() => {
|
|
||||||
console.log(e?.value);
|
|
||||||
|
|
||||||
this.subjectType = e?.value;
|
|
||||||
console.log(this.subjectType);
|
|
||||||
this.st.load(1);
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
update() {
|
|
||||||
if (this.record?.billType === '1') {
|
|
||||||
window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
|
|
||||||
|
|
||||||
} else if (this.record.billType === '2') {
|
|
||||||
window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close(): void {
|
|
||||||
this.modalRef.destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -56,6 +56,7 @@ export class TaxManagementService extends ShipperBaseService {
|
|||||||
$api_async_export_order_reporting_list = ``; // 导出订单上报
|
$api_async_export_order_reporting_list = ``; // 导出订单上报
|
||||||
$api_get_upload_setting = ``; // 修改上传设置
|
$api_get_upload_setting = ``; // 修改上传设置
|
||||||
$api_upload_setting_save = ``; // 修改上传设置
|
$api_upload_setting_save = ``; // 修改上传设置
|
||||||
|
$api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
|
||||||
constructor(public injector: Injector) {
|
constructor(public injector: Injector) {
|
||||||
super(injector);
|
super(injector);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import { TaxManagementIndividualCollectComponent } from './components/individual
|
|||||||
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
|
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
|
||||||
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
|
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
|
||||||
import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
|
import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
|
||||||
import { TaxManagementInvoiceUploadSettingComponent } from './components/invoice-reporting/upload-setting/upload-setting.component';
|
|
||||||
import { TaxManagementInvoiceVerifyResultComponent } from './components/invoice-reporting/verify-result/verify-result.component';
|
|
||||||
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
|
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
|
||||||
import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
|
import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
|
||||||
import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
|
import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
|
||||||
@ -29,9 +27,7 @@ const COMPONENTS: Type<void>[] = [
|
|||||||
TaxManagementIndividualIncomeComponent,
|
TaxManagementIndividualIncomeComponent,
|
||||||
TaxManagementIndividualCollectComponent,
|
TaxManagementIndividualCollectComponent,
|
||||||
TaxManagementIndividualDeclareComponent,
|
TaxManagementIndividualDeclareComponent,
|
||||||
TaxManagementInvoiceReportingComponent,
|
TaxManagementInvoiceReportingComponent
|
||||||
TaxManagementInvoiceUploadSettingComponent,
|
|
||||||
TaxManagementInvoiceVerifyResultComponent
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user