From e4030628f93da1daa7612f9c7cfc998669bd9b67 Mon Sep 17 00:00:00 2001 From: kely Date: Mon, 10 Jun 2024 01:44:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=20&=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-admin-app/src/app/app.routes.ts | 11 +++--- .../eam-asset-purchase-apply.component.html | 2 +- .../flow-result/flow-result.component.html | 8 +++-- .../asset-select/asset-select.component.html | 5 +-- .../asset-select/asset-select.component.ts | 28 +++++++++------ ...mponent-basic-category-tree.component.html | 36 ++++++++++--------- .../fixed-asset/fixed-asset.component.html | 28 +++++++-------- .../fixed-asset-myown.component.html | 6 ++++ .../fixed-asset-myown.component.ts | 22 +++++++++--- .../fixed-asset-position.component.html | 2 +- .../fixed-asset-storage.component.ts | 2 +- .../fixed-asset-manage.component.html | 2 +- .../flow-my-todo/flow-my-todo.component.html | 11 ++++++ .../flow-my-todo/flow-my-todo.component.ts | 33 +++++++++++++---- 14 files changed, 128 insertions(+), 68 deletions(-) diff --git a/web-admin-app/src/app/app.routes.ts b/web-admin-app/src/app/app.routes.ts index 5e91f71..a2a738a 100644 --- a/web-admin-app/src/app/app.routes.ts +++ b/web-admin-app/src/app/app.routes.ts @@ -320,11 +320,7 @@ export const routes: Routes = [ redirectTo: 'list', pathMatch: 'full', }, - { - path: 'type', - component: RepairTypeComponent, - title: '维修类型', - }, + { path: 'list', component: RepairListComponent, @@ -402,6 +398,11 @@ export const routes: Routes = [ pathMatch: 'full', redirectTo: 'goods-stock', }, + { + path: 'repair-type', + component: RepairTypeComponent, + title: '维修类型', + }, { path: 'goods-stock', component: BasicGoodsStockComponent, diff --git a/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html b/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html index 2509824..e4c089d 100644 --- a/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html +++ b/web-admin-app/src/app/components/apply-asset-flow/eam-asset-purchase-apply/eam-asset-purchase-apply.component.html @@ -42,7 +42,7 @@ 业务名称 - + diff --git a/web-admin-app/src/app/components/apply-asset-flow/flow-result/flow-result.component.html b/web-admin-app/src/app/components/apply-asset-flow/flow-result/flow-result.component.html index 1f7ee80..39f3626 100644 --- a/web-admin-app/src/app/components/apply-asset-flow/flow-result/flow-result.component.html +++ b/web-admin-app/src/app/components/apply-asset-flow/flow-result/flow-result.component.html @@ -6,12 +6,14 @@
{{ item.createTime }} - - {{ item.comment?.comment }} -
任务名称：{{ item.taskName }}
审批人：{{ item?.assigneeName ?? '-' }}
+
+ 审批意见： + {{ item.comment?.comment ?? '-' }} + +
@if (item.finishTime) {
流程完成时间：{{ item.finishTime }} diff --git a/web-admin-app/src/app/components/asset-select/asset-select.component.html b/web-admin-app/src/app/components/asset-select/asset-select.component.html index 6192847..95db71e 100644 --- a/web-admin-app/src/app/components/asset-select/asset-select.component.html +++ b/web-admin-app/src/app/components/asset-select/asset-select.component.html @@ -127,10 +127,10 @@ {{ data.assetCode }} @@ -146,6 +146,7 @@ [nzMax]="storage ? undefined : data.max" [nzDisabled]="disabled" [(ngModel)]="data.count" + (ngModelChange)="onCountChange()" /> {{ data.model }} diff --git a/web-admin-app/src/app/components/asset-select/asset-select.component.ts b/web-admin-app/src/app/components/asset-select/asset-select.component.ts index 00e5be2..0f2d775 100644 --- a/web-admin-app/src/app/components/asset-select/asset-select.component.ts +++ b/web-admin-app/src/app/components/asset-select/asset-select.component.ts @@ -26,7 +26,7 @@ import { ASSET_SOURCE_MAP, ASSET_STATUS_MAP, MAX_PAGE_SIZE } from 'app/constants import { AnyObject, TableOption } from 'app/shared/components/server-paginated-table' import { PositionSelectComponent } from '../position-select/position-select.component' import { ManufacturerSelectComponent } from '../manufacturer-select/manufacturer-select.component' -import { tap } from 'rxjs' +import { map, tap } from 'rxjs' @Component({ selector: 'app-asset-select', @@ -99,7 +99,7 @@ export class AssetSelectComponent { this.table .setConfig({ selectable: true, - rowKey: 'assetId', + rowKey: 'key', radio: this.radio, noneCache: true, }) @@ -115,10 +115,12 @@ export class AssetSelectComponent { fetchData(p: {}, q: AnyObject) { const fn = this.storage ? 'getAeamBusinessStorageList' : 'getAssetStroagePage' return this.api[fn]({ ...p, ...q }).pipe( - tap((res) => { + map((res) => { res.body.rows.forEach((item: NzSafeAny) => { - this.allGetedDataMap.set(item.assetId, item) + item['key'] = item.assetId + '_' + item.warehouseId + this.allGetedDataMap.set(item.key, item) }) + return res }), ) } @@ -134,8 +136,8 @@ export class AssetSelectComponent { this.selectedDataList = [] } this.allGetedDataMap.forEach((i: NzSafeAny) => { - if (this.table.ref.selected.has(String(i.assetId))) { - if (!this.selectedDataList.some((s) => s.assetId === i.assetId)) { + if (this.table.ref.selected.has(String(i.key))) { + if (!this.selectedDataList.some((s) => s.key === i.key)) { this.selectedDataList.push({ ...i, count: i.count === 0 ? 0 : 1, max: i.count }) } } @@ -148,11 +150,15 @@ export class AssetSelectComponent { } onRemove() { - this.selectedDataList = this.selectedDataList.filter((i) => !this.setOfCheckedId.has(i.assetId)) + this.selectedDataList = this.selectedDataList.filter((i) => !this.setOfCheckedId.has(i.key)) this.refreshCheckedStatus() this.onChange(this.selectedDataList) } + onCountChange() { + this.onChange(this.selectedDataList) + } + updateCheckedSet(id: number, checked: boolean): void { if (checked) { this.setOfCheckedId.add(id) @@ -163,9 +169,8 @@ export class AssetSelectComponent { refreshCheckedStatus(): void { const listOfEnabledData = this.selectedDataList.filter(({ disabled }) => !disabled) - this.checkedAll = listOfEnabledData.every(({ assetId }) => this.setOfCheckedId.has(assetId)) - this.indeterminate = - listOfEnabledData.some(({ assetId }) => this.setOfCheckedId.has(assetId)) && !this.checkedAll + this.checkedAll = listOfEnabledData.every(({ key }) => this.setOfCheckedId.has(key)) + this.indeterminate = listOfEnabledData.some(({ key }) => this.setOfCheckedId.has(key)) && !this.checkedAll } onItemChecked(id: number, checked: boolean): void { @@ -176,7 +181,7 @@ export class AssetSelectComponent { onAllChecked(checked: boolean): void { this.selectedDataList .filter(({ disabled }) => !disabled) - .forEach(({ assetId }) => this.updateCheckedSet(assetId, checked)) + .forEach(({ key }) => this.updateCheckedSet(key, checked)) this.refreshCheckedStatus() } @@ -195,6 +200,7 @@ export class AssetSelectComponent { // const ids = vals.map((i: NzSafeAny) => i.assetId) this.api.getAssetStorageListByIds(vals).subscribe((res) => { this.selectedDataList = res.body.rows.map((item: NzSafeAny) => { + item['key'] = item.assetId + '_' + item.warehouseId this.allGetedDataMap.set(item.assetId, item) return item }) diff --git a/web-admin-app/src/app/components/component-basic-category-tree/component-basic-category-tree.component.html b/web-admin-app/src/app/components/component-basic-category-tree/component-basic-category-tree.component.html index e86ef16..e606262 100644 --- a/web-admin-app/src/app/components/component-basic-category-tree/component-basic-category-tree.component.html +++ b/web-admin-app/src/app/components/component-basic-category-tree/component-basic-category-tree.component.html @@ -40,23 +40,25 @@ } {{ node.title }}
- - -
    -
  • 添加同级分类
    • -
  • 添加下级分类
    • -
  • -
  • 删除
    • -
- + @if (createable) { + + +
    +
  • 添加同级分类
    • +
  • 添加下级分类
    • +
  • +
  • 删除
    • +
+ + } diff --git a/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html b/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html index f803eff..eb2f0a7 100644 --- a/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html +++ b/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html @@ -154,23 +154,11 @@ [nzPaddingLeft]="12" nz-submenu nzTitle="维护维保" - *appPermission="[ - 'fixed-asset-repair-type:view', - 'fixed-asset-repair-list:view', - 'fixed-asset-repair-fault:view' - ]" + *appPermission="['fixed-asset-repair-list:view', 'fixed-asset-repair-fault:view']" [nzOpen]="openedSubmenu.startsWith('/fixed-asset/repair/')" > +