diff --git a/docker-compose.yml b/docker-compose.yml index ee4ebb124..d441c8534 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -151,7 +151,7 @@ services: workflow: container_name: "dootask-workflow-${APP_ID}" - image: "hitosea2020/go-workflow:1.0.1" + image: "hitosea2020/go-workflow:latest" environment: TZ: "Asia/Shanghai" MYSQL_HOST: "${DB_HOST}" diff --git a/language/original-web.txt b/language/original-web.txt index 5176a2d82..4081dfc6d 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1186,6 +1186,7 @@ Markdown 格式发送 婚假 丧假 哺乳假 +外出 暂无数据 审批中心 待办 @@ -1208,6 +1209,11 @@ Markdown 格式发送 发起时间 审批设置 是否发布 +已发布 流程名称 自动通过,审批人与发起人为同一人 -您当前未加入任何部门,不能发起! \ No newline at end of file +您当前未加入任何部门,不能发起! +请输入流程名称 +将会清空流程数据,此操作不可恢复 +添加申请 +请选择申请类型! \ No newline at end of file diff --git a/resources/assets/js/pages/manage/review/index.vue b/resources/assets/js/pages/manage/review/index.vue index 0541c37be..69c724dc9 100644 --- a/resources/assets/js/pages/manage/review/index.vue +++ b/resources/assets/js/pages/manage/review/index.vue @@ -7,7 +7,8 @@

{{$L('审批中心')}}

- + + @@ -121,7 +122,12 @@ - + + + + @@ -229,6 +235,7 @@ export default { endTimeOpen:false, addData: { department_id:0, + applyType: '', type: '', startTime: "2023-04-20", startTimeHour:"09", @@ -240,12 +247,13 @@ export default { }, addRule: { department_id:{ type: 'number',required: true, message: this.$L('请选择部门!'), trigger: 'change' }, + applyType: { type: 'string',required: true, message: this.$L('请选择申请类型!'), trigger: 'change' }, type: { type: 'string',required: true, message: this.$L('请选择假期类型!'), trigger: 'change' }, startTime: { type: 'string',required: true, message: this.$L('请选择开始时间!'), trigger: 'change' }, endTime:{ type: 'string',required: true, message: this.$L('请选择结束时间!'), trigger: 'change' }, description:{ type: 'string',required: true, message: this.$L('请输入事由!'), trigger: 'change' }, }, - selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"], + selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假","外出"], // showDateTime:false @@ -286,7 +294,6 @@ export default { mounted() { this.tabsValue = "backlog" this.tabsClick() - this.getProcdef() this.getBacklogList() this.addData.department_id = this.userInfo.department[0] || 0; this.addData.startTime = this.addData.endTime = this.getCurrentDate(); @@ -345,20 +352,6 @@ export default { }) }, - // 获取列表数据 - getProcdef(){ - this.$store.dispatch("call", { - url: 'workflow/procdef/all', - method: 'post', - }).then(({data}) => { - this.procdefList = data.rows || []; - }).catch(({msg}) => { - $A.modalError(msg); - }).finally(_ => { - this.loadIng--; - }); - }, - // 获取待办列表 getBacklogList(){ this.$store.dispatch("call", { @@ -471,8 +464,8 @@ export default { }); }, - // 发起 - initiate(item){ + // 添加申请 + addApply(){ this.$store.dispatch("call", { url: 'users/basic', data: { @@ -485,8 +478,18 @@ export default { $A.modalError("您当前未加入任何部门,不能发起!"); return false; } - this.addTitle = item.name; - this.addShow = true; + this.$store.dispatch("call", { + url: 'workflow/procdef/all', + method: 'post', + }).then(({data}) => { + this.procdefList = data.rows || []; + this.addTitle = this.$L("添加申请"); + this.addShow = true; + }).catch(({msg}) => { + $A.modalError(msg); + }).finally(_ => { + this.loadIng--; + }); }).catch(({msg}) => { $A.modalError(msg); }).finally(_ => { @@ -507,7 +510,7 @@ export default { this.$store.dispatch("call", { url: 'workflow/process/start', data: { - proc_name:this.addTitle, + proc_name: obj.applyType, department_id: obj.department_id, var: JSON.stringify(obj) }, diff --git a/resources/assets/js/pages/manage/setting/approve.vue b/resources/assets/js/pages/manage/setting/approve.vue index dace7a4cb..d2017b7d7 100644 --- a/resources/assets/js/pages/manage/setting/approve.vue +++ b/resources/assets/js/pages/manage/setting/approve.vue @@ -1,21 +1,24 @@