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-04-15 14:09:19 +08:00
parent 4f15dc2d17 ddfa9ae6ee
commit 7f8e5d748b
6 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html
View File

@ -11,8 +11,8 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button> <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button [disabled]="false"> 导出</button> <!-- <button nz-button [disabled]="false"> 导出</button>
<button nz-button [disabled]="false"> 导出明细</button> <button nz-button [disabled]="false"> 导出明细</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

2
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
View File

@ -217,7 +217,7 @@ export class VoucherListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '浏览', text: '浏览',
click: (item: any) => this.router.navigate(['/voucher-summary/list/detail/' + item.id]) click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/list/detail/' + item.id])
} }
] ]
} }

5
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

@ -48,6 +48,7 @@ export class ETCBlacklistComponent implements OnInit {
...this.sf.value ...this.sf.value
}); });
} }
this.selectedRows = [];
return requestOptions; return requestOptions;
}; };
@ -226,7 +227,7 @@ export class ETCBlacklistComponent implements OnInit {
} }
} }
}, },
params4: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string',
ui: { ui: {
@ -236,7 +237,7 @@ export class ETCBlacklistComponent implements OnInit {
} }
} }
}, },
params5: { carOwner: {
title: '车辆所有人', title: '车辆所有人',
type: 'string', type: 'string',
ui: { ui: {

16
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
View File

@ -167,18 +167,18 @@ export class ETCInvoicedLogsComponent implements OnInit {
return [ return [
{ title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) }, { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) },
{ title: '发票代码', index: 'invoiceCode', width: 130 }, { title: '发票代码', index: 'invoiceCode', width: 130 },
{ title: '订单号', index: 'billCode', width: 140 }, { title: '订单号', index: 'billCode', width: 180 },
{ title: '运单号', index: 'waybillCode', width: 140 }, { title: '运单号', index: 'waybillCode', width: 180 },
{ title: '入站口', index: 'enStationName', width: 100 }, { title: '入站口', index: 'enStationName', width: 100 },
{ title: '出站口', index: 'exStationName', width: 100 }, { title: '出站口', index: 'exStationName', width: 100 },
{ title: '司机', render: 'call3No', width: 140 }, { title: '司机', render: 'call3No', width: 140 },
{ title: '车牌号', index: 'carNo', width: 100 }, { title: '车牌号', index: 'carNo', width: 100 },
{ title: '里程（km）', index: 'mileage', width: 120 }, // { title: '里程（km）', index: 'mileage', width: 120 },
{ title: '交易id', index: 'tradeId', width: 200 }, { title: '交易id', index: 'tradeId', width: 200 },
{ {
title: '交易金额（元）', title: '交易金额（元）',
index: 'fee', index: 'fee',
width: 130, width: 150,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) }
@ -195,7 +195,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
{ {
title: '税额（元）', title: '税额（元）',
index: 'totalTaxAmount', index: 'totalTaxAmount',
width: 120, width: 150,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) }
@ -203,15 +203,15 @@ export class ETCInvoicedLogsComponent implements OnInit {
{ {
title: '价税合计（元）', title: '价税合计（元）',
index: 'totalAmount', index: 'totalAmount',
width: 130, width: 150,
type: 'widget', type: 'widget',
className: 'text-right font-weight-bold', className: 'text-right font-weight-bold',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
}, },
{ title: '交易时间', index: 'exTime', type: 'date', width: 150 }, { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
{ title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 }, { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
{ title: '销售方', index: 'sellerName', width: 90 }, { title: '销售方', index: 'sellerName', width: 150 },
{ title: '网络货运人', index: 'enterpriseInfoName', width: 120 } { title: '网络货运人', index: 'enterpriseInfoName', width: 220 }
]; ];
} }
} }

2
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
View File

@ -223,6 +223,8 @@ export class ETCInvoicedRequestedComponent implements OnInit {
{ title: '卸货地', index: 'dischargePlace', width: '220px' }, { title: '卸货地', index: 'dischargePlace', width: '220px' },
{ title: '司机信息', render: 'call1No', width: '140px' }, { title: '司机信息', render: 'call1No', width: '140px' },
{ title: '车辆信息', render: 'call1N2o', width: '200px' }, { title: '车辆信息', render: 'call1N2o', width: '200px' },
{ title: '车牌颜色', index: 'licenseCarNOColor', width: '140px' },
{ title: '车辆是否已备案', index: 'putOnRecord', width: '150px', type: 'enum', enum: { false: '否', true: '是' } },
{ title: '托运人', index: 'shipperAppUserName', width: '140px' }, { title: '托运人', index: 'shipperAppUserName', width: '140px' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' },
{ title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' }, { title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' },

66
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -234,7 +234,9 @@
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'"> [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</ng-container> </ng-container>
<ng-template #enterpriseAddresselseTemplate> <ng-template #enterpriseAddresselseTemplate>
<span style="word-break:break-all ">{{detailData.enterpriseAddress}}</span> <span style="word-break:break-all "> {{ detailData?.fullRegionVO?.provinceName }}{{
detailData?.fullRegionVO?.cityName }}{{
detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}}</span>
</ng-template> </ng-template>
</sv> </sv>
<sv label="经营范围" col="1"> <sv label="经营范围" col="1">
@ -370,16 +372,16 @@
{{partnerInfo.partnerEnterpriseName}} {{partnerInfo.partnerEnterpriseName}}
</sv> </sv>
<sv label="手机号"> <sv label="手机号">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit"
[placeholder]="isEdit?'':'-'"> [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="管理员"> <sv label="管理员">
<!-- <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> --> [placeholder]="isEdit?'':'-'"> -->
</sv> </sv>
<sv label="绑定时间"> <sv label="绑定时间">
<input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit"
[placeholder]="isEdit?'':'-'"> [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="结算时间段"> <sv label="结算时间段">
<input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -398,36 +400,38 @@
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="绑定时间"> <sv label="绑定时间">
<input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit"
[placeholder]="isEdit?'':'-'"> [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv> </sv>
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card> <nz-card>
<nz-tabset > <nz-tabset>
<nz-tab nzTitle="修改合伙人记录"> <nz-tab nzTitle="修改合伙人记录">
<st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns" <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }"
[res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
[loading]="service.http.loading"> [loading]="service.http.loading">
<ng-template st-row="remark" let-item let-index="index"> <ng-template st-row="remark" let-item let-index="index">
<span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span> <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark
<span *ngIf="item.remark === null">--</span> }}</span>
</ng-template> <span *ngIf="item.remark === null">--</span>
</st> </ng-template>
</nz-tab> </st>
<nz-tab nzTitle="修改渠道销售记录"> </nz-tab>
<st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog" <nz-tab nzTitle="修改渠道销售记录">
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" <st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
<ng-template st-row="remark" let-item let-index="index"> [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
<span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span> <ng-template st-row="remark" let-item let-index="index">
<span *ngIf="item.remark === null">--</span> <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark
</ng-template> }}</span>
</st> <span *ngIf="item.remark === null">--</span>
</nz-tab> </ng-template>
</nz-tabset> </st>
</nz-tab>
</nz-tabset>
</nz-card> </nz-card>
<ng-template #PopconfirmTempalte let-title="title" let-content="content"> <ng-template #PopconfirmTempalte let-title="title" let-content="content">
<div class="ant-popover-message"> <div class="ant-popover-message">