diff --git a/web-admin-app/src/app/app.config.ts b/web-admin-app/src/app/app.config.ts index 06ff2da..05d75d1 100644 --- a/web-admin-app/src/app/app.config.ts +++ b/web-admin-app/src/app/app.config.ts @@ -12,6 +12,7 @@ import { LocalHttpInterceptorService } from './services' import { PermissionModule } from './shared/permission/permission.module' import { TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular' import { ServerPaginatedTableService } from './shared/components/server-paginated-table' +import { NzConfig, provideNzConfig } from 'ng-zorro-antd/core/config' registerLocaleData(zh) @@ -50,10 +51,17 @@ export function initializeApp(configService: ServerPaginatedTableService) { } } +const ngZorroConfig: NzConfig = { + message: { + nzDuration: 4000, + }, +} + export const appConfig: ApplicationConfig = { providers: [ provideRouter(routes), provideNzI18n(zh_CN), + provideNzConfig(ngZorroConfig), importProvidersFrom(FormsModule), importProvidersFrom(HttpClientModule), importProvidersFrom(PermissionModule.forRoot()), diff --git a/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.ts b/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.ts index b565207..99b4aa5 100644 --- a/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.ts +++ b/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.ts @@ -80,7 +80,8 @@ export class EamAssetPurchaseApplyComponent { this.iconPreview = data.procVars?.img this.formGroup.patchValue({ ...data.procVars, - applyDepartmentId: data.procVars?.applyDepartmentId + '', + applyDepartmentId: data.procVars?.applyDepartmentId ? data.procVars?.applyDepartmentId + '' : null, + purchase: data.procVars?.purchase ? [data.procVars?.purchase + ''] : null, }) } if (preview) { @@ -95,8 +96,7 @@ export class EamAssetPurchaseApplyComponent { values = { ...v, - - purchase: Number(v.purchase?.[0]), + purchase: Number(v.purchase?.[0]) ? Number(v.purchase?.[0]) : null, applyDepartmentId: Number(v.applyDepartmentId?.[0]), } }