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-01-04 11:23:54 +08:00
parent c276ce4726 fb0b0036be
commit 09f89f0226
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ export class StaffManagementComponent implements OnInit {
staffAction(item?: any) { staffAction(item?: any) {
const modal = this.nzModalService.create({ const modal = this.nzModalService.create({
nzContent: SystemStaffStaffModalComponent, nzContent: SystemStaffStaffModalComponent,
nzComponentParams: item ? { i: { ...item, roleId: (item.roleId as string)?.split(',') || [] } } : { i: { userId: 0 } }, nzComponentParams: item ? { i: { ...item, roleId: item.roleId ? (item.roleId as string)?.split(',') : null } } : { i: { userId: 0 } },
nzFooter: null nzFooter: null
}); });
modal.afterClose.subscribe(res => { modal.afterClose.subscribe(res => {

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

@ -29,6 +29,8 @@ export class SystemStaffStaffModalComponent implements OnInit {
this.initSF(this.i); this.initSF(this.i);
} }
initSF(staff: any) { initSF(staff: any) {
console.log(staff);
this.schema = { this.schema = {
properties: { properties: {
staffName: { staffName: {
@ -61,17 +63,11 @@ export class SystemStaffStaffModalComponent implements OnInit {
return res.map((item: any) => { return res.map((item: any) => {
return { label: item.roleName, value: item.id }; return { label: item.roleName, value: item.id };
}); });
}), })
); );
},
change: (i: any) => {
console.log(i);
// this.sf.value.roleIds = i;
// this.sf?.setValue('/roleIds', i);
} }
}, },
default: staff?.roleId default: staff?.roleId || null
} }
}, },
required: ['staffName', 'telephone'] required: ['staffName', 'telephone']
@ -92,7 +88,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
if (this.i.userId === 0) { if (this.i.userId === 0) {
const params: any = { const params: any = {
...this.sf.value, ...this.sf.value,
enterpriseId: 0, enterpriseId: 0
}; };
this.service.request(this.service.$api_add_staff, params).subscribe(res => { this.service.request(this.service.$api_add_staff, params).subscribe(res => {
if (res) { if (res) {
@ -103,7 +99,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
} else { } else {
const params: any = { const params: any = {
appUserId: this.i.appUserId, appUserId: this.i.appUserId,
...this.sf.value, ...this.sf.value
}; };
this.service.request(this.service.$api_edit_staff, params).subscribe(res => { this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
if (res) { if (res) {

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

@ -31,7 +31,7 @@
{{headerInfo?.disvattax}} {{headerInfo?.disvattax}}
</se> </se>
<se label="票面备注"> <se label="票面备注">
{{headerInfo?.remarks}} {{headerInfo?.vatremarks}}
</se> </se>
</div> </div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1"> <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
@ -54,7 +54,7 @@
{{headerInfo?.artoacc}} {{headerInfo?.artoacc}}
</se> </se>
<se label="其他要求"> <se label="其他要求">
{{headerInfo?.remarks}} {{headerInfo?.otherremarks}}
</se> </se>
</div> </div>
<div *ngIf="isCanEdit" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right"> <div *ngIf="isCanEdit" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right">