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:
Taric Xin
2022-03-24 09:57:54 +08:00
parent cdb22c78f1 4d5de1e536
commit 29fee8e3aa
7 changed files with 672 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 13:34:31
* @LastEditTime : 2022-03-24 09:48:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -87,13 +87,14 @@
<div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<div>{{ item.billCode }}</div>
<div>
<span>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</span>
</div>
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.billStatusLabel }}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{ item?.goodsName }}</div>

1
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -331,6 +331,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
{ title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '220px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '服务类型', index: 'serviceTypeLabel', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
{
title: '卸货地',

6
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 20:36:40
* @LastEditTime : 2022-03-24 09:30:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -98,7 +98,9 @@
<div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<div>{{ item.billCode }}</div>
<!-- <div>{{ item.billCode }}</div> -->
<a *ngIf="item.resourceType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.resourceType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{item?.billStatusLabel}}</span>
</div>

11
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 19:45:45
* @LastEditTime : 2022-03-24 09:39:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -65,7 +65,14 @@
[loading]="false"
>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/risk-detail/' + item.id">{{ item?.billCode }}</a>
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.representationsStatusLabel }}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="timeer" let-item let-index="index">
<p>创建时间：{{ item?.createTime }}</p>

5
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
View File

@ -56,8 +56,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
initSF() {
this.schema = {
properties: {
abnormalCause: {
ltdName: {
title: '网络货运人',
type: 'string',
ui: {
@ -78,7 +77,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
{ title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
{ title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 },
{ title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 },
{ title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 120, type: 'currency' },
{ title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 180, type: 'currency' },
{ title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' },
{ title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' },

1667
src/assets/mocks/menu-data.json
View File

File diff suppressed because it is too large Load Diff

8
src/styles/theme.less
View File

@ -10,12 +10,12 @@
// ==========Custom brand visual color==========
.error-color {
color: #ff4d4f;
color: #ff4d4f;
}
@primary-color : #F5222D;
@font-size-base: 15px;
.page-header__title {
display: none;
}
// .page-header__title {
// display: none;
// }