diff --git a/klp-ui/src/views/crm/coil/index.vue b/klp-ui/src/views/crm/coil/index.vue new file mode 100644 index 00000000..0f9bd997 --- /dev/null +++ b/klp-ui/src/views/crm/coil/index.vue @@ -0,0 +1,686 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/components/ExceptionManager.vue b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue index fb935c46..3a611be7 100644 --- a/klp-ui/src/views/wms/coil/components/ExceptionManager.vue +++ b/klp-ui/src/views/wms/coil/components/ExceptionManager.vue @@ -55,28 +55,37 @@

异常记录

- - 刷新 - +
+ 保存 + + 刷新 + +
- - + + + + + + - + - + - + - - + + - + + + - + @@ -251,11 +276,13 @@ import { listEmployeeChange, getEmployeeChange, delEmployeeChange, updateEmployeeChange, addEmployeeChange, employeeEntry } from "@/api/wms/employeeChange"; import { listDept } from "@/api/wms/dept"; import EmployeeSelector from "@/components/EmployeeSelector"; +import FileList from "@/components/FileList"; export default { name: "EmployeeEntry", components: { - EmployeeSelector + EmployeeSelector, + FileList }, data() { return { @@ -317,7 +344,19 @@ export default { }, supplementRules: { }, - supplementAttachment: undefined + supplementAttachment: undefined, + // 查看记录对话框相关 + viewOpen: false, + viewRecord: { + changeId: undefined, + infoId: undefined, + changeType: undefined, + changeTime: undefined, + changeReason: undefined, + changeHandler: undefined, + attachment: undefined, + remark: undefined + } }; }, dicts: ['hrm_employee_education'], @@ -522,6 +561,11 @@ export default { this.download('system/employeeChange/export', { ...this.queryParams }, `employeeChange_${new Date().getTime()}.xlsx`) + }, + /** 查看按钮操作 */ + handleView(row) { + this.viewRecord = row; + this.viewOpen = true; } } }; diff --git a/klp-ui/src/views/wms/hrm/employeeInfo/formal.vue b/klp-ui/src/views/wms/hrm/employeeInfo/formal.vue index 498ba5e1..53847e71 100644 --- a/klp-ui/src/views/wms/hrm/employeeInfo/formal.vue +++ b/klp-ui/src/views/wms/hrm/employeeInfo/formal.vue @@ -296,7 +296,7 @@ {{ regularRecord.changeHandler }} - + {{ regularRecord.remark }} @@ -310,9 +310,13 @@ import { listEmployeeInfo, getEmployeeInfo, delEmployeeInfo, updateEmployeeInfo } from "@/api/wms/employeeInfo"; import { listDept } from "@/api/wms/dept"; import { employeeEntry, employeeRegular, listEmployeeChange } from '@/api/wms/employeeChange' +import FileList from "@/components/FileList"; export default { name: "EmployeeInfo", + components: { + FileList + }, data() { return { // 按钮loading diff --git a/klp-ui/src/views/wms/hrm/employeeInfo/leave.vue b/klp-ui/src/views/wms/hrm/employeeInfo/leave.vue index eecaf729..edcfd5cb 100644 --- a/klp-ui/src/views/wms/hrm/employeeInfo/leave.vue +++ b/klp-ui/src/views/wms/hrm/employeeInfo/leave.vue @@ -64,6 +64,7 @@ @@ -102,6 +103,30 @@ 取 消
+ + + + + + {{ viewRecord.wmsEmployeeInfo && viewRecord.wmsEmployeeInfo.name }} + + + {{ parseTime(viewRecord.changeTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + {{ viewRecord.changeReason }} + + + {{ viewRecord.changeHandler }} + + + + + + {{ viewRecord.remark }} + + + @@ -109,11 +134,13 @@ import { listEmployeeChange, getEmployeeChange, delEmployeeChange, updateEmployeeChange, addEmployeeChange, employeeEntry, employeeLeave } from "@/api/wms/employeeChange"; import { listDept } from "@/api/wms/dept"; import EmployeeSelector from "@/components/EmployeeSelector"; +import FileList from "@/components/FileList"; export default { name: "EmployeeLeave", components: { - EmployeeSelector + EmployeeSelector, + FileList }, data() { return { @@ -175,7 +202,19 @@ export default { }, supplementRules: { }, - supplementAttachment: undefined + supplementAttachment: undefined, + // 查看记录对话框相关 + viewOpen: false, + viewRecord: { + changeId: undefined, + infoId: undefined, + changeType: undefined, + changeTime: undefined, + changeReason: undefined, + changeHandler: undefined, + attachment: undefined, + remark: undefined + } }; }, dicts: ['hrm_employee_education'], @@ -359,6 +398,11 @@ export default { this.download('system/employeeChange/export', { ...this.queryParams }, `employeeChange_${new Date().getTime()}.xlsx`) + }, + /** 查看按钮操作 */ + handleView(row) { + this.viewRecord = row; + this.viewOpen = true; } } }; diff --git a/klp-ui/src/views/wms/hrm/employeeInfo/transfer.vue b/klp-ui/src/views/wms/hrm/employeeInfo/transfer.vue index 632f4122..96e1f4e6 100644 --- a/klp-ui/src/views/wms/hrm/employeeInfo/transfer.vue +++ b/klp-ui/src/views/wms/hrm/employeeInfo/transfer.vue @@ -66,6 +66,7 @@ @@ -112,6 +113,42 @@ 取 消 + + + + + + {{ viewRecord.wmsEmployeeInfo && viewRecord.wmsEmployeeInfo.name }} + + + {{ viewRecord.oldDept }} + + + {{ viewRecord.oldJobType }} + + + {{ viewRecord.newDept }} + + + {{ viewRecord.newJobType }} + + + {{ parseTime(viewRecord.transferTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + {{ viewRecord.transferReason }} + + + {{ viewRecord.transferHandler }} + + + + + + {{ viewRecord.remark }} + + + @@ -119,11 +156,13 @@ import { listEmployeeTransfer, getEmployeeTransfer, delEmployeeTransfer, updateEmployeeTransfer, transferEmployee } from "@/api/wms/employeeTransfer"; import EmployeeSelector from "@/components/EmployeeSelector"; import { listDept } from "@/api/wms/dept"; +import FileList from "@/components/FileList"; export default { name: "EmployeeTransfer", components: { EmployeeSelector, + FileList }, data() { return { @@ -194,6 +233,21 @@ export default { transferHandler: [ { required: true, message: "转岗经办人不能为空", trigger: "blur" } ], + }, + // 查看记录对话框相关 + viewOpen: false, + viewRecord: { + transferId: undefined, + infoId: undefined, + oldDept: undefined, + oldJobType: undefined, + newDept: undefined, + newJobType: undefined, + transferTime: undefined, + transferReason: undefined, + transferHandler: undefined, + attachment: undefined, + remark: undefined } }; }, @@ -335,6 +389,11 @@ export default { this.download('wms/employeeTransfer/export', { ...this.queryParams }, `employeeTransfer_${new Date().getTime()}.xlsx`) + }, + /** 查看按钮操作 */ + handleView(row) { + this.viewRecord = row; + this.viewOpen = true; } } };