Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UI

Browse Source
This commit is contained in:
Taric Xin
2022-05-05 17:15:58 +08:00
parent 283e6e4a26 6d503f57e2
commit 340a08e1c5
9 changed files with 135 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-05-05 13:51:19
* @LastEditTime : 2022-05-05 15:22:17
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -236,7 +236,7 @@ export class WithdrawalsDetailComponent implements OnInit {
width: 140
},
{ title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 },
{ title: '货主', index: 'ltdName', className: 'text-left', width: 200 },
{ title: '货主', index: 'enterpriseInfoName', className: 'text-left', width: 200 },
{ title: '订单号', render: 'billId', width: 200 },
{ title: '运单号', render: 'wayBillId', width: 200 },
{ title: '货源编号', index: 'resourceCode', width: 200 },

3
src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 10:17:31
* @LastEditTime : 2022-05-05 15:12:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\particulars\\particulars.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -56,6 +56,7 @@
<st
#st
[bordered]="true"
[scroll]="{x: '1200px'}"
[data]="data"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"

62
src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
View File

@ -51,13 +51,8 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
*/
get reqParams() {
const params: any = Object.assign({}, this.sf?.value || {});
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus;
}
delete params._$expand;
return {
...a,
...params,
deadlineTime: {
start: this.sf?.value?.deadlineTime?.[0] || '',
@ -74,19 +69,19 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
name: {
billCode: {
type: 'string',
title: '订单号'
},
phone: {
orderPaymentCode: {
type: 'string',
title: '付款单号'
},
phone2: {
enterpriseInfoName: {
type: 'string',
title: '下单客户'
},
enterpriseInfoId: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -99,7 +94,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
phone3: {
partnerName: {
type: 'string',
title: '合伙人名称',
ui: {
@ -108,7 +103,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
},
}
},
deadlineTime: {
handlerTime: {
title: '时间范围',
type: 'string',
ui: {
@ -134,7 +129,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
this.resourceStatus = e;
this.initST();
setTimeout(() => {
this.data = this.service.$api_get_searchRefundPageList
if(e == 1) {
this.data = this.service.$api_get_searchRefundPageList
} else {
this.data = this.service.$api_get_searchPageList
}
this.st.load();
}, 500);
}
@ -142,55 +141,68 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
this.columns = [
{
title: '订单号',
index: 'name1'
width: 150,
index: 'billCode'
},
{
title: '订单金额（元）',
index: 'name1'
width: 150,
index: 'orderAmount'
},
{
title: '付款金额（元）',
index: 'name1'
width: 150,
index: 'payAmount'
},
{
title: '预估返佣金额（元）',
index: 'name1'
width: 150,
index: 'profitAmount'
},
{
title: '附加费率',
index: 'name1'
width: 150,
index: 'additionalRate'
},
{
title: '下单客户',
index: 'name1'
width: 150,
index: 'enterpriseInfoName'
},
{
title: '网络货运人',
index: 'name1'
width: 180,
index: 'ltdName'
},
{
title: '销售渠道',
index: 'name1'
width: 180,
index: 'salesmanName'
},
{
title: '合伙人名称',
index: 'name1'
width: 180,
index: 'partnerName'
},
{
title: '合伙人等级',
index: 'name1'
width: 150,
index: 'partnerLevelName'
},
{
title: '管理费比例',
index: 'name1'
width: 150,
index: 'manageFee'
},
{
title: '固定结算费率',
index: 'name1'
width: 150,
index: 'settlementFee'
},
{
title: '返佣时间',
index: 'name1'
width: 180,
index: 'returnCommissionTime'
}
];
}

7
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 15:03:23
* @LastEditTime : 2022-05-05 17:04:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -74,13 +74,14 @@
</sv>
<sv label="优先级" col="1">
<nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px; margin-left: 28px">
<!-- <nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px; margin-left: 28px">
<nz-option nzValue="1" nzLabel="1">1</nz-option>
<nz-option nzValue="2" nzLabel="2">2</nz-option>
<nz-option nzValue="3" nzLabel="3">3</nz-option>
<nz-option nzValue="4" nzLabel="4">4</nz-option>
<nz-option nzValue="5" nzLabel="5">5</nz-option>
</nz-select>
</nz-select> -->
<nz-input-number style="max-width: 400px; min-width: 200px; margin-left: 28px" [(ngModel)]="priority" [nzMin]="0" [nzMax]="9999" [nzStep]="1"></nz-input-number>
</sv>
<sv label="规则说明" col="1">

11
src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
View File

@ -124,17 +124,20 @@ export class AnnouncementMessageComponent implements OnInit {
initSFFre() {
this.addSchema = {
properties: {
appIdList: {
receiverType: {
type: 'string',
title: '发布平台',
enum: [
{ label: '运营后台', value: this.envSrv.env.appId },
// { label: '运营后台', value: this.envSrv.env.appId },
// { label: '货主后台', value: this.envSrv.env.HzappId },
// { label: '司机端', value: this.envSrv.env.sjappId }
{ label: '全平台', value: 0},
{ label: '运营后台', value: 3},
{ label: '货主后台', value: 2 },
{ label: '司机端', value: 1 },
],
ui: {
widget: 'select',
mode: 'multiple',
errors: { required: '请选择' },
placeholder: '请选择'
}
@ -229,7 +232,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
const params ={
...this.sfFre.value
}
if(this.editId) {
if(this.edit) {
params.id = this.editId
console.log(params)
this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => {

45
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -7,7 +7,8 @@
</ng-template>
<ng-template #content>
<sv-container col="3" class="new-sv-container">
<h2>车牌号：{{ detailData?.carNo }}</h2>
<h2>车牌号66：{{ detailData?.carNo }}
</h2>
<sv-title style="font-weight: 700">
<!-- <span *ngIf="detailData?.approvalStatus === 1 || detailData?.approvalStatus === '1'">未上传</span>
<span *ngIf="detailData?.approvalStatus === 0 || detailData?.approvalStatus === '0'">草稿</span>
@ -44,9 +45,13 @@
<nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'" [ngClass]="'mb0'" [nzBorderless]="true">
<div>
<div class="mb-xs common-order-header" nz-row>
<div>
<div style="display: flex;">
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ carStatus[detailData?.approvalStatus] }}</button>
<b class="ml-md" style="font-size: 18px">车牌号: {{ detailData?.carNo }}</b>
<div style="display: flex;align-items: center; ">
<b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
<div *ngIf="detailData.networkStatus"> <span style="height: 5px; width: 5px; border-radius: 50%; background-color: green;display: inline-block;"></span> 已入网</div>
<div *ngIf="!detailData.networkStatus"><span style="height: 5px; width: 5px; border-radius: 50%; background-color: red;display: inline-block;"></span>未入网</div>
</div>
</div>
<div>
<ng-container *ngIf="!isEdit">
@ -78,12 +83,12 @@
<nz-option *ngFor="let i of contenCarNoColor" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
<sv label="车型">
<sv label="车辆类型">
<!-- <nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select> -->
<input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="车长">
@ -149,6 +154,16 @@
<span>行驶证信息</span>
</div>
<sv-container col="3" class="new-sv-container" labelWidth="140">
<sv label="发动机号码">
<input
nz-input
type="text"
[(ngModel)]="detailData.engineNo"
[readonly]="!isEdit"
[nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'"
/>
</sv>
<sv label="行驶证到期日">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
@ -192,6 +207,16 @@
<input nz-input type="text" [(ngModel)]="detailData.curbWeight" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="报废日期">
<nz-date-picker
[(ngModel)]="detailData.scrapTime"
[nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit"
[nzSuffixIcon]="isEdit ? 'calendar' : ''"
>
</nz-date-picker>
</sv>
<sv label="总质量">
<input nz-input type="text" [(ngModel)]="detailData.carTotalLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
@ -219,7 +244,15 @@
<div class="mb-lg">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>道路运输证信息</span>
<p style="margin-bottom: 0">
道路运输证信息
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>验证不通过
</label>
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</div>
<sv-container col="3" class="mt16 new-sv-container" labelWidth="140">
<sv label="道路运输证号">

53
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -24,9 +24,20 @@
<sv-container col="3">
<sv-title style="font-weight: 700">车辆基础信息</sv-title>
<sv label="车牌号">
<input nz-input type="text" [(ngModel)]="detailData.carNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<sv label="车牌号" col="1">
<div style="display: flex;">
<input nz-input type="text" [(ngModel)]="detailData.carNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<div style="display: flex;">
<div *ngIf="detailData.networkStatus"> <span
style="height: 5px; width: 5px; border-radius: 50%; background-color: green;display: inline-block;"></span>
已入网</div>
<div *ngIf="!detailData.networkStatus"><span
style="height: 5px; width: 5px; border-radius: 50%; background-color: red;display: inline-block;"></span>未入网
</div>
</div>
</div>
</sv>
<sv label="车牌颜色">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -36,11 +47,11 @@
<nz-option *ngFor="let i of contenCarNoColor" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
<sv label="车型">
<sv label="车辆类型">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-select [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
@ -111,6 +122,10 @@
</sv-container>
<sv-container col="3">
<sv label="发动机号码">
<input nz-input type="text" [(ngModel)]="detailData.engineNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="行驶证到期日">
<nz-date-picker [(ngModel)]="detailData.driverLicenseEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
@ -157,6 +172,11 @@
<input nz-input type="text" [(ngModel)]="detailData.curbWeight" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="报废日期">
<nz-date-picker [(ngModel)]="detailData.scrapTime" [nzDisabled]="!isEdit" [nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="总质量">
<input nz-input type="text" [(ngModel)]="detailData.carTotalLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
@ -170,7 +190,7 @@
{{detailData?.carOwner }}
</ng-template>
</sv>
<<<<<<< HEAD=======>>>>>>> 6d503f57e2434e5c0a0baa406ac42fe2b7a8a9b5
</sv-container>
<sv-container col="1">
<sv label="行驶证照片">
@ -188,7 +208,17 @@
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title style="font-weight: 700">道路运输证信息</sv-title>
<sv-title style="font-weight: 700">
<p style="margin-bottom: 0">
道路运输证信息
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon
nzType="info-circle" nzTheme="fill" class="mr-xs"></i>验证不通过
</label>
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</sv-title>
<sv label="道路运输证号">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportNo" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
@ -224,9 +254,10 @@
<sv-container col="2" class="mt16">
<sv-title style="font-weight: 700">认证司机</sv-title>
</sv-container>
<st #st [bordered]="true" [columns]="columns" [scroll]="{x: '1200px'}" [data]="service.$api_get_queryDriverByCarId"
[req]="{ method: 'POST', allInBody: true, params: reqParams }" [res]="{ reName: { list: 'data', total: 'data' } }"
[ngStyle]="{ margin: '1rem 0' }" multiSort size="small" [page]="{ show: false }">
<st #st [bordered]="true" [columns]="columns" [scroll]="{ x: '1200px' }"
[data]="service.$api_get_queryDriverByCarId" [req]="{ method: 'POST', allInBody: true, params: reqParams }"
[res]="{ reName: { list: 'data', total: 'data' } }" [ngStyle]="{ margin: '1rem 0' }" multiSort size="small"
[page]="{ show: false }">
<ng-template st-row="auditStatusEnum" let-item let-index="index">
<div>
<span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1'">未上传</span>

2
src/app/shared/components/rebate-table/rebate-table.component.ts
View File

@ -43,6 +43,8 @@ export class RebateTableComponent implements OnInit {
this.data = [
{
gradeConfigId: '0',
startAmount: 0,
endAmount: 0,
managementFeeRatio: 0,
}
];