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-09 16:01:03 +08:00
parent ebdad86950 ae80432b23
commit da7912ea1a
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-02 13:50:12 * @LastEditTime : 2022-03-09 15:24:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -33,10 +33,10 @@
</st> </st>
</sv> </sv>
<sv label="司机车辆"> <sv label="司机车辆">
<div>{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}</div> <div>{{ dataInfo?.driverName|| '-' }} / {{dataInfo?.driverTelephone || '-' }}/ {{ dataInfo?.carNo || '-' }}</div>
</sv> </sv>
<sv label="收款人"> <sv label="收款人">
<div>{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}</div> <div>{{ i?.payeeName || '-'}} / {{ i?.payeePhone || '-'}}</div>
</sv> </sv>
<sv label="回单凭证"> <sv label="回单凭证">
<nz-upload <nz-upload

13
src/app/routes/sys-setting/components/note-management/note-management.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-09 14:05:33 * @Date : 2022-03-09 14:05:33
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-09 14:29:50 * @LastEditTime : 2022-03-09 15:18:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -40,16 +40,15 @@ export class NoTeManagementComponent implements OnInit {
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '手机号', className: 'text-center', index: 'cellphone' }, { title: '手机号', className: 'text-center', index: 'cellphone' },
{ {
title: '创建时间', title: '发送时间',
index: 'createTime', index: 'createTime',
type: 'date', type: 'date',
className: 'text-center' className: 'text-center'
}, },
{ title: '验证码', className: 'text-center', index: 'templateParam', { title: '短信内容', className: 'text-center', index: 'content',
format: (value) => { // format: (value) => {
return JSON.parse(value?.templateParam)?.code // return JSON.parse(value?.templateParam)?.code
} // }
}, },
]; ];

10
src/styles/compact.less
View File

@ -2,14 +2,14 @@
font-size: 15px; font-size: 15px;
} }
.page-header__title{ .page-header__title{
font-size: 14px;
display: none; display: none;
font-size: 14px;
} }
.alain-pro__body{ .alain-pro__body{
margin: 0 !important; margin: 12px 12px 0px !important;
} }
.alain-pro__page-header-content{ .alain-pro__page-header-content{
margin: 8px 8px 0px !important; margin: 8px 8px 0 !important;
} }
.ant-card { .ant-card {
@ -22,8 +22,8 @@
margin: 0 !important margin: 0 !important
} }
.alain-pro__menu-icon{ .alain-pro__menu-icon{
font-size: 14px !important;
margin: 3px 5px 0 0 ; margin: 3px 5px 0 0 ;
font-size: 14px !important;
} }
.sf__compact .ant-form-item { .sf__compact .ant-form-item {
margin-top: 4px !important; margin-top: 4px !important;
@ -44,8 +44,8 @@
} }
.login-box-content{ .login-box-content{
max-width: 300px !important; max-width: 300px !important;
padding: 58px 0 38px !important;
height: 100% !important; height: 100% !important;
padding: 58px 0 38px !important;
} }
.total-footer { .total-footer {
bottom: 10px !important; bottom: 10px !important;