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:
wangshiming
2022-03-25 14:56:15 +08:00
parent 4faecb7e94 c60f909bc0
commit 441eaacecf
13 changed files with 255 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/routes/partner/recorded/components/record/record.component.html
View File

@ -8,7 +8,7 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" (click)="search()">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -51,12 +51,15 @@
</ng-template>
</st>
<div class=" text-md" *ngIf="st?.list?.length !== 0 ">
<span class="mr-md">合伙人数：<label class="text-red-dark font-weight-bold">{{totalInfo?.partnerNum}}</label></span>
<span class="mr-md">合伙人数：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmountSum}}</label></span>
<span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
<span class="mr-md">开票金额：<label class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmount}}</label></span>
<span class="mr-md">代缴个税：<label class="text-red-dark font-weight-bold">{{totalInfo?.tax}}</label></span>
<span class="mr-md">开票金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceEntryNum}}</label></span>
<span class="mr-md">代缴个税：<label
class="text-red-dark font-weight-bold">{{totalInfo?.taxPersonalSum}}</label></span>
<span class="mr-md">入账金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.recorededAmount}}</label></span>
class="text-red-dark font-weight-bold">{{totalInfo?.recordedAmountSum}}</label></span>
</div>
</div>
</nz-card>

27
src/app/routes/partner/recorded/components/record/record.component.ts
View File

@ -22,11 +22,11 @@ export class PartnerRecordedRecordComponent implements OnInit {
columns!: STColumn[];
searchSchema!: SFSchema;
totalInfo: any = {
partnerNum: 34,
count: 98,
invoiceAmount: 978239.98,
tax: 9878.00,
recorededAmount: 728698.98
invoiceAmountSum: 0,
invoiceEntryNum: 0,
partnerNum: 0,
recordedAmountSum: 0,
taxPersonalSum: 0
}
_$expand = false;
@ -306,7 +306,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
},
{ title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' },
{ title: '提交时间', index: 'submitTime', width: 180, className: 'text-center' },
{ title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' },
{
title: '操作',
@ -345,4 +345,19 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
});
}
search() {
this.st.load(1);
this.getSummary();
}
/**
* 底部统计
*/
getSummary() {
this.service.request(this.service.$api_get_list_summary, { ...this.sf.value }).subscribe(res => {
if (res) {
this.totalInfo = res;
}
})
}
}

1
src/app/routes/partner/recorded/services/recorded.service.ts
View File

@ -11,6 +11,7 @@ export class RecordedService extends BaseService {
$api_disagree_recorded = ``; // 拒绝审核
$api_agree_recorded = ``; // 同意审核
$api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据
$api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计
constructor(public injector: Injector) {
super(injector);
}

20
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -34,27 +34,30 @@
<nz-tab nzTitle="待受理" (nzClick)="selectChange('1')"></nz-tab>
<nz-tab nzTitle="处理中" (nzClick)="selectChange('2')"></nz-tab>
<nz-tab nzTitle="已拒绝" (nzClick)="selectChange('4')"></nz-tab>
<nz-tab nzTitle="已完成" (nzClick)="selectChange('3')"></nz-tab>
<nz-tab nzTitle="已撤销" (nzClick)="selectChange('5')"></nz-tab>
<nz-tab nzTitle="已受理" (nzClick)="selectChange('3')"></nz-tab>
<nz-tab nzTitle="全部" (nzClick)="selectChange(null)"></nz-tab>
</nz-tabset>
<ng-template #extraTemplate>
<div class="d-flex align-items-center" *ngIf="resourceStatus==='1' || resourceStatus==='3' || !resourceStatus">
<div class="d-flex align-items-center"
*ngIf="resourceStatus==='1'|| resourceStatus==='2' || resourceStatus==='3' || !resourceStatus">
<div class="mr-md">
已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计
<strong class="text-red">{{ totalCallNo }}</strong>
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">开票审核</button>
<!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
<button nz-button (click)="changePice(selectedRows)">修改地址</button>-->
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">批量受理</button>
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus"
(click)="this.rejectAction(selectedRows)">驳回</button>
<button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
(click)="changeAddress(selectedRows)">修改地址</button>
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>
</div>
</ng-template>
<st #st [data]="service.$api_get_invoice_requested_page" [columns]="columns" [req]="{ process: beforeReq }"
[page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px' }"
(change)="stChange($event)">
[page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
<ng-template st-row="vatappcode" let-item let-index="index" let-column="column">
{{ item.vatappcode }} <br />
<label class="text-primary">{{item.stsLabel}}</label>
@ -66,7 +69,8 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注" required>
<textarea nz-input rows="3" placeholder="请说明驳回原因" style="width: 325px; margin-left: 14px"></textarea>
<textarea nz-input rows="3" [(ngModel)]="rejectReason" placeholder="请说明驳回原因"
style="width: 325px; margin-left: 14px"></textarea>
</se>
</div>
</div>

111
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -12,6 +12,7 @@ import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
import { RequestedInvoiceModalComponent } from './requested-invoice-modal/requested-invoice-modal.component';
import { UpdateAddressModalComponent } from './update-address-modal/update-address-modal.component';
@Component({
selector: 'app-invoice-requested',
@ -33,12 +34,9 @@ export class InvoiceRequestedComponent {
totalCallNo = 0;
selectedRows: any[] = [];
constructor(
public service: TicketService,
private nzModalService: NzModalService,
private router: Router,
public shipperservice: ShipperBaseService
) {}
rejectReason = '';
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.resourceStatus) {
@ -73,54 +71,84 @@ export class InvoiceRequestedComponent {
}
rejectAction(item: any[]) {
this.rejectReason = '';
if (item.length <= 0) {
this.service.msgSrv.warning('请选择开票申请');
return;
}
if (item.find(item => item.sts !== '1')) {
this.service.msgSrv.warning('请勿选择非待处理订单');
return;
}
const modal = this.nzModalService.create({
nzTitle: '驳回',
nzContent: this.rejectModal,
nzFooter: [
{
label: '拒绝',
type: 'default',
onClick: () => {
modal.destroy();
nzOkLoading: this.service.http.loading,
nzOnOk: () => {
if (!this.rejectReason) {
this.service.msgSrv.warning('请填写驳回原因');
return false;
}
},
{
label: '通过',
type: 'primary',
onClick: () => {
modal.destroy();
let ids = item.map(row => row.id);
this.service.request(this.service.$api_reject_invoice, ids).subscribe(res => {
if (res) {
this.service.msgSrv.success('驳回成功');
modal.destroy(true);
}
});
return false;
}
]
});
modal.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
});
}
changePice(item: any[]) {
/**
* 修改地址
* @param item
*/
changeAddress(item: any[]) {
this.rejectReason = '';
if (item.length <= 0) {
this.service.msgSrv.warning('请选择开票申请');
return;
}
if (item.find(item => item.sts !== '1')) {
this.service.msgSrv.warning('请勿选择非待处理订单');
return;
}
const modal = this.nzModalService.create({
nzTitle: '驳回',
nzContent: this.rejectModal,
nzFooter: [
{
label: '拒绝',
type: 'default',
onClick: () => {
modal.destroy();
nzTitle: '修改地址',
nzContent: UpdateAddressModalComponent,
nzOkLoading: this.service.http.loading,
nzOnOk: component => {
if (!component.sf.valid) {
this.service.msgSrv.warning('表单校验错误');
return false;
}
},
{
label: '通过',
type: 'primary',
onClick: () => {
modal.destroy();
this.service
.request(this.service.$api_update_invoice_address, {
...component.sf.value,
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success('修改成功');
modal.destroy(true);
}
});
return false;
}
]
});
modal.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
});
}
@ -362,7 +390,7 @@ export class InvoiceRequestedComponent {
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getCRM()
asyncData: () => this.service.getCRM()
}
}
}
@ -440,14 +468,15 @@ export class InvoiceRequestedComponent {
buttons: [
{ type: 'divider' },
{
text: '开票<br/>',
text: '开票受理<br/>',
click: item => this.requestedInvoiceAction(item),
iif: item => item.sts === '1'
},
// {
// text: '驳回<br/>',
// click: item => this.rejectAction([item])
// },
{
text: '驳回申请<br/>',
click: item => this.rejectAction([item]),
iif: item => item.sts === '1'
},
{
text: '订单明细<br/>',
click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } })

1
src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.html Normal file
View File

@ -0,0 +1 @@
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 110, span:24 } }" [compact]="true" [button]="'none'"></sf>

0
src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.less Normal file
View File

102
src/app/routes/ticket-management/components/invoice-requested/update-address-modal/update-address-modal.component.ts Normal file
View File

@ -0,0 +1,102 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFCascaderWidgetSchema, SFComponent, SFSchema } from '@delon/form';
import { TicketService } from '../../../services/ticket.service';
@Component({
selector: 'app-update-address-modal',
templateUrl: './update-address-modal.component.html',
styleUrls: ['./update-address-modal.component.less']
})
export class UpdateAddressModalComponent implements OnInit {
@ViewChild('sf', { static: false })
sf!: SFComponent;
schema: SFSchema = this.initSF();
constructor(public service: TicketService) {}
ngOnInit(): void {}
private initSF(): SFSchema {
return {
properties: {
reciname: {
type: 'string',
title: '收件人姓名',
ui: {
placeholder: '请输入'
}
},
recitel: {
type: 'string',
title: '联系电话',
format: 'mobile',
minLength: 1,
maxLength: 11,
ui: {
placeholder: '请输入',
errors: { required: '请输入注册电话', format: '手机号格式错误' }
}
},
provinceCode: { type: 'string', ui: { hidden: true } },
provinceName: { type: 'string', ui: { hidden: true } },
cityCode: { type: 'string', ui: { hidden: true } },
cityName: { type: 'string', ui: { hidden: true } },
areaCode: { type: 'string', ui: { hidden: true } },
areaName: { type: 'string', ui: { hidden: true } },
enterpriseAddressCode: {
type: 'number',
title: '收件人地区',
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
widget: 'cascader',
valueProperty: 'regionCode',
placeholder: '请选择',
labelProperty: 'name',
asyncData: (node: any, index: any) => {
return new Promise(resolve => {
this.getRegionDetailByCode(node?.regionCode || '').subscribe(
res => {
node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 }));
},
_ => {},
() => {
resolve();
}
);
});
},
selectionChange: (node: any[]) => {
console.log(node);
if (node?.length > 0) {
this.sf.setValue('/provinceCode', node[0]?.regionCode);
this.sf.setValue('/provinceName', node[0]?.name);
this.sf.setValue('/cityCode', node[1]?.regionCode);
this.sf.setValue('/cityName', node[1]?.name);
this.sf.setValue('/areaCode', node[2]?.regionCode);
this.sf.setValue('/areaName', node[2]?.name);
}
}
} as SFCascaderWidgetSchema
},
reciaddr: {
type: 'string',
title: '详细地址',
ui: {
visibleIf: {
expand: (value: boolean) => value
}
}
}
},
required: ['reciname', 'recitel', 'reciaddr', 'enterpriseAddressCode']
};
}
/*
* 根据地区code查询地区列表
*/
getRegionDetailByCode(regionCode: any) {
return this.service.request(this.service.$api_get_region_by_code, { regionCode });
}
}

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

@ -23,6 +23,10 @@ export class TicketService extends ShipperBaseService {
$api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
// 删除开票申请订单明细
$api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
// 运营端单个/批量驳回
$api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple';
// 运营端修改开票地址
$api_update_invoice_address = '/api/fcc/ficoVatappH/updateInvoiceAddr';
// 运营端销票处理-订单明细页面
$api_ficoVatinvHList = '/api/fcc/ficoVatinvH/ficoVatinvHList';
@ -115,6 +119,9 @@ export class TicketService extends ShipperBaseService {
// 下载对账单文件
$api_downloadPdf = '/api/fcc/ficoVatappBill/downloadPdf';
// 根据地区code查询列表
$api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
constructor(public injector: Injector) {
super(injector);
}

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

@ -25,6 +25,7 @@ import { AddCostDetailComponent } from './components/input-invoice/add-cost-deta
import { PrintOrderModalComponent } from './components/invoice-requested/print-order-modal/print-order-modal.component';
import { ExpressInfoComponent } from './components/express-info/express-info.component';
import { ExpressDetailModalComponent } from './components/express-info/express-detail-modal/express-detail-modal.component';
import { UpdateAddressModalComponent } from './components/invoice-requested/update-address-modal/update-address-modal.component';
const COMPONENTS: any = [
ETCInvoicedListComponent,
@ -51,7 +52,8 @@ const NOTROUTECOMPONENTS: any = [
AddCollectionInvoiceModalComponent,
AddCostDetailComponent,
PrintOrderModalComponent,
ExpressDetailModalComponent
ExpressDetailModalComponent,
UpdateAddressModalComponent
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],

10
src/app/routes/usercenter/components/freight/list/showService/showService.component.html
View File

@ -1,16 +1,14 @@
<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
<div class="serviceBox">
<div class="left">客服人员</div>
<div class="left"><span style="color:red">* </span>客服人员</div>
<div class="right">
<nz-select ngModel="lucy" style="width: 250px;">
<nz-option nzValue="jack" nzLabel="Jack"></nz-option>
<nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
<nz-option nzValue="disabled" nzLabel="Disabled" nzDisabled></nz-option>
<nz-select [(ngModel)]="appUserId" style="width: 250px;">
<nz-option *ngFor="let item of serviceList" [nzValue]="item.appUserId" [nzLabel]="item.name"></nz-option>
</nz-select>
</div>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="button" nzType="primary" (click)="submitForm()" [disabled]="!sf?.valid">确定</button>
<button nz-button type="button" nzType="primary" (click)="submitForm()" [disabled]="!appUserId">确定</button>
</div>

42
src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts
View File

@ -16,46 +16,38 @@ import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter
})
export class ShowServiceComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
appUserId = ''
record: any = {};
i: any;
serviceList: any = [];
constructor(
private modal: NzModalRef,
public service: UsermanageService,
private envSrv: EAEnvironmentService,
private eaCacheSrv: EACacheService,
) { }
ngOnInit(): void {
this.initData()
}
close(): void {
this.modal.close(true)
}
initData(){
this.service.request(this.service.$api_getStaffList).subscribe(res => {
this.serviceList = res
})
}
submitForm(){
// const params:any = {
// appUserId: this.i.appUserId,
// ...this.sf.value,
// bindType: this.i.bindType
// };
// params.carFrontPhoto = this.detailData.carFrontPhoto
// params.carProtocal = this.detailData.carProtocal
// params.certificatePhotoFront = this.detailData.certificatePhotoFront
// params.certificatePhotoBack = this.detailData.certificatePhotoBack
// params.roadTransportPhoto = this.detailData.roadTransportPhoto
// delete params.titleA
// delete params.titleB
// this.checked = true
// this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => {
// this.checked = false
// if(res){
// this.service.msgSrv.success('添加成功')
// this.modal.close(true)
// }
// })
const params:any = {
appUserId: this.appUserId,
};
this.service.request(this.service.$api_getStaffList, params).subscribe(res => {
if(res){
this.service.msgSrv.success('分配成功')
this.modal.close(true)
}
})
}
}

2
src/app/routes/usercenter/services/usercenter.service.ts
View File

@ -160,6 +160,8 @@ export class UsermanageService extends ShipperBaseService {
$api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog';
// 查询企业合伙人渠道关系信息
$api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel';
// 员工列表
$api_getStaffList = '/api/mdc/cuc/userApp/getStaffList';
constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) {
super(injector);