([], [FormValidators.required('请选择')]),
+ })
+
+ table = new TableOption(this.fetchData.bind(this))
+
+ assetTotal = 0
+
+ deviceTotal = 0
+
+ queryForm = new FormGroup({
+ name: new FormControl(''),
+ })
+
+ FLOW_STATUS = flowIntStatus
+ ngOnInit(): void {
+ this.table
+ .setConfig({
+ cacheKey: this.page + '_' + this.type,
+ })
+ .setColumn([
+ { key: 'procVars', title: '名称', visible: true },
+ { key: 'status', title: '流程状态', visible: true },
+ { key: 'urgency', title: '紧急程度', visible: true },
+ { key: 'procDefName', title: '流程类型', visible: true },
+ { key: 'assigneeName', title: '审批人', visible: true },
+ { key: 'createTime', title: '提交时间', visible: true },
+ // { key: 'createTime', title: '作废时间', visible: true },
+ // { key: 'createTime', title: '完成时间', visible: true },
+ ])
+ .setRowOperate([
+ { title: '查看', onClick: this.onDetail.bind(this) },
+ {
+ title: '作废',
+ onClick: this.cancleFlow.bind(this),
+ visible: (v) => {
+ return this.page === 'apply'
+ },
+ },
+ ])
+ }
+
+ fetchData(p: {}, q: AnyObject) {
+ if (this.page === 'apply') {
+ return this.api.getMyApplyAssetFlow({ ...p, ...q, type: this.type }).pipe(
+ tap((res) => {
+ this.onLoad.emit(res.body.total)
+ }),
+ )
+ } else if (this.page === 'finished') {
+ return this.api.getMyFinishedAssetFlow({ ...p, ...q, type: this.type }).pipe(
+ tap((res) => {
+ this.onLoad.emit(res.body.total)
+ }),
+ )
+ } else {
+ return this.api.getMyTodoAssetFlow({ ...p, ...q, type: this.type }).pipe(
+ tap((res) => {
+ this.onLoad.emit(res.body.total)
+ }),
+ )
+ }
+ }
+
+ onDetail(model: NzSafeAny) {
+ console.log('model', model, comsMap[model.category])
+ this.modal.create({
+ nzTitle: '查看',
+ nzContent: comsMap[model.category],
+ nzWrapClassName: 'modal-lg',
+ nzWidth: '80vw',
+ nzFooter: null,
+ nzData: {
+ value: model,
+ preview: true,
+ },
+ })
+ }
+
+ cancleFlow(d: NzSafeAny) {
+ this.modal.confirm({
+ nzTitle: '作废',
+ nzContent: '是否要作废该申请？',
+ nzOnOk: async () => {
+ const res = await lastValueFrom(
+ this.api.cancelFlow({
+ instanceId: d.procInsId,
+ taskId: d.taskId,
+ }),
+ )
+ this.msg.success('作废成功')
+ this.table.ref.reload()
+ },
+ })
+ }
+}
diff --git a/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.html b/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.html
index 487f443..c453511 100644
--- a/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.html
+++ b/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.html
@@ -38,15 +38,28 @@
-
-
-
- 自动发起报修流程
-
-
-
-
-
+ @if (type != 'stocktaking' && formGroup.get('defectStatus')?.value === 2) {
+
+
+ 自动发起报修流程
+
+
+
+
+
+ }
+ @if (type === 'maintenance') {
+
+
+ 保养成本
+
+
+
+
+
+
+
+ }
{{ data.title }}总结
@@ -128,6 +141,64 @@
}
+ @if (type === 'maintenance') {
+ 备件损耗
+
+
+ }
+
diff --git a/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.ts b/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.ts
index d2b15b1..9539a81 100644
--- a/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.ts
+++ b/web-admin-app/src/app/components/plan-task/handle-task-asset-item/handle-task-asset-item.component.ts
@@ -12,10 +12,11 @@ import { ASSET_SOURCE_MAP, ASSET_STATUS, MAINTENANCE_STATUS, MAINTENANCE_TYPE, M
// import { PositionSelectComponent } from '../position-select/position-select.component'
// import { MaintenanceSelectComponent } from '../maintenance-select/maintenance-select.component'
import { NzSafeAny } from 'ng-zorro-antd/core/types'
-import { NZ_MODAL_DATA } from 'ng-zorro-antd/modal'
+import { NZ_MODAL_DATA, NzModalService } from 'ng-zorro-antd/modal'
import { UploadComponent } from 'app/shared/components/upload/upload.component'
import { AssetCategorySelectComponent } from 'app/components/asset-category-select/asset-category-select.component'
import { PlanTaskType } from 'app/types'
+import { AssetSelectBeijianComponent } from 'app/components/asset-select-beijian/asset-select-beijian.component'
// import { AssetOperationRecordsComponent } from '../asset-operation-records/asset-operation-records.component'
// import { AssetRepairRecordsComponent } from '../asset-repair-records/asset-repair-records.component'
// import { UploadComponent } from '../../shared/components/upload/upload.component'
@@ -39,6 +40,7 @@ export const defectStatusText: Record = {
// MaintenanceSelectComponent,
// AssetOperationRecordsComponent,
// AssetRepairRecordsComponent,
+ AssetSelectBeijianComponent,
UploadComponent,
],
templateUrl: './handle-task-asset-item.component.html',
@@ -86,8 +88,10 @@ export class HandleTaskAssetItemComponent {
img: this.fb.control(null, []),
attachment: this.fb.control(null, []),
notes: this.fb.control(null, []),
-
+ autoRepair: this.fb.control(false, []),
+ cost: this.fb.control(0, []),
_extInfo: this.fb.array([]),
+ sparePartsList: this.fb.control([], []),
})
this.patchValues()
@@ -100,6 +104,9 @@ export class HandleTaskAssetItemComponent {
get extInfo(): FormArray {
return this.formGroup.get('_extInfo') as FormArray
}
+ // get sparePartsList(): FormArray {
+ // return this.formGroup.get('sparePartsList') as FormArray
+ // }
onExtraChange(v: any) {
let extraFields: NzSafeAny[] = []
@@ -110,9 +117,36 @@ export class HandleTaskAssetItemComponent {
} catch (error) {}
this.setExtraFields(extraFields)
+ // this.setBeijian(extraFields)
}
ext = null
+ setBeijian(beijian: NzSafeAny[]) {
+ // this.sparePartsList.clear()
+ // beijian.forEach((i) => {
+ // this.sparePartsList.push(
+ // this.fb.group({
+ // assetId: this.fb.control(i.assetId),
+ // categoryId: this.fb.control(i.categoryId),
+ // categoryName: this.fb.control(i.categoryName),
+ // count: this.fb.control(i.count),
+ // model: this.fb.control(i.model),
+ // name: this.fb.control(i.name),
+ // remark: this.fb.control(i.remark),
+ // }),
+ // )
+ // })
+ }
+
+ modal = inject(NzModalService)
+ addSpareParts() {
+ this.modal.create({
+ nzTitle: '选择备件',
+ })
+ }
+ removeSpareParts(idx: number) {
+ // this.sparePartsList.removeAt(idx)
+ }
setExtraFields(fields: NzSafeAny[]) {
this.extInfo.clear()
this.extraFields = fields
@@ -136,6 +170,7 @@ export class HandleTaskAssetItemComponent {
fields: this.fb.control(i.type === 'RADIO' ? i.value?.fields : []),
}),
)
+
return i
})
}
diff --git a/web-admin-app/src/app/components/plan-task/handle-task/handle-task.component.html b/web-admin-app/src/app/components/plan-task/handle-task/handle-task.component.html
index 27f2388..96eff2c 100644
--- a/web-admin-app/src/app/components/plan-task/handle-task/handle-task.component.html
+++ b/web-admin-app/src/app/components/plan-task/handle-task/handle-task.component.html
@@ -172,7 +172,7 @@
- @if (item.defectStatus == 0) {
+ @if (item.defectStatus == 0 && !data.preview) {
{
const vals = e.getValues()
if (vals) {
- const res = await lastValueFrom(
- this.api.handleTaskAssetItem(
- {
- ...this.data.value,
- defects: this.data.value.defects.map((i: NzSafeAny) => {
- if (i.assetId === asset.assetId) {
- return {
- ...asset,
- _formValue: vals._extInfo,
- ...vals,
- }
- }
- return i
- }),
- },
- this.data.value.id,
- ),
- )
+ const val = {
+ ...this.data.value,
+ defects: this.data.value.defects.map((i: NzSafeAny) => {
+ if (i.assetId === asset.assetId) {
+ return {
+ ...asset,
+ _formValue: vals._extInfo,
+ ...vals,
+ }
+ }
+ return i
+ }),
+ }
+ console.log('val', val)
+
+ const res = await lastValueFrom(this.api.handleTaskAssetItem(val, this.data.value.id))
+ this.data.value = JSON.parse(JSON.stringify(val))
this.msg.success(res.desc)
// this.table.ref.reload()
return true
diff --git a/web-admin-app/src/app/components/plan-task/task-form/task-form.component.html b/web-admin-app/src/app/components/plan-task/task-form/task-form.component.html
index 4702cfd..b7984c8 100644
--- a/web-admin-app/src/app/components/plan-task/task-form/task-form.component.html
+++ b/web-admin-app/src/app/components/plan-task/task-form/task-form.component.html
@@ -45,7 +45,12 @@
任务时长
-
+
diff --git a/web-admin-app/src/app/components/plan-task/task-form/task-form.component.ts b/web-admin-app/src/app/components/plan-task/task-form/task-form.component.ts
index 09a92b4..92aaa4f 100644
--- a/web-admin-app/src/app/components/plan-task/task-form/task-form.component.ts
+++ b/web-admin-app/src/app/components/plan-task/task-form/task-form.component.ts
@@ -81,7 +81,7 @@ export class TaskFormComponent {
businessId: this.fb.control(null, []),
attachment: this.fb.control(null, []),
- duration: this.fb.control(null, []),
+ duration: this.fb.control(null, [FormValidators.required('请输入')]),
order: this.fb.control(false, []),
limit: this.fb.control(false, []),
img: this.fb.control(null, []),
diff --git a/web-admin-app/src/app/components/plan-task/task-list/task-list.component.ts b/web-admin-app/src/app/components/plan-task/task-list/task-list.component.ts
index 40572cb..e87839e 100644
--- a/web-admin-app/src/app/components/plan-task/task-list/task-list.component.ts
+++ b/web-admin-app/src/app/components/plan-task/task-list/task-list.component.ts
@@ -17,6 +17,7 @@ import { StatusTagComponent } from 'app/components/status-tag/status-tag.compone
import { PlanFormComponent } from '../plan-form/plan-form.component'
import { TaskFormComponent } from '../task-form/task-form.component'
import { HandleTaskComponent } from '../handle-task/handle-task.component'
+import { Utils } from 'app/utils'
@Component({
selector: 'app-task-list',
@@ -99,13 +100,12 @@ export class TaskListComponent {
title: '审批',
onClick: this.onHandle.bind(this, false),
visible(v) {
- return true
return v.status === 'APPROVAL'
},
},
{
title: '报表',
- onClick: this.deleteItem.bind(this),
+ onClick: this.onReport.bind(this),
visible(v) {
return v.status === 'COMPLETED'
},
@@ -171,6 +171,7 @@ export class TaskListComponent {
}
this.table.ref.reload()
+ this.modalRef?.close()
return true
},
})
@@ -245,8 +246,22 @@ export class TaskListComponent {
// },
})
}
+
+ modalRef?: NzModalRef
+
+ onReport(i: NzSafeAny) {
+ this.msg.loading('下载中...')
+ this.api.downloadTaskReport(i.id).subscribe((res) => {
+ Utils.downLoadFile(
+ res,
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8',
+ )
+ this.msg.remove()
+ this.msg.success('下载成功')
+ })
+ }
onHandle(chuzhi: boolean, data: NzSafeAny) {
- console.log('chuzhi', chuzhi, data)
+ // console.log('chuzhi', chuzhi, data)
let nzTitle = chuzhi ? '处置任务' : '任务审批'
const footer: NzSafeAny[] = chuzhi
? [
@@ -268,7 +283,7 @@ export class TaskListComponent {
)
this.msg.success(res.desc)
this.table.ref.reload()
- ref.close()
+ this.modalRef?.close()
}
},
},
@@ -293,7 +308,7 @@ export class TaskListComponent {
)
this.msg.success(res.desc)
this.table.ref.reload()
- ref.close()
+ this.modalRef?.close()
}
},
},
@@ -317,7 +332,7 @@ export class TaskListComponent {
},
},
]
- const ref = this.modal.create({
+ this.modalRef = this.modal.create({
nzTitle,
nzContent: HandleTaskComponent,
nzWidth: '80vw',
@@ -326,11 +341,12 @@ export class TaskListComponent {
value: data,
chuzhi,
type: this.type,
+ preview: !chuzhi,
},
nzFooter: footer.concat({
label: '取消',
onClick: () => {
- ref.close()
+ this.modalRef?.close()
},
}),
})
diff --git a/web-admin-app/src/app/pages/data-vis/data-vis.component.html b/web-admin-app/src/app/pages/data-vis/data-vis.component.html
new file mode 100644
index 0000000..5913909
--- /dev/null
+++ b/web-admin-app/src/app/pages/data-vis/data-vis.component.html
@@ -0,0 +1,113 @@
+
+
+
+ {{ time | date: 'yyyy-MM-dd HH:mm:ss' }}
+
+ EAM数据可视化
+
+ {{ data?.slogan }}
+
+
+
+
+
+
+ @for (item of data.assetCostStatistics; track $index) {
+
+ {{ item.content }}
+
+
+ {{ item.name }}
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @for (item of data.flowCountStatistics; track $index) {
+
+ {{ item.content }}
+
+
+ {{ item.name }}
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ 消息名称
+ 消息内容
+
+
+
+ @for (item of data.messages; track $index) {
+
+ {{ item.name }}
+ {{ item.content }}
+
+ }
+
+
+
+
+
+
+
+
+
+ @for (item of records; track $index) {
+
+ {{ item.operationType }}
+
+ }
+
+
diff --git a/web-admin-app/src/app/pages/fixed-asset/maintain/on-off-records/on-off-records.component.less b/web-admin-app/src/app/pages/fixed-asset/maintain/on-off-records/on-off-records.component.less
new file mode 100644
index 0000000..e69de29
diff --git a/web-admin-app/src/app/pages/fixed-asset/maintain/on-off-records/on-off-records.component.ts b/web-admin-app/src/app/pages/fixed-asset/maintain/on-off-records/on-off-records.component.ts
new file mode 100644
index 0000000..96464d8
--- /dev/null
+++ b/web-admin-app/src/app/pages/fixed-asset/maintain/on-off-records/on-off-records.component.ts
@@ -0,0 +1,27 @@
+import { Component, inject, 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 { NZ_MODAL_DATA } from 'ng-zorro-antd/modal'
+
+@Component({
+ selector: 'app-on-off-records',
+ standalone: true,
+ imports: [SharedModule],
+ templateUrl: './on-off-records.component.html',
+ styleUrl: './on-off-records.component.less',
+})
+export class OnOffRecordsComponent implements OnInit {
+ constructor(private api: ApiService) {}
+
+ data = inject(NZ_MODAL_DATA)
+
+ records: NzSafeAny[] = []
+ ngOnInit(): void {
+ if (this.data) {
+ this.api.onOffRecord(this.data.assetId).subscribe((res) => {
+ this.records = res.body
+ })
+ }
+ }
+}
diff --git a/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.html b/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.html
index e24357a..7f7ef0d 100644
--- a/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.html
+++ b/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.html
@@ -244,6 +244,27 @@
+
+ 模版文件类型
+
+
+
+
+
+
+
+ @if (templateType === '2') {
+
+ 扩展资产表单
+
+
+ @for (item of flowForms; track $index) {
+
+ }
+
+
+
+ }
模版文件
diff --git a/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.ts b/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.ts
index bcde03d..9b17cb3 100644
--- a/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.ts
+++ b/web-admin-app/src/app/pages/fixed-asset/registration/registration.component.ts
@@ -48,6 +48,12 @@ export class RegistrationComponent {
copyNum = 1
+ templateType = '1'
+
+ extendFormId?: string
+
+ flowForms: NzSafeAny[] = []
+
ngOnInit(): void {
this.table
.setConfig({
@@ -75,6 +81,10 @@ export class RegistrationComponent {
{ title: '二维码', onClick: this.qrcode.bind(this) },
{ title: '删除', onClick: this.deleteItem.bind(this) },
])
+
+ this.api.getFlowFormList().subscribe((res) => {
+ this.flowForms = res.body
+ })
}
fetchData(p: {}, q: AnyObject) {
@@ -163,8 +173,12 @@ export class RegistrationComponent {
}
downloadTemplate() {
+ if (this.templateType === '2' && !this.extendFormId) {
+ this.msg.error('请选择表单')
+ return
+ }
this.msg.loading('模板下载中...')
- this.api.downloadAssetTemplate().subscribe((res) => {
+ this.api.downloadAssetTemplate(this.extendFormId).subscribe((res) => {
Utils.downLoadFile(res, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8')
this.msg.remove()
this.msg.success('模板下载成功')
diff --git a/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html b/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html
index c2380bf..3f47fd0 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html
+++ b/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.html
@@ -1,34 +1,12 @@
-
-
-
-
-
-
-
-
- @switch (key) {
- @case ('_assignee') {
- {{ data.userName }}
- }
- @case ('procVars') {
- {{ data?.title ?? data?.name ?? '-' }}
- }
- @case ('status') {
-
- {{ FLOW_STATUS.get(data) }}
-
- }
- @case ('urgency') {
-
- {{ row.procVars.urgency === 2 ? '紧急' : '普通' }}
-
- }
- @default {
- {{ data }}
- }
- }
-
-
+
diff --git a/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts b/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts
index 262d00c..133b08b 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts
+++ b/web-admin-app/src/app/pages/flow/flow-my-apply/flow-my-apply.component.ts
@@ -13,11 +13,12 @@ import { FormValidators } from 'app/utils'
import { AssetEmployeeApplyComponent } from 'app/components'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS, flowIntStatus } from 'app/constants'
+import { FlowListByTypeComponent } from 'app/components/flow-list-by-type/flow-list-by-type.component'
@Component({
selector: 'app-flow-my-apply',
standalone: true,
- imports: [SharedModule],
+ imports: [SharedModule, FlowListByTypeComponent],
templateUrl: './flow-my-apply.component.html',
styleUrl: './flow-my-apply.component.less',
})
@@ -35,67 +36,13 @@ export class FlowMyApplyComponent {
userId: new FormControl ([], [FormValidators.required('请选择')]),
})
- table = new TableOption(this.fetchData.bind(this))
+ assetTotal = 0
- queryForm = new FormGroup({
- name: new FormControl(''),
- })
-
- FLOW_STATUS = flowIntStatus
- ngOnInit(): void {
- this.table
- // .setConfig({
- // selectable: true,
- // rowKey: 'id',
- // })
- .setColumn([
- { key: 'procVars', title: '名称', visible: true },
- { key: 'status', title: '流程状态', visible: true },
- { key: 'urgency', title: '紧急程度', visible: true },
- { key: 'procDefName', title: '流程类型', visible: true },
- { key: 'assigneeName', title: '审批人', visible: true },
- { key: 'createTime', title: '提交时间', visible: true },
- // { key: 'createTime', title: '作废时间', visible: true },
- // { key: 'createTime', title: '完成时间', visible: true },
- ])
- .setRowOperate([
- { title: '查看', onClick: this.onDetail.bind(this) },
- { title: '作废', onClick: this.cancleFlow.bind(this) },
- ])
- }
+ deviceTotal = 0
- fetchData(p: {}, q: AnyObject) {
- return this.api.getMyApplyAssetFlow({ ...p, ...q })
+ onLoad(total: number, type: 'assetTotal' | 'deviceTotal') {
+ this[type] = total
}
- onDetail(model: NzSafeAny) {
- this.modal.create({
- nzTitle: '查看任务',
- nzContent: comsMap[model.category],
- nzWrapClassName: 'modal-lg',
- nzWidth: '80vw',
- nzFooter: null,
- nzData: {
- value: model,
- preview: true,
- },
- })
- }
-
- cancleFlow(d: NzSafeAny) {
- this.modal.confirm({
- nzTitle: '作废',
- nzContent: '是否要作废该申请？',
- nzOnOk: async () => {
- const res = await lastValueFrom(
- this.api.cancelFlow({
- instanceId: d.procInsId,
- taskId: d.taskId,
- }),
- )
- this.msg.success('作废成功')
- this.table.ref.reload()
- },
- })
- }
+ ngOnInit(): void {}
}
diff --git a/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html b/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html
index c2380bf..85aa338 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html
+++ b/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.html
@@ -1,34 +1,12 @@
-
-
-
-
-
-
-
-
- @switch (key) {
- @case ('_assignee') {
- {{ data.userName }}
- }
- @case ('procVars') {
- {{ data?.title ?? data?.name ?? '-' }}
- }
- @case ('status') {
-
- {{ FLOW_STATUS.get(data) }}
-
- }
- @case ('urgency') {
-
- {{ row.procVars.urgency === 2 ? '紧急' : '普通' }}
-
- }
- @default {
- {{ data }}
- }
- }
-
-
+
diff --git a/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts b/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts
index 6be7ba3..b4ec651 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts
+++ b/web-admin-app/src/app/pages/flow/flow-my-finished/flow-my-finished.component.ts
@@ -12,11 +12,12 @@ import { NzMessageService } from 'ng-zorro-antd/message'
import { FormValidators } from 'app/utils'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS, flowIntStatus } from 'app/constants'
+import { FlowListByTypeComponent } from 'app/components/flow-list-by-type/flow-list-by-type.component'
@Component({
selector: 'app-flow-my-finished',
standalone: true,
- imports: [SharedModule],
+ imports: [SharedModule, FlowListByTypeComponent],
templateUrl: './flow-my-finished.component.html',
styleUrl: './flow-my-finished.component.less',
})
@@ -34,6 +35,14 @@ export class FlowMyFinishedComponent {
userId: new FormControl ([], [FormValidators.required('请选择')]),
})
+ assetTotal = 0
+
+ deviceTotal = 0
+
+ onLoad(total: number, type: 'assetTotal' | 'deviceTotal') {
+ this[type] = total
+ }
+
table = new TableOption(this.fetchData.bind(this))
queryForm = new FormGroup({
@@ -43,23 +52,23 @@ export class FlowMyFinishedComponent {
FLOW_STATUS = flowIntStatus
ngOnInit(): void {
- this.table
- // .setConfig({
- // selectable: true,
- // rowKey: 'id',
- // })
- .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 },
- { key: 'createTime', title: '提交时间', visible: true },
- // { key: 'createTime', title: '作废时间', visible: true },
- // { key: 'createTime', title: '完成时间', visible: true },
- ])
- .setRowOperate([{ title: '查看', onClick: this.onDetail.bind(this) }])
+ // this.table
+ // // .setConfig({
+ // // selectable: true,
+ // // rowKey: 'id',
+ // // })
+ // .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 },
+ // { key: 'createTime', title: '提交时间', visible: true },
+ // // { key: 'createTime', title: '作废时间', visible: true },
+ // // { key: 'createTime', title: '完成时间', visible: true },
+ // ])
+ // .setRowOperate([{ title: '查看', onClick: this.onDetail.bind(this) }])
}
fetchData(p: {}, q: AnyObject) {
diff --git a/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html b/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html
index 69a4e8b..bb64685 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html
+++ b/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.html
@@ -1,4 +1,4 @@
-
+
+
+
+
+
diff --git a/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts b/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts
index a51af71..9ff6f76 100644
--- a/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts
+++ b/web-admin-app/src/app/pages/flow/flow-my-todo/flow-my-todo.component.ts
@@ -12,11 +12,12 @@ import { NzMessageService } from 'ng-zorro-antd/message'
import { FormValidators } from 'app/utils'
import { comsMap } from '../flow-main/flow-main.component'
import { FLOW_STATUS, flowIntStatus } from 'app/constants'
+import { FlowListByTypeComponent } from 'app/components/flow-list-by-type/flow-list-by-type.component'
@Component({
selector: 'app-flow-my-todo',
standalone: true,
- imports: [SharedModule],
+ imports: [SharedModule, FlowListByTypeComponent],
templateUrl: './flow-my-todo.component.html',
styleUrl: './flow-my-todo.component.less',
})
@@ -38,6 +39,14 @@ export class FlowMyTodoComponent {
comment = ''
+ assetTotal = 0
+
+ deviceTotal = 0
+
+ onLoad(total: number, type: 'assetTotal' | 'deviceTotal') {
+ this[type] = total
+ }
+
table = new TableOption(this.fetchData.bind(this))
queryForm = new FormGroup({
diff --git a/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.html b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.html
index c178d98..49c2fdf 100644
--- a/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.html
+++ b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.html
@@ -1 +1,135 @@
-flow-report works!
+
+
+
+
+ 任务类型
+
+
+
+
+
+
+
+
+
+
+
+
+ 类型
+
+
+
+
+
+
+
+
+
+
+
+
+ 自定义时段
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工作报表
+
+
+ 日期：{{ data.startDate | date: 'yyyy-MM-dd' }} ~ {{ data.endDate | date: 'yyyy-MM-dd' }}
+
+
+
+
+ {{ reportTypeText.get(reportType) }}工作概述
+
+
+
+
+
+
+ -
+
{{ data.taskCount ?? 0 }}
+ 累计处理任务数
+
+ -
+
{{ data.taskCount ?? 0 }}
+ 已完成任务数
+
+ -
+
{{ data.taskCount ?? 0 }}
+ 未完成任务数
+
+
+
+
+
+ @for (item of data.taskList; track $index) {
+
+ }
+
+
+
+
+
+
+ 操作 |
+ 操作 |
}
@if (options.columns.length > 3) {
@@ -142,26 +142,24 @@
@if (options.operate.length > 0) {
|
-
-
-
- @for (operate of options.operate; track operate.title) {
- @if (operate?.visible(data)) {
- -
- {{ operate.title }}
-
- }
+
+
+
+
+
+ @for (operate of options.operate; track operate.title) {
+ @if (operate?.visible(data)) {
+
+ {{ operate.title }}
+
}
-
-
+ }
+
|
}
@if (options.columns.length > 3) {
diff --git a/web-admin-app/src/app/utils/index.ts b/web-admin-app/src/app/utils/index.ts
index 156beb2..ce4acc7 100644
--- a/web-admin-app/src/app/utils/index.ts
+++ b/web-admin-app/src/app/utils/index.ts
@@ -98,6 +98,7 @@ export class Utils {
}
static downLoadFile(response: HttpResponse |