diff --git a/src/api/oa/leave-bill.ts b/src/api/oa/leave-bill.ts new file mode 100644 index 00000000..de553bf0 --- /dev/null +++ b/src/api/oa/leave-bill.ts @@ -0,0 +1,46 @@ +import request from '/@/utils/request'; + +export function fetchList(query) { + return request({ + url: '/admin/leave-bill/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/admin/leave-bill', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/admin/leave-bill/' + id, + method: 'get' + }) +} + +export function submit(id) { + return request({ + url: '/admin/leave-bill/submit/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/admin/leave-bill/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/admin/leave-bill/', + method: 'put', + data: obj + }) +} diff --git a/src/api/oa/model.ts b/src/api/oa/model.ts new file mode 100644 index 00000000..4de5bd3e --- /dev/null +++ b/src/api/oa/model.ts @@ -0,0 +1,46 @@ +import request from '/@/utils/request'; + +export function fetchList(query) { + return request({ + url: '/admin/model', + method: 'get', + params: query + }) +} + +export function delObj(id) { + return request({ + url: '/admin/model/' + id, + method: 'delete' + }) +} + +export function deploy(id) { + return request({ + url: '/admin/model/deploy/' + id, + method: 'post' + }) +} + +export function addObj(obj) { + return request({ + url: '/admin/model/insert', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/admin/log/' + id, + method: 'get' + }) +} + +export function putObj(obj) { + return request({ + url: '/admin/log/', + method: 'put', + data: obj + }) +} diff --git a/src/api/oa/process.ts b/src/api/oa/process.ts new file mode 100644 index 00000000..3369e76c --- /dev/null +++ b/src/api/oa/process.ts @@ -0,0 +1,23 @@ +import request from '/@/utils/request'; + +export function fetchList(query) { + return request({ + url: '/admin/process', + method: 'get', + params: query + }) +} + +export function delObj(id) { + return request({ + url: '/admin/process/' + id, + method: 'delete' + }) +} + +export function status(id, type) { + return request({ + url: '/admin/process/status/' + id + '/' + type, + method: 'put' + }) +} diff --git a/src/api/oa/task.ts b/src/api/oa/task.ts new file mode 100644 index 00000000..689cdf19 --- /dev/null +++ b/src/api/oa/task.ts @@ -0,0 +1,31 @@ +import request from '/@/utils/request'; + +export function fetchList(query) { + return request({ + url: '/admin/task/todo', + method: 'get', + params: query + }) +} + +export function fetchDetail(id) { + return request({ + url: '/admin/task/' + id, + method: 'get' + }) +} + +export function fetchComment(id) { + return request({ + url: '/admin/task/comment/' + id, + method: 'get' + }) +} + +export function doTask(obj) { + return request({ + url: '/admin/task', + method: 'post', + data: obj + }) +} diff --git a/src/i18n/pages/form/en.ts b/src/i18n/pages/form/en.ts index 6a367d0d..193d784e 100644 --- a/src/i18n/pages/form/en.ts +++ b/src/i18n/pages/form/en.ts @@ -13,6 +13,7 @@ export default { resetBtn: 'reset', action:'action', optSuccessText: 'operation success', + optConfirmText: 'Confirm this operation ', editSuccessText: 'edit success', addSuccessText: 'add success', delSuccessText: 'delete success', diff --git a/src/i18n/pages/form/zh-cn.ts b/src/i18n/pages/form/zh-cn.ts index 4b74b3dd..ca3ff167 100644 --- a/src/i18n/pages/form/zh-cn.ts +++ b/src/i18n/pages/form/zh-cn.ts @@ -16,6 +16,7 @@ export default { addSuccessText: '添加成功', delSuccessText: '删除成功', delConfirmText: '此操作将永久删除', + optConfirmText: '是否确认本操作', confirmButtonText: '确认', cancelButtonText: '取消', download: '下载' diff --git a/src/utils/storage.ts b/src/utils/storage.ts index a5760d9c..d7286c68 100644 --- a/src/utils/storage.ts +++ b/src/utils/storage.ts @@ -37,7 +37,9 @@ export const Local = { export const Session = { // 设置临时缓存 set(key: string, val: any) { - if (key === 'token' || key === 'refresh_token') return Cookies.set(key, val); + if (key === 'token' || key === 'refresh_token') { + Cookies.set(key, val) + } window.sessionStorage.setItem(key, JSON.stringify(val)); }, // 获取临时缓存 diff --git a/src/views/oa/leave_bill/form.vue b/src/views/oa/leave_bill/form.vue new file mode 100644 index 00000000..ffed072a --- /dev/null +++ b/src/views/oa/leave_bill/form.vue @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('common.cancelButtonText') }} + {{ $t('common.confirmButtonText') }} + + + + + + \ No newline at end of file diff --git a/src/views/oa/leave_bill/i18n/en.ts b/src/views/oa/leave_bill/i18n/en.ts new file mode 100644 index 00000000..869c73f3 --- /dev/null +++ b/src/views/oa/leave_bill/i18n/en.ts @@ -0,0 +1,26 @@ +export default { + leave: { + index: 'index', + importoaLeaveBillTip: 'import OaLeaveBill', + leaveId: 'leaveId', + username: 'username', + days: 'days', + content: 'content', + state: 'state', + leaveTime: 'leaveTime', + createTime: 'createTime', + updateTime: 'updateTime', + delFlag: 'delFlag', + tenantId: 'tenantId', + inputLeaveIdTip: 'input leaveId', + inputUsernameTip: 'input username', + inputDaysTip: 'input days', + inputContentTip: 'input content', + inputStateTip: 'input state', + inputLeaveTimeTip: 'input leaveTime', + inputCreateTimeTip: 'input createTime', + inputUpdateTimeTip: 'input updateTime', + inputDelFlagTip: 'input delFlag', + inputTenantIdTip: 'input tenantId', + } +} \ No newline at end of file diff --git a/src/views/oa/leave_bill/i18n/zh-cn.ts b/src/views/oa/leave_bill/i18n/zh-cn.ts new file mode 100644 index 00000000..0e4254f6 --- /dev/null +++ b/src/views/oa/leave_bill/i18n/zh-cn.ts @@ -0,0 +1,26 @@ +export default { + leave: { + index: '序号', + importoaLeaveBillTip: '导入请假表', + leaveId: '主键', + username: '用户名', + days: '请假天数', + content: '备注', + state: '状态', + leaveTime: '请假时间', + createTime: '创建时间', + updateTime: '更新时间', + delFlag: '删除标识', + tenantId: '所属租户', + inputLeaveIdTip: '请输入主键', + inputUsernameTip: '请输入用户名', + inputDaysTip: '请输入请假天数', + inputContentTip: '请输入备注', + inputStateTip: '请输入状态', + inputLeaveTimeTip: '请输入请假时间', + inputCreateTimeTip: '请输入创建时间', + inputUpdateTimeTip: '请输入更新时间', + inputDelFlagTip: '请输入删除标识', + inputTenantIdTip: '请输入所属租户', + } +} \ No newline at end of file diff --git a/src/views/oa/leave_bill/index.vue b/src/views/oa/leave_bill/index.vue new file mode 100644 index 00000000..5c727dfb --- /dev/null +++ b/src/views/oa/leave_bill/index.vue @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + {{ $t('common.queryBtn') }} + + {{ $t('common.resetBtn') }} + + + + + + + {{ $t('common.addBtn') }} + + + {{ $t('common.exportBtn') }} + + + {{ $t('common.delBtn') }} + + + + + + + + + + + + + + + + + + + 提交 + {{ $t('common.editBtn') + }} + {{ + $t('common.delBtn') + }} + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/oa/model/detail.vue b/src/views/oa/model/detail.vue new file mode 100644 index 00000000..4217add0 --- /dev/null +++ b/src/views/oa/model/detail.vue @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/src/views/oa/model/form.vue b/src/views/oa/model/form.vue new file mode 100644 index 00000000..c520ab57 --- /dev/null +++ b/src/views/oa/model/form.vue @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('common.cancelButtonText') }} + {{ $t('common.confirmButtonText') }} + + + + + + diff --git a/src/views/oa/model/i18n/en.ts b/src/views/oa/model/i18n/en.ts new file mode 100644 index 00000000..17698575 --- /dev/null +++ b/src/views/oa/model/i18n/en.ts @@ -0,0 +1,16 @@ +export default { + model: { + index: 'index', + id: 'id', + name: 'name', + key: 'key', + category: 'category', + version: 'version', + createTime: 'createTime', + lastUpdateTime: 'lastUpdateTime', + inputNameTip: 'input model name', + inputModelTip: 'input model name', + inputCategoryTip: 'input category tip', + inputKeyTip: 'input key', + } +} diff --git a/src/views/oa/model/i18n/zh-cn.ts b/src/views/oa/model/i18n/zh-cn.ts new file mode 100644 index 00000000..a6440b01 --- /dev/null +++ b/src/views/oa/model/i18n/zh-cn.ts @@ -0,0 +1,16 @@ +export default { + model: { + index: '序号', + id: '模型ID', + name: '模型名称', + key: '模型标识', + category: '模型分类', + version: '版本', + createTime: '创建时间', + lastUpdateTime: '更新时间', + inputNameTip: '请输入模型名称', + inputModelTip: '请输入模型名称', + inputCategoryTip: '请输入模型分类', + inputKeyTip: '请输入模型标识', + } +} diff --git a/src/views/oa/model/index.vue b/src/views/oa/model/index.vue new file mode 100644 index 00000000..562928aa --- /dev/null +++ b/src/views/oa/model/index.vue @@ -0,0 +1,142 @@ + + + + + + + + + + + {{ $t('common.queryBtn') }} + + {{ $t('common.resetBtn') }} + + + + + + + {{ $t('common.addBtn') }} + + + {{ $t('common.delBtn') }} + + + + + + + + + + + + + + + + 模型图 + + 部署 + + {{ + $t('common.delBtn') + }} + + + + + + + + + + + + diff --git a/src/views/oa/process/i18n/en.ts b/src/views/oa/process/i18n/en.ts new file mode 100644 index 00000000..d0fce9b3 --- /dev/null +++ b/src/views/oa/process/i18n/en.ts @@ -0,0 +1,17 @@ +export default { + process: { + index: 'index', + id: 'id', + name: 'name', + key: 'key', + category: 'category', + version: 'version', + status: 'status', + createTime: 'createTime', + lastUpdateTime: 'lastUpdateTime', + inputNameTip: 'input model name', + inputModelTip: 'input model name', + inputCategoryTip: 'input category tip', + inputKeyTip: 'input key', + } +} diff --git a/src/views/oa/process/i18n/zh-cn.ts b/src/views/oa/process/i18n/zh-cn.ts new file mode 100644 index 00000000..33411794 --- /dev/null +++ b/src/views/oa/process/i18n/zh-cn.ts @@ -0,0 +1,16 @@ +export default { + process: { + index: '序号', + processonDefinitionId: '模型ID', + name: '模型名称', + key: '模型标识', + category: '模型分类', + revision: '版本', + status: '状态', + deploymentTime: '部署时间', + inputNameTip: '请输入模型名称', + inputModelTip: '请输入模型名称', + inputCategoryTip: '请输入模型分类', + inputKeyTip: '请输入模型标识', + } +} diff --git a/src/views/oa/process/index.vue b/src/views/oa/process/index.vue new file mode 100644 index 00000000..3152e7bd --- /dev/null +++ b/src/views/oa/process/index.vue @@ -0,0 +1,157 @@ + + + + + + + + + + + {{ $t('common.queryBtn') }} + + {{ $t('common.resetBtn') }} + + + + + + + {{ $t('common.delBtn') }} + + + + + + + + + + + + + + + 挂起 + 有效 + + + + + {{ parseTime(scope.row.deploymentTime) }} + + + + + 流程图 + + 失效 + + 激活 + + {{ + $t('common.delBtn') + }} + + + + + + + + + + + + + + diff --git a/src/views/oa/task/comment.vue b/src/views/oa/task/comment.vue new file mode 100644 index 00000000..4081afda --- /dev/null +++ b/src/views/oa/task/comment.vue @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/oa/task/form.vue b/src/views/oa/task/form.vue new file mode 100644 index 00000000..b1897153 --- /dev/null +++ b/src/views/oa/task/form.vue @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ flag }} + + + + + + + \ No newline at end of file diff --git a/src/views/oa/task/i18n/en.ts b/src/views/oa/task/i18n/en.ts new file mode 100644 index 00000000..1fc76573 --- /dev/null +++ b/src/views/oa/task/i18n/en.ts @@ -0,0 +1,18 @@ +export default { + task: { + index: 'index', + taskId: 'taskId', + taskName: 'taskName', + time: 'time', + comment: 'comment', + content: 'content', + inputTaskNameTip: 'input Task Name', + inputCommentTip: 'input comment' + }, + comment: { + index: 'index', + userId: 'userId', + fullMessage: 'fullMessage', + time: 'time' + } +} \ No newline at end of file diff --git a/src/views/oa/task/i18n/zh-cn.ts b/src/views/oa/task/i18n/zh-cn.ts new file mode 100644 index 00000000..28f42fcc --- /dev/null +++ b/src/views/oa/task/i18n/zh-cn.ts @@ -0,0 +1,18 @@ +export default { + task: { + index: '序号', + taskId: 'ID', + taskName: '任务名称', + time: '提交时间', + comment: '批注', + content: '事由', + inputTaskNameTip: '请输入任务名称', + inputCommentTip: '请输入批注名称' + }, + comment: { + index: '序号', + userId: '用户', + fullMessage: '批注', + time: '时间' + } +} \ No newline at end of file diff --git a/src/views/oa/task/index.vue b/src/views/oa/task/index.vue new file mode 100644 index 00000000..2e227a92 --- /dev/null +++ b/src/views/oa/task/index.vue @@ -0,0 +1,131 @@ + + + + + + + + + + + {{ $t('common.queryBtn') }} + + {{ $t('common.resetBtn') }} + + + + + + + {{ $t('common.exportBtn') }} + + + {{ $t('common.delBtn') }} + + + + + + + + + + + + + 流程图 + + 审批 + + 批注 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/personal/index.vue b/src/views/personal/index.vue index 86282c44..07dc838f 100644 --- a/src/views/personal/index.vue +++ b/src/views/personal/index.vue @@ -186,8 +186,6 @@ const passwordRuleForm = reactive({ }) - - // 头像上传成功 const handleAvatarSuccess = (url: any) => { formData.avatar = url;