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:
潘晓云
2022-05-11 16:04:01 +08:00
parent d827e9b6d9 514464aea7
commit 34410be35d
6 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { RecordedService } from '../../services/recorded.service'; import { RecordedService } from '../../services/recorded.service';
@Component({ @Component({
selector: 'app-partner-recored-detail', selector: 'app-partner-recored-detail',
templateUrl: './detail.component.html', templateUrl: './detail.component.html',
@ -21,7 +20,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
this.getRecordedDetail(this.id); this.getRecordedDetail(this.id);
} }
ngOnInit(): void { } ngOnInit(): void {}
getRecordedDetail(id: string) { getRecordedDetail(id: string) {
this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => { this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
@ -87,18 +86,28 @@ export class PartnerRecordedDetailComponent implements OnInit {
this.service.msgSrv.warning('请填写拒绝原因 '); this.service.msgSrv.warning('请填写拒绝原因 ');
return; return;
} }
this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => { this.audit(
modal.destroy(true); { ids: params, rejectReason: this.msg, sts: '3' },
}, '审核拒绝成功'); () => {
modal.destroy(true);
},
'审核拒绝成功'
);
} }
}, },
{ {
label: '通过', label: '通过',
type: 'primary', type: 'primary',
onClick: () => { onClick: () => {
this.audit({ ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => { console.log(this.formData?.sts);
modal.destroy(true);
}, `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`); this.audit(
{ ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 },
() => {
modal.destroy(true);
},
`${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`
);
} }
} }
] ]
@ -117,13 +126,11 @@ export class PartnerRecordedDetailComponent implements OnInit {
* 审核 * 审核
*/ */
audit(params: any, callback: Function, msg = '成功') { audit(params: any, callback: Function, msg = '成功') {
this.service this.service.request(this.service.$api_audit_recored, {...params}).subscribe(res => {
.request(this.service.$api_audit_recored, ...params) if (res) {
.subscribe(res => { this.service.msgSrv.success(msg);
if (res) { callback();
this.service.msgSrv.success(msg); }
callback(); });
}
});
} }
} }

11
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -245,7 +245,16 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent
* @param params 更新数据 * @param params 更新数据
*/ */
uploadSetting() { uploadSetting() {
this.service.request(this.service.$api_get_updateData).subscribe((res: any) => { let params: any;
if (this.selectedRows.length === 0) {
params ={}
} else{
params ={ ids: []}
this.selectedRows.forEach(item => {
params.ids.push(item.id);
});
}
this.service.request(this.service.$api_get_updateData,params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');
this.search(); this.search();

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

@ -381,14 +381,15 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
* @param params 更新数据 * @param params 更新数据
*/ */
resetData() { resetData() {
let params: any;
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要更新的数据'); params ={}
return; } else{
params ={ ids: []}
this.selectedRows.forEach(item => {
params.ids.push(item.id);
});
} }
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => { this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');

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

@ -326,7 +326,16 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
* @param params 更新数据 * @param params 更新数据
*/ */
uploadSetting() { uploadSetting() {
this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => { let params: any;
if (this.selectedRows.length === 0) {
params ={}
} else{
params ={ ids: []}
this.selectedRows.forEach(item => {
params.ids.push(item.id);
});
}
this.service.request(this.service.$api_update_individual_income_page, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');
this.search(); this.search();

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

@ -20,33 +20,37 @@
<nz-card class="table-box"> <nz-card class="table-box">
<div class="tab_header"> <div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 订单上报</label> <label class="page_title"> <label class="driver">|</label> 订单上报</label>
<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>
</div> </div>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [scroll]="{x:'1200px',y:scrollY}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns" <st
[req]="{ params: reqParams }" [page]="{ }" [loading]="service.http.loading"> #st
[scroll]="{ x: '1200px', y: scrollY }"
[data]="service.$api_getTaxOrderPage_page"
[columns]="columns"
[req]="{ params: reqParams }"
[page]="{}"
[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?.putStatus == '0'">待上传</span>
<span *ngIf="item?.putStatus == '1'">已上传</span> <span *ngIf="item?.putStatus == '1'">已上传</span>
<span *ngIf="item?.putStatus == '3'">上传中</span> <span *ngIf="item?.putStatus == '3'">上传中</span>
<span *ngIf="item?.putStatus == '2'" 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="checkStatus" let-item let-index="index"> <ng-template st-row="checkStatus" 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?.checkStatus == '0'">校验中</span> <span *ngIf="item?.checkStatus == '0'">校验中</span>
<span *ngIf="item?.checkStatus == '1'">通过</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)="unnormal(item)">不通过</span> -->
<a *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</a> <a *ngIf="item?.checkStatus == '2'" style="color: red" (click)="viewResult(item)">不通过</a>
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div> <div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }} </div>
</ng-template> </ng-template>
<!-- <ng-template st-row="localValid" let-item let-index="index"> <!-- <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>
@ -76,6 +80,10 @@
</div> </div>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div> 货物名称：{{ item.goodsName ? item.goodsName : '--' }} </div>
<div> {{ item.loadWeight ? item.loadWeight : '--' }}吨/{{ item.loadVolume ?item.loadVolume: '--' }}方 </div>
</ng-template>
<ng-template st-row="signatureForm" let-item let-index="index"> <ng-template st-row="signatureForm" let-item let-index="index">
<div class="imgBox"> <div class="imgBox">
<div *ngIf="item.signatureForm"> <div *ngIf="item.signatureForm">
@ -85,7 +93,7 @@
</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>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>
@ -95,25 +103,19 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
(click)="openDrawer()">筛选</button> >筛选</button
>
<button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button> <button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft"> <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button> 更多<i nz-icon nzType="down" nzTheme="outline"></i
></button>
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu> <ul nz-menu>
<li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']"> <li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']"> 上传 </li>
上传 <li nz-menu-item (click)="recall()" acl [acl-ability]="['TAX-ORDERREPORT-recall']"> 撤回 </li>
</li> <li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']"> 更新数据 </li>
<li nz-menu-item (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']"> <li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']"> 税务设置 </li>
撤回
</li>
<li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']">
更新数据
</li>
<li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']">
税务设置
</li>
</ul> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
</div> </div>

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

@ -233,13 +233,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
{ title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
{ title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },
{ title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' }, { title: '结束时间', index: 'orderPayTime', className: 'text-center', width: '150px' },
{ title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' }, { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' },
{ title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' }, { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' },
{ title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' }, { title: '司机身份证号', index: 'driverCertificateNumber', className: 'text-center', width: '180px' },
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' }, { title: '货物信息', render: 'goodsName', className: 'text-center', width: '200px' },
{ title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' }, { title: '运费金额', render: 'orderAmount', className: 'text-center', width: '100px' },
{ title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' }, { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' },
{ title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' }, { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' },
{ title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' }, { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' },
@ -288,14 +288,16 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
* @param record 记录实例 * @param record 记录实例
*/ */
resetData() { resetData() {
let params: any = {};
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要更新的数据！'); params ={}
return; } else{
params ={ ids: []}
this.selectedRows.forEach(item => {
params.ids.push(item.id);
});
} }
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.billId);
});
this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');