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-13 15:10:43 +08:00
parent d75f859b50 a086f5bc8c
commit e4432a8ad0
9 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -90,7 +90,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
markerLabel: '装',
color: 'blue',
position: [res.startingPoint.longitude, res.startingPoint.latitude],
title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area}${res.startingPoint.detailedAddress}`,
title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${
res.startingPoint.detailedAddress
}`,
time: '计划出发时间：' + res.loadPlanTime
},
{

2
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -80,7 +80,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
markerLabel: '装',
color: 'blue',
position: [res.startingPoint.longitude, res.startingPoint.latitude],
title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area}${res.startingPoint.detailedAddress}`,
title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${res.startingPoint.detailedAddress}`,
time: '计划出发时间：' +res.loadPlanTime
},
{

12
src/app/routes/sys-setting/components/staff-management/staff-management.component.html
View File

@ -8,7 +8,8 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-STAFF-list']">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['SYSTEM-STAFF-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
@ -18,8 +19,9 @@
<div class="d-flex justify-content-between mb-sm">
<label style="font-size: 18px;"></label>
<div>
<button nz-button nzType="primary" (click)="staffAction()" acl [acl-ability]="['SYSTEM-STAFF-add']">添加员工</button>
<button nz-button acl [acl-ability]="['SYSTEM-STAFF-export']">导出</button>
<button nz-button nzType="primary" (click)="staffAction()" acl
[acl-ability]="['SYSTEM-STAFF-add']">添加员工</button>
<button nz-button acl [acl-ability]="['SYSTEM-STAFF-export']" (click)="exportList()">导出</button>
</div>
</div>
@ -33,6 +35,6 @@
</div>
<st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns" [page]="{}"
[req]="{ params: {nameOrPhone: this.sf.value?.nameOrPhone} }" [loading]="false"
[scroll]="{ y: '370px' }" (change)="stChange($event)"></st>
[req]="{ params: {nameOrPhone: this.sf.value?.nameOrPhone} }" [loading]="false" [scroll]="{ y: '370px' }"
(change)="stChange($event)"></st>
</nz-card>

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

@ -32,7 +32,7 @@ export class StaffManagementComponent implements OnInit {
{ title: '', index: 'key', className: 'text-center', type: 'checkbox' },
{ title: '员工姓名', className: 'text-center', index: 'name' },
{ title: '手机号码', className: 'text-center', index: 'telephone' },
{ title: '角色',className: 'text-center', index: 'roleName' },
{ title: '角色', className: 'text-center', index: 'roleName' },
{
title: '最后登录时间',
index: 'lastLoginDate',
@ -67,7 +67,8 @@ export class StaffManagementComponent implements OnInit {
},
{
text: '冻结',
iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone,
iif: item =>
item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone,
click: item => this.action(item, 1),
acl: { ability: ['SYSTEM-STAFF-lock'] }
},
@ -79,7 +80,8 @@ export class StaffManagementComponent implements OnInit {
},
{
text: '删除',
iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone,
iif: item =>
item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone,
click: item => this.action(item, 3),
acl: { ability: ['SYSTEM-STAFF-delete'] }
}
@ -167,6 +169,11 @@ export class StaffManagementComponent implements OnInit {
this.sf.reset();
}
exportList() {
const params = { nameOrPhone: this.sf.value?.nameOrPhone };
this.service.downloadFile(this.service.$api_export_staff, { ...params, pageSize: -1 });
}
private deleteStaff(params: any) {
this.service.request(this.service.$api_delete_staff, params).subscribe(res => {
if (res) {

2
src/app/routes/sys-setting/services/system.service.ts
View File

@ -15,6 +15,8 @@ import { BaseService } from 'src/app/shared/services';
export class SystemService extends BaseService {
// 分页查询企业项目员工列表
$api_get_enterprise_staff_page = '/api/mdc/cuc/userApp/getEnterpriseProjectStaffListPage';
// 分页查询企业项目员工列表
$api_export_staff = '/api/mdc/cuc/userApp/enterpriseProjectStaffExport';
// 添加员工
$api_add_staff = '/api/mdc/cuc/userApp/addStaff';
// 编辑员工

12
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -256,7 +256,7 @@ export class CancellationInvoiceComponent implements OnInit {
hidden: true
}
},
vatappHId: {
vatappHCode: {
type: 'string',
title: '申请编号',
ui: {
@ -330,18 +330,18 @@ export class CancellationInvoiceComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', fixed: 'left', width: 50, className: 'text-center' },
{ title: '分票编号', render: 'vatinvcode', width: 200 },
{ title: '分票编号', render: 'vatinvcode', width: 220 },
{
title: '申请编号',
index: 'vatappHCode',
width: 150,
width: 220,
type: 'link',
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId])
},
{ title: '申请时间', index: 'createTime', type: 'date', width: 150 },
{ title: '发票类型', index: 'vatapptypeLabel', width: 150 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '购买人', index: 'artoname', width: 160 },
{ title: '网络货运人', index: 'ltdName', width: 220 },
{ title: '购买人', index: 'artoname', width: 220 },
{ title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
{
title: '价税合计',
@ -376,7 +376,7 @@ export class CancellationInvoiceComponent implements OnInit {
},
{ title: '服务名称', index: 'vatname', width: 120 },
{ title: '销货清单', index: 'isdetail', width: 120, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
{ title: '票面备注', index: 'remarks', width: 250 },
{ title: '票面备注', index: 'remarks', width: 300 },
{ title: '其他要求', index: 'otherremarks', width: 100 },
{
title: '操作',

2
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
View File

@ -118,7 +118,7 @@
(ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of services"></nz-option>
</nz-select>
<ng-container *ngIf="!isEdit">{{ item.vatname }}</ng-container>
<ng-container *ngIf="!isEdit">{{ item.vatnameLabel || item.vatname }}</ng-container>
</ng-template>
<ng-template st-row="vatmodel" let-item let-index="index">
<input *ngIf="isEdit" nz-input [ngModel]="item.vatmodel"

21
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -17,7 +17,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
_$expand = false;
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
ui: SFUISchema = { '*': { spanLabelFixed: 130, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ -199,10 +199,10 @@ export class UserCenterComponentsDriverComponent implements OnInit {
title: '从业资格证状态',
enum: [
{ label: '全部', value: '' },
{ label: '待审核', value: 10 },
{ label: '审核通过', value: 20 },
{ label: '驳回', value: 30 },
{ label: '证件过期', value: 40 }
{ label: '未提交 ', value: -1 },
{ label: '已提交', value: 1 },
{ label: '已通过', value: 2 },
{ label: '已过期', value: 3 }
],
default: '',
ui: {
@ -302,10 +302,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
type: 'badge',
badge: {
'-1': { text: '未提交', color: 'default' },
10: { text: '待审核', color: 'default' },
20: { text: '审核通过', color: 'success' },
30: { text: '驳回', color: 'warning' },
40: { text: '证件过期', color: 'error' }
1: { text: '已提交', color: 'processing' },
2: { text: '已通过', color: 'success' },
3: { text: '已过期', color: 'error' },
// 10: { text: '待审核', color: 'default' },
// 20: { text: '审核通过', color: 'success' },
// 30: { text: '驳回', color: 'warning' },
// 40: { text: '证件过期', color: 'error' }
},
width: 180
},

26
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -155,19 +155,19 @@ export class VehicleComponentsAuditComponent implements OnInit {
// },
// },
// },
approvalPassTime: {
type: 'string',
title: '审核通过时间',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
nzShowTime: true,
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
// approvalPassTime: {
// type: 'string',
// title: '审核通过时间',
// ui: {
// widget: 'sl-from-to-search',
// format: 'yyyy-MM-dd',
// placeholder: '请选择',
// nzShowTime: true,
// visibleIf: {
// expand: (value: boolean) => value
// }
// } as SFDateWidgetSchema
// }
}
};
this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };