-
- @switch (date.getDate()) {
- @case (8) {
- @for (item of listDataMap.eight; track $index) {
-
-
-
-
+
-
+ @switch (date.getDate()) {
+ @case (8) {
+ @for (item of listDataMap.eight; track $index) {
+
-
+
+
+ }
}
- }
- @case (10) {
- @for (item of listDataMap.ten; track $index) {
- -
-
-
+ @case (10) {
+ @for (item of listDataMap.ten; track $index) {
+ -
+
+
+ }
}
- }
- @case (11) {
- @for (item of listDataMap.eleven; track $index) {
- -
-
-
+ @case (11) {
+ @for (item of listDataMap.eleven; track $index) {
+ -
+
+
+ }
}
}
- }
-
- {{ monthData }}
- Backlog number
-
- }
-
+ {{ monthData }}
+ Backlog number
+
+ }
+
@@ -20,8 +33,10 @@
{{ ASSET_STATUS_MAP[data] }}
}
- @case ('_useUser') {
- {{ data?.userName ?? '-' }}
+ @case ('type') {
+
+ {{ businessType.get(data) }}
+
}
@case ('_warehouse') {
{{ data?.name ?? '-' }}
@@ -54,7 +69,7 @@
nzPlacement="bottomRight"
class="!w-24"
[nzDropdownMatchSelectWidth]="false"
- formControlName="model"
+ formControlName="type"
nzAllowClear
>
-
+
diff --git a/web-admin-app/src/app/pages/fixed-asset/asset-management/asset-management.component.ts b/web-admin-app/src/app/pages/fixed-asset/asset-management/asset-management.component.ts
index d6b0302..01bd67c 100644
--- a/web-admin-app/src/app/pages/fixed-asset/asset-management/asset-management.component.ts
+++ b/web-admin-app/src/app/pages/fixed-asset/asset-management/asset-management.component.ts
@@ -6,11 +6,23 @@ import { ApiService } from 'app/services'
import { SharedModule } from 'app/shared/shared.module'
import { format } from 'date-fns'
import { lastValueFrom, of } from 'rxjs'
-import { AssetFormComponent, ManufacturerSelectComponent, PositionSelectComponent } from 'app/components'
+import {
+ AssetBusinessAllotFormComponent,
+ AssetBusinessBorrowFormComponent,
+ AssetBusinessCollectionComponent,
+ AssetBusinessRetirementComponent,
+ AssetBusinessReturnFormComponent,
+ AssetBusinessRevertFormComponent,
+ AssetBusinessStorageFormComponent,
+ AssetBusinessTransferFormComponent,
+ AssetFormComponent,
+ ManufacturerSelectComponent,
+ PositionSelectComponent,
+} from 'app/components'
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'
import { NzMessageService } from 'ng-zorro-antd/message'
import { NzSafeAny } from 'ng-zorro-antd/core/types'
-import { ASSET_SOURCE_MAP, ASSET_STATUS, ASSET_STATUS_MAP, ASSET_TYPE } from 'app/constants'
+import { ASSET_SOURCE_MAP, ASSET_STATUS, ASSET_STATUS_MAP, ASSET_TYPE, businessType } from 'app/constants'
import { Utils } from 'app/utils'
@Component({
@@ -29,7 +41,7 @@ export class AssetManagementComponent {
queryForm = new FormGroup({
name: new FormControl(),
- model: new FormControl(),
+ type: new FormControl(),
status: new FormControl(),
assetCode: new FormControl(),
serialNumber: new FormControl(),
@@ -48,6 +60,8 @@ export class AssetManagementComponent {
ASSET_TYPE = ASSET_TYPE
+ businessType = businessType
+
ngOnInit(): void {
this.table
.setConfig({
@@ -55,44 +69,88 @@ export class AssetManagementComponent {
rowKey: 'assetId',
})
.setColumn([
- { key: 'assetCode', title: '业务编号', visible: true },
+ { key: 'businessId', title: '业务编号', visible: true },
{ key: 'name', title: '流程名称', visible: true },
- { key: '_category', title: '流程类型', visible: true },
+ { key: 'type', title: '流程类型', visible: true },
{ key: 'status', title: '流程状态', visible: true },
{ key: '_ownCompany', title: '紧急程度', visible: true },
{ key: '_useOrganization', title: '发起人', visible: true },
- { key: '_position', title: '创建时间', visible: true },
+ { key: 'createTime', title: '创建时间', visible: true },
{ key: '_position', title: '当前节点', visible: true },
{ key: '_position', title: '备注', visible: true },
])
- .setRowOperate([
- {
- title: '查看',
- onClick: (v) => {
- this.onCreate(v, true)
- },
- },
- { title: '修改', onClick: this.onCreate.bind(this) },
- { title: '复制', onClick: this.onCopy.bind(this) },
- { title: '二维码', onClick: this.qrcode.bind(this) },
- { title: '删除', onClick: this.deleteItem.bind(this) },
- ])
+ // .setRowOperate([
+ // { title: '二维码', onClick: this.qrcode.bind(this) },
+ // { title: '删除', onClick: this.deleteItem.bind(this) },
+ // ])
}
fetchData(p: {}, q: AnyObject) {
return this.api.getAssetManagerPage({ ...p, ...q })
}
- onCopy(data: NzSafeAny) {}
+ onEntry(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产入库' : '添加资产入库'
+ if (preview) {
+ nzTitle = '预览资产入库'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessStorageFormComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessStorage(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+ return false
+ },
+ })
+ }
+ onDistribution(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产领用' : '添加资产领用'
+ if (preview) {
+ nzTitle = '预览资产领用'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessCollectionComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessCollection(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
- onCreate(data?: NzSafeAny, preview?: boolean) {
- let nzTitle = data ? '编辑资产' : '添加资产'
+ return false
+ },
+ })
+ }
+
+ onReturn(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产退库' : '添加资产退库'
if (preview) {
- nzTitle = '预览资产'
+ nzTitle = '预览资产退库'
}
this.modal.create({
nzTitle,
- nzContent: AssetFormComponent,
+ nzContent: AssetBusinessReturnFormComponent,
nzWidth: '80vw',
nzWrapClassName: 'modal-lg',
nzData: {
@@ -102,7 +160,7 @@ export class AssetManagementComponent {
nzOnOk: async (e) => {
const vals = e.getValues()
if (vals) {
- const res = await lastValueFrom(this.api.saveAsset(vals))
+ const res = await lastValueFrom(this.api.saveBusinessReturnInventory(vals))
this.msg.success(res.desc)
this.table.ref.reload()
return true
@@ -112,7 +170,144 @@ export class AssetManagementComponent {
},
})
}
+ onBorrow(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产借用' : '添加资产借用'
+ if (preview) {
+ nzTitle = '预览资产借用'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessBorrowFormComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessBorrow(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+
+ return false
+ },
+ })
+ }
+ onAllot(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产调拨' : '添加资产调拨'
+ if (preview) {
+ nzTitle = '预览资产调拨'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessAllotFormComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessAllocate(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+
+ return false
+ },
+ })
+ }
+
+ onTransfer(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产转移' : '添加资产转移'
+ if (preview) {
+ nzTitle = '预览资产转移'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessTransferFormComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessTransfer(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+
+ return false
+ },
+ })
+ }
+
+ onScrap(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产报废' : '添加资产报废'
+ if (preview) {
+ nzTitle = '预览资产报废'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessRetirementComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessRetirement(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+ return false
+ },
+ })
+ }
+
+ onRevert(data?: NzSafeAny, preview?: boolean) {
+ let nzTitle = data ? '编辑资产归还' : '添加资产归还'
+ if (preview) {
+ nzTitle = '预览资产归还'
+ }
+ this.modal.create({
+ nzTitle,
+ nzContent: AssetBusinessRevertFormComponent,
+ nzWidth: '80vw',
+ nzWrapClassName: 'modal-lg',
+ nzData: {
+ value: data,
+ preview,
+ },
+ nzOnOk: async (e) => {
+ const vals = e.getValues()
+ if (vals) {
+ const res = await lastValueFrom(this.api.saveBusinessRevert(vals))
+ this.msg.success(res.desc)
+ this.table.ref.reload()
+ return true
+ }
+
+ return false
+ },
+ })
+ }
deleteItem(item?: NzSafeAny) {
const ids = item ? [item.assetId] : Array.from(this.table.ref.selected)
this.modal.confirm({
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 6edf87b..2be54b3 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
@@ -343,15 +343,7 @@
>
维修类型
-
- 维修类型
-
+
maintenance-calendar works!
+
+
+ 流程管理
+
+
+ 工作报表
+
diff --git a/web-admin-app/src/app/pages/flow/flow-main/flow-main.component.ts b/web-admin-app/src/app/pages/flow/flow-main/flow-main.component.ts
index baf85cb..359f3be 100644
--- a/web-admin-app/src/app/pages/flow/flow-main/flow-main.component.ts
+++ b/web-admin-app/src/app/pages/flow/flow-main/flow-main.component.ts
@@ -110,7 +110,10 @@ export class FlowMainComponent implements OnInit {
console.log('vals', vals)
if (vals) {
if (type === 'repair') {
- const res = await lastValueFrom(this.api.createRapairTask(vals))
+ const res = await lastValueFrom(this.api.createRapairTask({ ...vals }))
+ this.msg.success(res.desc)
+ } else {
+ const res = await lastValueFrom(this.api.createTask({ ...vals, jobType: type }))
this.msg.success(res.desc)
}
diff --git a/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.html b/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.html
new file mode 100644
index 0000000..a98afbc
--- /dev/null
+++ b/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.html
@@ -0,0 +1 @@
+maintenance-plan works!
+maintenance-task works!
+stocktaking-calendar works!
+stocktaking-plan works!
+stocktaking-task works!
+flow-management works!
diff --git a/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.less b/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.less new file mode 100644 index 0000000..e69de29 diff --git a/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.ts b/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.ts new file mode 100644 index 0000000..495f135 --- /dev/null +++ b/web-admin-app/src/app/pages/flow/flow-management/flow-management.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-flow-management', + standalone: true, + imports: [], + templateUrl: './flow-management.component.html', + styleUrl: './flow-management.component.less' +}) +export class FlowManagementComponent { + +} 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 new file mode 100644 index 0000000..c178d98 --- /dev/null +++ b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.html @@ -0,0 +1 @@ +flow-report works!
diff --git a/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.less b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.less new file mode 100644 index 0000000..e69de29 diff --git a/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.ts b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.ts new file mode 100644 index 0000000..3ab3eec --- /dev/null +++ b/web-admin-app/src/app/pages/flow/flow-report/flow-report.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-flow-report', + standalone: true, + imports: [], + templateUrl: './flow-report.component.html', + styleUrl: './flow-report.component.less' +}) +export class FlowReportComponent { + +} diff --git a/web-admin-app/src/app/pages/msg/flow-msg/flow-msg.component.html b/web-admin-app/src/app/pages/msg/flow-msg/flow-msg.component.html new file mode 100644 index 0000000..191a0f7 --- /dev/null +++ b/web-admin-app/src/app/pages/msg/flow-msg/flow-msg.component.html @@ -0,0 +1,44 @@ +
+
+
+ @switch (key) {
+ @case ('_useUser') {
+ {{ data?.userName ?? '-' }}
+ }
+ @case ('_warehouse') {
+ {{ data?.name ?? '-' }}
+ }
+ @case ('_position') {
+ {{ data?.name ?? '-' }}
+ }
+ @case ('_head') {
+ {{ data?.userName ?? '-' }}
+ }
+ @case ('_ownCompany') {
+ {{ data?.organizationName ?? '-' }}
+ }
+ @case ('_useOrganization') {
+ {{ data?.organizationName ?? '-' }}
+ }
+ @case ('_category') {
+ {{ data?.categoryName ?? '-' }}
+ }
+ @default {
+ {{ data }}
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web-admin-app/src/app/pages/msg/msg-layout/msg-layout.component.less b/web-admin-app/src/app/pages/msg/msg-layout/msg-layout.component.less
new file mode 100644
index 0000000..e69de29
diff --git a/web-admin-app/src/app/pages/msg/msg-layout/msg-layout.component.ts b/web-admin-app/src/app/pages/msg/msg-layout/msg-layout.component.ts
new file mode 100644
index 0000000..884cbd1
--- /dev/null
+++ b/web-admin-app/src/app/pages/msg/msg-layout/msg-layout.component.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core'
+import { Router } from '@angular/router'
+import { SharedModule } from 'app/shared/shared.module'
+
+@Component({
+ selector: 'app-flow-layout',
+ standalone: true,
+ imports: [SharedModule],
+ templateUrl: './msg-layout.component.html',
+ styleUrl: './msg-layout.component.less',
+})
+export class MsgLayoutComponent {
+ constructor(private router: Router) {
+ this.openedSubmenu = this.router.url
+ }
+
+ openedSubmenu = ''
+
+ ngOnInit(): void {}
+
+ onMenuOpenChange(open: boolean) {
+ this.openedSubmenu = open ? this.router.url : ''
+ }
+}
diff --git a/web-admin-app/src/app/pages/msg/system-log/system-log.component.html b/web-admin-app/src/app/pages/msg/system-log/system-log.component.html
new file mode 100644
index 0000000..191a0f7
--- /dev/null
+++ b/web-admin-app/src/app/pages/msg/system-log/system-log.component.html
@@ -0,0 +1,44 @@
+
+
+
+ @switch (key) {
+ @case ('_useUser') {
+ {{ data?.userName ?? '-' }}
+ }
+ @case ('_warehouse') {
+ {{ data?.name ?? '-' }}
+ }
+ @case ('_position') {
+ {{ data?.name ?? '-' }}
+ }
+ @case ('_head') {
+ {{ data?.userName ?? '-' }}
+ }
+ @case ('_ownCompany') {
+ {{ data?.organizationName ?? '-' }}
+ }
+ @case ('_useOrganization') {
+ {{ data?.organizationName ?? '-' }}
+ }
+ @case ('_category') {
+ {{ data?.categoryName ?? '-' }}
+ }
+ @default {
+ {{ data }}
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-} @else {
-
+ } @else {
+
+ }
}
@if (preview) {
{{ placeholder }}
+@if (!disabled) {
+ @if (drag) {
+
+
+
-
+
+
{{ placeholder }}
+ -
- - ++ + + ++ +} @else { + @if (disabled) { ++ } } diff --git a/web-admin-app/src/app/shared/components/upload/upload.component.ts b/web-admin-app/src/app/shared/components/upload/upload.component.ts index 7a07711..5296d62 100644 --- a/web-admin-app/src/app/shared/components/upload/upload.component.ts +++ b/web-admin-app/src/app/shared/components/upload/upload.component.ts @@ -4,6 +4,7 @@ import { ApiService } from 'app/services' import { JwResponse } from 'app/types' import { NzButtonModule } from 'ng-zorro-antd/button' import { NzCardModule } from 'ng-zorro-antd/card' +import { NzEmptyModule } from 'ng-zorro-antd/empty' import { NzIconModule } from 'ng-zorro-antd/icon' import { NzMessageService } from 'ng-zorro-antd/message' import { Observable } from 'rxjs' @@ -11,7 +12,7 @@ import { Observable } from 'rxjs' @Component({ selector: 'app-upload', standalone: true, - imports: [NzIconModule, NzButtonModule, NzCardModule], + imports: [NzIconModule, NzButtonModule, NzCardModule, NzEmptyModule], templateUrl: './upload.component.html', styleUrl: './upload.component.less', providers: [ @@ -31,7 +32,9 @@ export class UploadComponent implements ControlValueAccessor { @Input() placeholder = '选择文件' - @Input() uploadFn: (data: FormData) => Observable = this.api.upload + @Input() uploadFn: (data: FormData) => Observable = (d) => { + return this.api.upload(d) + } @Output() onUpload = new EventEmitter() @@ -39,6 +42,8 @@ export class UploadComponent implements ControlValueAccessor { ngOnInit(): void {} + disabled = false + preview: { name: string url: string @@ -72,9 +77,11 @@ export class UploadComponent implements ControlValueAccessor { // this.createForm.get('avatar')?.setValue(res.body.fileName) this.onChange(res.body.fileName ?? file.name) this.onUpload.emit(res.body) - this.preview = { - name: res.body.fileName ?? file.name, - url: res.body.url, + if (!this.isImage(file.name)) { + this.preview = { + name: res.body.fileName ?? file.name, + url: res.body.url, + } } }) } @@ -113,9 +120,14 @@ export class UploadComponent implements ControlValueAccessor { } } + remove() { + this.preview = null + this.onChange(null) + this.onUpload.emit(null) + } onTouched = () => {} - onChange(v: string) { + onChange(v: string | null) { console.log('upload', v) } registerOnChange(fn: any): void { @@ -126,5 +138,7 @@ export class UploadComponent implements ControlValueAccessor { this.onTouched = fn } - setDisabledState?(isDisabled: boolean): void {} + setDisabledState?(isDisabled: boolean): void { + this.disabled = isDisabled + } }