diff --git a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-storage/fixed-asset-storage.component.ts b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-storage/fixed-asset-storage.component.ts
index da908e1..9d8cfd3 100644
--- a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-storage/fixed-asset-storage.component.ts
+++ b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-storage/fixed-asset-storage.component.ts
@@ -61,7 +61,7 @@ export class FixedAssetStorageComponent {
{ key: 'count', title: '库存数量', visible: true },
{ key: 'safetyLimit', title: '安全数量', visible: true },
{ key: 'upperLimit', title: '库存上限', visible: true },
- { key: 'lowerLimit', title: '库存下线', visible: true },
+ { key: 'lowerLimit', title: '库存下限', visible: true },
{ key: 'warehouseName', title: '存放仓库', visible: true },
])
diff --git a/web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage/fixed-asset-manage.component.html b/web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage/fixed-asset-manage.component.html
index 1452fc9..f60da40 100644
--- a/web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage/fixed-asset-manage.component.html
+++ b/web-admin-app/src/app/pages/fixed-asset/manage/fixed-asset-manage/fixed-asset-manage.component.html
@@ -4,7 +4,7 @@
-
+
+
+
+
+ 审批意见
+
+
+
+
+
+
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 6ca06bd..acf4ab0 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
@@ -7,7 +7,7 @@ import { SharedModule } from 'app/shared/shared.module'
import { lastValueFrom, map, of } from 'rxjs'
import { NzSafeAny } from 'ng-zorro-antd/core/types'
-import { NzModalService } from 'ng-zorro-antd/modal'
+import { NzModalRef, 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'
@@ -29,11 +29,15 @@ export class FlowMyTodoComponent {
@ViewChild('createFormTpl') createFormTpl!: TemplateRef<{}>
+ @ViewChild('commentTpl') commentTpl!: TemplateRef<{}>
+
createForm = new FormGroup({
formId: new FormControl(''),
userId: new FormControl([], [FormValidators.required('请选择')]),
})
+ comment = ''
+
table = new TableOption(this.fetchData.bind(this))
queryForm = new FormGroup({
@@ -68,8 +72,9 @@ export class FlowMyTodoComponent {
return this.api.getMyTodoAssetFlow({ ...p, ...q })
}
+ detailRef?: NzModalRef
onDetail(model: NzSafeAny) {
- this.modal.create({
+ this.detailRef = this.modal.create({
nzTitle: '查看任务',
nzContent: comsMap[model.procDefKey],
nzWrapClassName: 'modal-lg',
@@ -81,12 +86,15 @@ export class FlowMyTodoComponent {
nzFooter: [
{
label: '通过',
+ type: 'primary',
onClick: async () => {
this.completeFlow(model)
},
},
{
label: '驳回',
+ danger: true,
+ type: 'primary',
onClick: async () => {
return this.rejectProcessFlow(model)
},
@@ -96,34 +104,45 @@ export class FlowMyTodoComponent {
}
completeFlow(d: NzSafeAny) {
- this.modal.confirm({
+ this.modal.create({
nzTitle: '审核通过',
- nzContent: '是否要审核通过该申请?',
+ // nzContent: '是否要审核通过该申请?',
+ nzContent: this.commentTpl,
nzOnOk: async () => {
await lastValueFrom(
this.api.completeProcessFlow({
instanceId: d.procInsId,
taskId: d.taskId,
+ comment: this.comment,
}),
)
this.msg.success('通过成功')
this.table.ref.reload()
+ this.detailRef?.close()
},
})
}
rejectProcessFlow(d: NzSafeAny) {
- this.modal.confirm({
- nzTitle: '作废',
- nzContent: '是否要驳回该申请?',
+ this.modal.create({
+ nzTitle: '驳回',
+ nzContent: this.commentTpl,
nzOnOk: async () => {
+ if (!this.comment) {
+ this.msg.error('请输入驳回意见')
+ return false
+ }
await lastValueFrom(
this.api.rejectProcessFlow({
instanceId: d.procInsId,
taskId: d.taskId,
+ comment: this.comment,
}),
)
+
this.msg.success('驳回成功')
this.table.ref.reload()
+ this.detailRef?.close()
+ return true
},
})
}