diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
index b1840925..ed9c6b10 100644
--- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
+++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
@@ -136,7 +136,7 @@ export class StaffManagementComponent implements OnInit {
staffAction(item?: any) {
const modal = this.nzModalService.create({
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
});
modal.afterClose.subscribe(res => {
diff --git a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
index 7af499c1..3ecab520 100644
--- a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
+++ b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
@@ -29,6 +29,8 @@ export class SystemStaffStaffModalComponent implements OnInit {
this.initSF(this.i);
}
initSF(staff: any) {
+ console.log(staff);
+
this.schema = {
properties: {
staffName: {
@@ -61,17 +63,11 @@ export class SystemStaffStaffModalComponent implements OnInit {
return res.map((item: any) => {
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']
@@ -92,7 +88,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
if (this.i.userId === 0) {
const params: any = {
...this.sf.value,
- enterpriseId: 0,
+ enterpriseId: 0
};
this.service.request(this.service.$api_add_staff, params).subscribe(res => {
if (res) {
@@ -103,7 +99,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
} else {
const params: any = {
appUserId: this.i.appUserId,
- ...this.sf.value,
+ ...this.sf.value
};
this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
if (res) {
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
index fa07cb26..af4b6962 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@@ -31,7 +31,7 @@
{{headerInfo?.disvattax}}