Browse Source

license

main
kely 1 year ago
parent
commit
c0740ecbbf
  1. 17
      web-admin-app/src/app/app.routes.ts
  2. 2
      web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html
  3. 2
      web-admin-app/src/app/components/asset-business-allot-form/asset-business-allot-form.component.ts
  4. 2
      web-admin-app/src/app/components/asset-business-borrow-form/asset-business-borrow-form.component.ts
  5. 2
      web-admin-app/src/app/components/asset-business-collection/asset-business-collection.component.ts
  6. 2
      web-admin-app/src/app/components/asset-business-retirement/asset-business-retirement.component.ts
  7. 2
      web-admin-app/src/app/components/asset-business-return-form/asset-business-return-form.component.ts
  8. 2
      web-admin-app/src/app/components/asset-business-revert-form/asset-business-revert-form.component.ts
  9. 2
      web-admin-app/src/app/components/asset-business-storage-form/asset-business-storage-form.component.ts
  10. 2
      web-admin-app/src/app/components/asset-business-transfer-form/asset-business-transfer-form.component.ts
  11. 31
      web-admin-app/src/app/components/asset-form/asset-form.component.ts
  12. 4
      web-admin-app/src/app/components/asset-select/asset-select.component.html
  13. 2
      web-admin-app/src/app/components/asset-select/asset-select.component.ts
  14. 4
      web-admin-app/src/app/components/component-org-tree/component-org-tree.component.html
  15. 46
      web-admin-app/src/app/components/license/license.component.html
  16. 0
      web-admin-app/src/app/components/license/license.component.less
  17. 55
      web-admin-app/src/app/components/license/license.component.ts
  18. 2
      web-admin-app/src/app/components/repair-fault-form/repair-fault-form.component.ts
  19. 2
      web-admin-app/src/app/components/repair-form/repair-form.component.ts
  20. 9
      web-admin-app/src/app/constants/index.ts
  21. 2
      web-admin-app/src/app/pages/fixed-asset/alert/alert-borrow/alert-borrow.component.ts
  22. 1
      web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-down/alert-inventory-down.component.ts
  23. 1
      web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-safety/alert-inventory-safety.component.ts
  24. 1
      web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-up/alert-inventory-up.component.ts
  25. 10
      web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage-scrap/fixed-asset-manage-scrap.component.ts
  26. 2
      web-admin-app/src/app/pages/fixed-asset/stocktaking/stockaking-plan/stockaking-plan.component.ts
  27. 10
      web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html
  28. 2
      web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts
  29. 7
      web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html
  30. 4
      web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts
  31. 10
      web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html
  32. 2
      web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts
  33. 5
      web-admin-app/src/app/pages/license/license.component.html
  34. 8
      web-admin-app/src/app/pages/license/license.component.less
  35. 12
      web-admin-app/src/app/pages/license/license.component.ts
  36. 22
      web-admin-app/src/app/pages/org-setting/org-setting.component.html
  37. 12
      web-admin-app/src/app/pages/org-setting/org-setting.component.ts
  38. 9
      web-admin-app/src/app/pages/system/index/system.component.html
  39. 5
      web-admin-app/src/app/pages/system/license/license.component.html
  40. 0
      web-admin-app/src/app/pages/system/license/license.component.less
  41. 12
      web-admin-app/src/app/pages/system/license/license.component.ts
  42. 10
      web-admin-app/src/app/services/api.service.ts
  43. 6
      web-admin-app/src/app/services/local-http-interceptor.service.ts

17
web-admin-app/src/app/app.routes.ts

@ -60,12 +60,18 @@ import { FlowLayoutComponent } from './pages/flow/flow-layout/flow-layout.compon
import { FlowMyFinishedComponent } from './pages/flow/flow-my-finished/flow-my-finished.component'
import { FixedAssetStorageComponent } from './pages/fixed-asset/ledger/fixed-asset-storage/fixed-asset-storage.component'
import { HomeComponent } from './pages/home/home.component'
import { LicensePageComponent } from './pages/license/license.component'
import { SystemLicenseComponent } from './pages/system/license/license.component'
export const routes: Routes = [
{
path: 'login',
component: LoginComponent,
},
{
path: 'license',
component: LicensePageComponent,
},
{
path: '',
@ -155,6 +161,17 @@ export const routes: Routes = [
},
},
},
{
path: 'license',
component: SystemLicenseComponent,
canActivate: [permissionGuard],
title: '授权证书',
data: {
permission: {
only: ['system-license:view'],
},
},
},
{
path: 'flow',
canActivate: [permissionGuard],

2
web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html

@ -125,7 +125,7 @@
<nz-form-item>
<nz-form-label>资产列表</nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">
<app-asset-select formControlName="assetIdList" />
<app-asset-select formControlName="assetIdList" [buy]="true" [storage]="true" />
</nz-form-control>
</nz-form-item>
</div>

2
web-admin-app/src/app/components/asset-business-allot-form/asset-business-allot-form.component.ts

@ -95,7 +95,7 @@ export class AssetBusinessAllotFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId,
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
useOrganizationId: Number(v.useOrganizationId),
assetIdList: v.assetIdList,
}

2
web-admin-app/src/app/components/asset-business-borrow-form/asset-business-borrow-form.component.ts

@ -90,7 +90,7 @@ export class AssetBusinessBorrowFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
// ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
// useOrganizationId: Number(v.useOrganizationId?.[0]),
assetIdList: v.assetIdList,
}

2
web-admin-app/src/app/components/asset-business-collection/asset-business-collection.component.ts

@ -100,7 +100,7 @@ export class AssetBusinessCollectionComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
// useOrganizationId: Number(v.useOrganizationId?.[0]),
assetIdList: v.assetIdList,
// assetIdList: typeof v.assetIdList === 'string' ? v.assetIdList : JSON.stringify(v.assetIdList),

2
web-admin-app/src/app/components/asset-business-retirement/asset-business-retirement.component.ts

@ -101,7 +101,7 @@ export class AssetBusinessRetirementComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
useOrganizationId: Number(v.useOrganizationId?.[0]),
assetIdList: v.assetIdList,
// assetIdList: typeof v.assetIdList === 'string' ? v.assetIdList : JSON.stringify(v.assetIdList),

2
web-admin-app/src/app/components/asset-business-return-form/asset-business-return-form.component.ts

@ -100,7 +100,7 @@ export class AssetBusinessReturnFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
useOrganizationId: Number(v.useOrganizationId),
assetIdList: v.assetIdList,
}

2
web-admin-app/src/app/components/asset-business-revert-form/asset-business-revert-form.component.ts

@ -97,7 +97,7 @@ export class AssetBusinessRevertFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
useOrganizationId: Number(v.useOrganizationId?.[0]),
assetIdList: v.assetIdList,
}

2
web-admin-app/src/app/components/asset-business-storage-form/asset-business-storage-form.component.ts

@ -95,7 +95,7 @@ export class AssetBusinessStorageFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: v.positionId?.[0],
positionId: v.positionId,
useOrganizationId: v.useOrganizationId?.[0],
responsiblePerson: v.responsiblePerson?.[0],
assetIdList: v.assetIdList,

2
web-admin-app/src/app/components/asset-business-transfer-form/asset-business-transfer-form.component.ts

@ -97,7 +97,7 @@ export class AssetBusinessTransferFormComponent {
managerId: v.managerId?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: Number(v.positionId?.[0]),
positionId: Number(v.positionId),
useOrganizationId: Number(v.useOrganizationId),
inUseOrganizationId: Number(v.inUseOrganizationId),
outUseOrganizationId: Number(v.outUseOrganizationId?.[0]),

31
web-admin-app/src/app/components/asset-form/asset-form.component.ts

@ -100,20 +100,9 @@ export class AssetFormComponent implements OnInit {
this.patchValues()
this.api
.getBasicFinancialCategory({
depth: '',
financialCategoryId: 0,
financialCategoryName: '',
notes: '',
parentId: 0,
useTerms: 0,
pageSize: MAX_PAGE_SIZE,
pageNum: 1,
})
.subscribe((res) => {
this.financialCategory = res.body.rows
})
this.api.getBasicFinancialCategory({}).subscribe((res) => {
this.financialCategory = res.body
})
}
patchValues() {
@ -125,10 +114,12 @@ export class AssetFormComponent implements OnInit {
useUserId: data._useUser?.userId ? [data._useUser?.userId] : [],
manager: data._manager?.userId ? [data._manager?.userId] : [],
responsiblePerson: data._responsiblePerson?.userId ? [data._responsiblePerson?.userId] : [],
categoryId: data._category?.categoryId + '',
positionId: data._position?.positionId + '',
ownCompanyId: data._ownCompany?.organizationId + '',
useOrganizationId: data._useOrganization?.organizationId + '',
categoryId: data._category?.categoryId ? data._category?.categoryId + '' : null,
positionId: data._position?.positionId ? data._position?.positionId + '' : null,
ownCompanyId: data._ownCompany?.organizationId ? data._ownCompany?.organizationId + '' : null,
useOrganizationId: data._useOrganization?.organizationId
? data._useOrganization?.organizationId + ''
: null,
maintenanceVendor: data._maintenanceVendor?.maintenanceVendorId,
manufacturersVendorId: data._manufacturersVendor?.manufacturersVendorId,
})
@ -142,14 +133,14 @@ export class AssetFormComponent implements OnInit {
let values = null
if (FormValidators.validateFormGroup(this.formGroup)) {
const v = this.formGroup.getRawValue()
console.log('v', v)
values = {
...v,
useUserId: v.useUserId?.[0],
manager: v.manager?.[0],
categoryId: v.categoryId,
ownCompanyId: v.ownCompanyId,
positionId: v.positionId?.[0],
positionId: v.positionId,
useOrganizationId: v.useOrganizationId,
responsiblePerson: v.responsiblePerson?.[0],
}

4
web-admin-app/src/app/components/asset-select/asset-select.component.html

@ -119,7 +119,7 @@
<th>资产编号</th>
<th>资产状态</th>
<th>资产名称</th>
<th>库存数量</th>
<th>{{ buy ? '采购' : '库存' }}数量</th>
<th>规格型号</th>
<th>资产序列号</th>
</tr>
@ -142,7 +142,7 @@
<td>{{ data.name }}</td>
<td>
<nz-input-number
[nzMin]="1"
[nzMin]="0"
[nzMax]="storage ? undefined : data.max"
[nzDisabled]="disabled"
[(ngModel)]="data.count"

2
web-admin-app/src/app/components/asset-select/asset-select.component.ts

@ -53,6 +53,8 @@ export class AssetSelectComponent {
@Input() storage: boolean = false
@Input() buy: boolean = false
@Output() onSelected = new EventEmitter<NzSafeAny>()
allGetedDataMap = new Map<number, NzSafeAny>()

4
web-admin-app/src/app/components/component-org-tree/component-org-tree.component.html

@ -91,12 +91,12 @@
</nz-form-control>
</nz-form-item>
}
<nz-form-item>
<!-- <nz-form-item>
<nz-form-label> 状态 </nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">
<nz-switch formControlName="status"></nz-switch>
</nz-form-control>
</nz-form-item>
</nz-form-item> -->
</form>
</ng-template>

46
web-admin-app/src/app/components/license/license.component.html

@ -0,0 +1,46 @@
<h1>License 管理</h1>
@if (license.time.includes('过期')) {
<nz-alert nzShowIcon [nzType]="'warning'" nzMessage="授权证书已过期"> </nz-alert>
} @else {
<nz-alert nzShowIcon [nzType]="'success'" nzMessage="授权生效中"> </nz-alert>
}
<div class="mt-4">
<nz-table nzTemplateMode nzBordered>
<tbody>
<tr>
<td>证书标题</td>
<td>
{{ license.subject }}
</td>
</tr>
<tr>
<td>描述信息</td>
<td>
{{ license.description }}
</td>
</tr>
<tr>
<td>授权时间</td>
<td>
{{ license.time }}
</td>
</tr>
<tr>
<td>更新证书</td>
<td>
<button class="upload-btn" nz-button [nzLoading]="uploadLoading">
<i nz-icon nzType="upload"></i>
选择证书
<input type="file" (change)="onFileChange($event)" />
</button>
</td>
</tr>
</tbody>
</nz-table>
@if (!license.time.includes('过期')) {
<div class="mt-4 flex">
<button nz-button nzType="primary" [routerLink]="['/']">回到首页</button>
</div>
}
</div>

0
web-admin-app/src/app/components/license/license.component.less

55
web-admin-app/src/app/components/license/license.component.ts

@ -0,0 +1,55 @@
import { Component, Input, OnInit } from '@angular/core'
import { ApiService } from 'app/services'
import { SharedModule } from 'app/shared/shared.module'
import { NzSafeAny } from 'ng-zorro-antd/core/types'
import { NzMessageService } from 'ng-zorro-antd/message'
import { finalize } from 'rxjs'
@Component({
selector: 'app-license',
standalone: true,
imports: [SharedModule],
templateUrl: './license.component.html',
styleUrl: './license.component.less',
})
export class LicenseComponent implements OnInit {
constructor(
private api: ApiService,
private msg: NzMessageService,
) {}
license: NzSafeAny = null
ngOnInit(): void {
this.loadLicense()
}
uploadLoading = false
loadLicense() {
this.api.getLicenseInfo().subscribe((res) => {
this.license = res.body
})
}
onFileChange(e: Event) {
const target = e.target as HTMLInputElement
const file = target.files![0]
target.value = ''
const formdata = new FormData()
formdata.append('file', file)
this.uploadLoading = true
this.api
.uploadLicenseInfo(formdata)
.pipe(
finalize(() => {
this.uploadLoading = false
}),
)
.subscribe((res) => {
this.msg.success(res.desc)
this.loadLicense()
})
}
}

2
web-admin-app/src/app/components/repair-fault-form/repair-fault-form.component.ts

@ -93,7 +93,7 @@ export class RepairFaultFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: v.positionId?.[0],
positionId: v.positionId,
useOrganizationId: v.useOrganizationId?.[0],
responsiblePerson: v.responsiblePerson?.[0],
assetIdList: v.assetIdList,

2
web-admin-app/src/app/components/repair-form/repair-form.component.ts

@ -90,7 +90,7 @@ export class RepairFormComponent {
manager: v.manager?.[0],
categoryId: v.categoryId?.[0],
ownCompanyId: v.ownCompanyId?.[0],
positionId: v.positionId?.[0],
positionId: v.positionId,
useOrganizationId: v.useOrganizationId?.[0],
responsiblePerson: v.responsiblePerson?.[0],
assetIdList: v.assetIdList,

9
web-admin-app/src/app/constants/index.ts

@ -72,3 +72,12 @@ export const ASSET_SCRAP_STATUS = new Map([
[3, '审批中'],
[4, '取消'],
])
// 1-起草中,2-审批中,3-已结束,4-已驳回,5-已废弃,6-流程异常
export const FLOW_STATUS = new Map([
[1, '起草中'],
[2, '审批中'],
[3, '已结束'],
[4, '已驳回'],
[5, '已废弃'],
[6, '流程异常'],
])

2
web-admin-app/src/app/pages/fixed-asset/alert/alert-borrow/alert-borrow.component.ts

@ -49,6 +49,8 @@ export class AlertBorrowComponent {
{ key: 'serialNumber', title: '序列号', visible: true },
{ key: 'notes', title: '备注', visible: true },
{ key: 'returnTime', title: '归还时间', visible: true },
{ key: 'businessId', title: '借用业务编号', visible: true },
// { key: 'createTime', title: '创建时间', visible: true },
])
}

1
web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-down/alert-inventory-down.component.ts

@ -46,6 +46,7 @@ export class AlertInventoryDownComponent {
{ key: 'model', title: '规格型号', visible: true },
{ key: 'warehouseName', title: '仓库', visible: true },
{ key: 'count', title: '库存数量', visible: true, width: '100px' },
{ key: 'safetyLimit', title: '安全库存', visible: true, width: '100px' },
{ key: 'upperLimit', title: '库存上限', visible: true, width: '100px' },
{ key: 'lowerLimit', title: '库存下限', visible: true, width: '100px' },

1
web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-safety/alert-inventory-safety.component.ts

@ -46,6 +46,7 @@ export class AlertInventorySafetyComponent {
{ key: 'model', title: '规格型号', visible: true },
{ key: 'warehouseName', title: '仓库', visible: true },
{ key: 'count', title: '库存数量', visible: true, width: '100px' },
{ key: 'safetyLimit', title: '安全库存', visible: true, width: '100px' },
{ key: 'upperLimit', title: '库存上限', visible: true, width: '100px' },
{ key: 'lowerLimit', title: '库存下限', visible: true, width: '100px' },

1
web-admin-app/src/app/pages/fixed-asset/alert/alert-inventory-up/alert-inventory-up.component.ts

@ -46,6 +46,7 @@ export class AlertInventoryUpComponent {
{ key: 'model', title: '规格型号', visible: true },
{ key: 'warehouseName', title: '仓库', visible: true },
{ key: 'count', title: '库存数量', visible: true, width: '100px' },
{ key: 'safetyLimit', title: '安全库存', visible: true, width: '100px' },
{ key: 'upperLimit', title: '库存上限', visible: true, width: '100px' },
{ key: 'lowerLimit', title: '库存下限', visible: true, width: '100px' },

10
web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage-scrap/fixed-asset-manage-scrap.component.ts

@ -61,8 +61,14 @@ export class FixedAssetManageScrapComponent {
this.onCreate(v, true)
},
},
{ title: '清理', onClick: this.onClean.bind(this) },
{ title: '确认', onClick: this.confirm.bind(this) },
{
title: '清理',
visible(v) {
return true
},
onClick: this.onClean.bind(this),
},
{ title: '报废', onClick: this.confirm.bind(this) },
{ title: '修改', onClick: this.onCreate.bind(this) },
{ title: '删除', onClick: this.deleteItem.bind(this) },
])

2
web-admin-app/src/app/pages/fixed-asset/stocktaking/stockaking-plan/stockaking-plan.component.ts

@ -88,7 +88,7 @@ export class StockakingPlanComponent {
.setColumn([
{ key: 'name', title: '名称' },
{ key: 'fullStocktaking', title: '全员盘点' },
{ key: 'status', title: '盘点状态' },
// { key: 'status', title: '盘点状态' },
{ key: '_head', title: '负责人', width: '150px' },
{ key: '_stocktakingUser', title: '盘点人', width: '150px' },
// { key: 'countPending', title: '待盘点', width: '100px' },

10
web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html

@ -15,14 +15,12 @@
{{ data?.title }}
}
@case ('status') {
@if (row.finishTime) {
<nz-badge nzText="已完成" [nzStatus]="'success'" />
} @else {
<nz-badge nzText="进行中" [nzStatus]="'processing'" />
}
<nz-tag nzColor="blue">
{{ FLOW_STATUS.get(data) }}
</nz-tag>
}
@case ('urgency') {
<nz-tag>
<nz-tag [nzColor]="row.procVars.urgency === 2 ? 'error' : ''">
{{ row.procVars.urgency === 2 ? '紧急' : '普通' }}
</nz-tag>
}

2
web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts

@ -12,6 +12,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'
import { FormValidators } from 'app/utils'
import { AssetEmployeeApplyComponent } from 'app/components'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS } from 'app/constants'
@Component({
selector: 'app-flow-my-apply',
@ -40,6 +41,7 @@ export class FlowMyApplyComponent {
name: new FormControl(''),
})
FLOW_STATUS = FLOW_STATUS
ngOnInit(): void {
this.table
// .setConfig({

7
web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html

@ -14,8 +14,13 @@
@case ('procVars') {
{{ data.title }}
}
@case ('status') {
<nz-tag nzColor="blue">
{{ FLOW_STATUS.get(data) }}
</nz-tag>
}
@case ('urgency') {
<nz-tag>
<nz-tag [nzColor]="row.procVars.urgency === 2 ? 'error' : ''">
{{ row.procVars.urgency === 2 ? '紧急' : '普通' }}
</nz-tag>
}

4
web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts

@ -11,6 +11,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'
import { NzMessageService } from 'ng-zorro-antd/message'
import { FormValidators } from 'app/utils'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS } from 'app/constants'
@Component({
selector: 'app-flow-my-finished',
@ -39,6 +40,8 @@ export class FlowMyFinishedComponent {
name: new FormControl(''),
})
FLOW_STATUS = FLOW_STATUS
ngOnInit(): void {
this.table
// .setConfig({
@ -48,6 +51,7 @@ export class FlowMyFinishedComponent {
.setColumn([
{ key: 'procVars', title: '名称', visible: true },
// { key: 'status', title: '审批状态', visible: true },
{ key: 'status', title: '流程状态', visible: true },
{ key: 'urgency', title: '紧急程度', visible: true },
{ key: 'procDefName', title: '流程类型', visible: true },
{ key: 'assigneeName', title: '审批人', visible: true },

10
web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html

@ -15,14 +15,12 @@
{{ data.title }}
}
@case ('status') {
@if (row.finishTime) {
<nz-badge nzText="已完成" [nzStatus]="'success'" />
} @else {
<nz-badge nzText="进行中" [nzStatus]="'processing'" />
}
<nz-tag nzColor="blue">
{{ FLOW_STATUS.get(data) }}
</nz-tag>
}
@case ('urgency') {
<nz-tag>
<nz-tag [nzColor]="row.procVars.urgency === 2 ? 'error' : ''">
{{ row.procVars.urgency === 2 ? '紧急' : '普通' }}
</nz-tag>
}

2
web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts

@ -11,6 +11,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'
import { NzMessageService } from 'ng-zorro-antd/message'
import { FormValidators } from 'app/utils'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS } from 'app/constants'
@Component({
selector: 'app-flow-my-todo',
@ -39,6 +40,7 @@ export class FlowMyTodoComponent {
name: new FormControl(''),
})
FLOW_STATUS = FLOW_STATUS
ngOnInit(): void {
this.table
// .setConfig({

5
web-admin-app/src/app/pages/license/license.component.html

@ -0,0 +1,5 @@
<div class="page-container">
<div class="bg-white w-1/2 h-[500px] shadow-md p-6">
<app-license />
</div>
</div>

8
web-admin-app/src/app/pages/license/license.component.less

@ -0,0 +1,8 @@
.page-container {
position: fixed;
inset: 0;
z-index: 100;
display: flex;
align-items: center;
justify-content: center;
}

12
web-admin-app/src/app/pages/license/license.component.ts

@ -0,0 +1,12 @@
import { Component } from '@angular/core'
import { LicenseComponent } from 'app/components/license/license.component'
import { SharedModule } from 'app/shared/shared.module'
@Component({
selector: 'app-upload-license',
standalone: true,
imports: [SharedModule, LicenseComponent],
templateUrl: './license.component.html',
styleUrl: './license.component.less',
})
export class LicensePageComponent {}

22
web-admin-app/src/app/pages/org-setting/org-setting.component.html

@ -8,7 +8,7 @@
[disabled]="organization?.organizationType !== '2'"
(click)="onCreate()"
>
新建
新建员工
</button>
</nz-space>
</ng-template>
@ -137,28 +137,28 @@
<input type="text" nz-input formControlName="email" placeholder="请输入邮箱" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label> 密码 </nz-form-label>
<nz-form-label [nzRequired]="true"> 角色 </nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">
<input type="password" nz-input formControlName="password" placeholder="请输入密码" />
<nz-select class="!w-fulle" formControlName="roleId" nzPlaceHolder="请选择">
<nz-option *ngFor="let item of roles" [nzValue]="item.roleId" [nzLabel]="item.roleName"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label> 确认密码 </nz-form-label>
<nz-form-label [nzRequired]="true"> 密码 </nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">
<input type="password" nz-input formControlName="repassword" placeholder="请输入密码" />
<input type="password" nz-input formControlName="password" placeholder="请输入密码" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label> 角色 </nz-form-label>
<nz-form-label [nzRequired]="true"> 确认密码 </nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">
<nz-select class="!w-fulle" formControlName="roleId" nzPlaceHolder="请选择">
<nz-option *ngFor="let item of roles" [nzValue]="item.roleId" [nzLabel]="item.roleName"></nz-option>
</nz-select>
<input type="password" nz-input formControlName="repassword" placeholder="请输入密码" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label> 状态 </nz-form-label>
<nz-form-control [nzErrorTip]="errorTpl">

12
web-admin-app/src/app/pages/org-setting/org-setting.component.ts

@ -70,13 +70,13 @@ export class OrgSettingComponent implements OnInit {
'',
[FormValidators.required('请输入'), FormValidators.pattern(/^1[3-9]\d{9}$/, '请输入正确的手机号')],
],
password: [],
repassword: [],
password: [null, FormValidators.required('请输入')],
repassword: [null, FormValidators.required('请输入')],
email: [],
status: ['0'],
sex: ['0'],
avatar: [],
roleId: [],
roleId: [null, [FormValidators.required('请选择角色')]],
})
}
initQueryForm() {
@ -124,6 +124,9 @@ export class OrgSettingComponent implements OnInit {
onCreate(data?: NzSafeAny) {
if (data) {
this.createForm.get('password')?.clearValidators()
this.createForm.get('repassword')?.clearValidators()
this.createForm.updateValueAndValidity()
this.createForm.patchValue({ ...data, roleId: data._umsRole?.roleId })
}
this.drawerRef = this.drawer.create({
@ -157,6 +160,9 @@ export class OrgSettingComponent implements OnInit {
async onCancel() {
this.drawerRef?.close()
this.createForm.get('password')?.addValidators(FormValidators.required('请输入'))
this.createForm.get('repassword')?.addValidators(FormValidators.required('请输入'))
this.createForm.updateValueAndValidity()
this.createForm.reset({
sex: '0',
status: '0',

9
web-admin-app/src/app/pages/system/index/system.component.html

@ -20,6 +20,15 @@
>
角色管理
</li>
<li
*appPermission="['system-license:view']"
nz-menu-item
[nzPaddingLeft]="12"
[routerLink]="['/system/license']"
nzMatchRouter
>
授权证书
</li>
<li
*appPermission="['system-flow-form:view']"
nzMatchRouter

5
web-admin-app/src/app/pages/system/license/license.component.html

@ -0,0 +1,5 @@
<div class="p-4">
<nz-card [nzBordered]="false">
<app-license />
</nz-card>
</div>

0
web-admin-app/src/app/pages/system/license/license.component.less

12
web-admin-app/src/app/pages/system/license/license.component.ts

@ -0,0 +1,12 @@
import { Component } from '@angular/core'
import { LicenseComponent } from 'app/components/license/license.component'
import { SharedModule } from 'app/shared/shared.module'
@Component({
selector: 'app-system-license',
standalone: true,
imports: [SharedModule, LicenseComponent],
templateUrl: './license.component.html',
styleUrl: './license.component.less',
})
export class SystemLicenseComponent {}

10
web-admin-app/src/app/services/api.service.ts

@ -48,6 +48,14 @@ export class ApiService {
return this.http.post<JwResponse>('/api/common/upload', data)
}
getLicenseInfo() {
return this.http.post<JwResponse>('/api/license/info', null)
}
uploadLicenseInfo(formData: FormData) {
return this.http.post<JwResponse>('/api/license/update', formData)
}
login(data: {}) {
return this.http.post<JwResponse>('/api/oauth/login', data).pipe(
tap((res) => {
@ -125,7 +133,7 @@ export class ApiService {
}
getBasicFinancialCategory(data: {}) {
return this.http.post<JwResponse>('/api/eamBasicFinancialCategory/list', data)
return this.http.post<JwResponse>('/api/eamBasicFinancialCategory/all', data)
}
getAssetPage(data: {}) {
return this.http.post<JwResponse>('/api/eamAsset/list', data)

6
web-admin-app/src/app/services/local-http-interceptor.service.ts

@ -143,6 +143,12 @@ export class LocalHttpInterceptorService implements HttpInterceptor {
case 404:
this.msg.error(getErrorMessage(res.error, '没有找到资源'))
break
case 406:
this.msg.error(getErrorMessage(res.error))
setTimeout(() => {
window.location.href = '/license'
}, 1500)
break
default:
this.msg.error(getErrorMessage(res.error))

Loading…
Cancel
Save