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-02-18 17:58:34 +08:00
parent 569236e6f9 29b50850f9
commit 369e41380b
7 changed files with 32 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -406,13 +406,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
grid: { span: 8 }
},
$weight: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$volume: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$number: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
grid: { span: 8 }

6
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -426,13 +426,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
grid: { span: 8 }
},
$weight: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$volume: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$number: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
grid: { span: 8 }

10
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -370,13 +370,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
grid: { span: 24 }
},
$weight: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$volume: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$number: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
grid: { span: 8 }
@ -1133,11 +1133,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
toPay: res?.shippingInformationVO?.toPay,
oilCardPay: 0,
receiptPay: res?.shippingInformationVO?.receiptPay,
subtotal: res?.shippingInformationVO?.totalFee,
total: res?.shippingInformationVO?.totalFee,
appendFee: res?.shippingInformationVO?.appendFee,
paymentDays: res?.paymentDays
};
this.sf7.setValue('/prePay', this.sf7data.prePay);
this.sf7.setValue('/toPay', this.sf7data.toPay);
this.sf7.setValue('/receiptPay', this.sf7data.receiptPay);
this.payChange();
}

6
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -386,13 +386,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
grid: { span: 24 }
},
$weight: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$volume: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$number: {
grid: { lg: 6, md: 12, sm: 12, xs: 24 }
grid: { lg: 8, md: 12, sm: 12, xs: 24 }
},
$carModel: {
grid: { span: 8 }

6
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime : 2022-02-18 11:20:48
* @LastEditTime : 2022-02-18 16:29:43
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver-config\\driver-config.component.html
@ -35,10 +35,10 @@
>导出</button
>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
<!-- <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</button> -->
</div>
</div>
</nz-card>

47
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -133,56 +133,17 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
placeholder: '请输入'
}
},
identityNo: {
title: '身份证号',
isCaptain: {
type: 'string',
ui: {
placeholder: '请输入'
}
},
promotersTelephone: {
title: '业务员手机号',
type: 'string',
maxLength: 11,
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
identityStatus: {
type: 'string',
title: '实名认证状态',
title: '类型',
enum: [
{ label: '全部', value: '' },
{ label: '待审核', value: 0 },
{ label: '审核通过', value: 1 },
{ label: '驳回', value: 2 }
{ label: '车队长', value: 1 },
{ label: '司机', value: 0 },
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
}
},
source: {
type: 'string',
title: '注册渠道',
enum: [
{ label: '全部', value: '' },
{ label: '用户注册', value: 1 },
{ label: '货主添加', value: 2 },
{ label: '运营添加', value: 3 },
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
}
}
}

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

@ -123,6 +123,16 @@
"link": "/supply-management/vehicle-amend/:id",
"hide": true
},
{
"text": "整车代发货源",
"link": "/supply-management/vehicle-release",
"hide": true
},
{
"text": "大宗代发货源",
"link": "/supply-management/bulk-release",
"hide": true
},
{
"text": "货源详情",
"link": "/supply-management/vehicle-detail/:id",