diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index ed690a38b..e3773c86c 100755 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -47,28 +47,6 @@ class WorkflowController extends AbstractController } } - /** - * @api {get} api/workflow/user/department 02. 获取当前用户部门 - * - * @apiDescription 需要token身份 - * @apiVersion 1.0.0 - * @apiGroup workflow - * @apiName user__department - * - * @apiQuery {Number} id 流程ID - * - * @apiSuccess {Number} ret 返回状态码（1正确、0错误） - * @apiSuccess {String} msg 返回信息（错误描述） - * @apiSuccess {Object} data 返回数据 - */ - public function user__department() - { - // User::auth(); - // $data['id'] = intval(Request::input('id')); - // $workflow = $this->getProcessById($data['id']); - // return Base::retSuccess('success', $workflow); - } - /** * @api {post} api/workflow/procdef/all 02. 查询流程定义 * @@ -181,7 +159,7 @@ class WorkflowController extends AbstractController } } - return Base::retSuccess('success', $process); + return Base::retSuccess('创建成功', $process); } /** @@ -257,7 +235,7 @@ class WorkflowController extends AbstractController $this->workflowMsg('workflow_notifier', $dialog, $botUser, $process, $process); } } - return Base::retSuccess('success', $task); + return Base::retSuccess( $pass == 'pass' ? '已通过' : '已拒绝', $task); } /** @@ -302,7 +280,7 @@ class WorkflowController extends AbstractController //发送撤回提醒 $this->workflowMsg('workflow_reviewer', $dialog, $botUser, $val, $process, 'withdraw'); } - return Base::retSuccess('success', Base::arrayKeyToUnderline($task['data'])); + return Base::retSuccess('已撤回', Base::arrayKeyToUnderline($task['data'])); } /** diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue index b8d1ce662..9c65b998c 100644 --- a/resources/assets/js/components/Mobile/Tabbar.vue +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -77,6 +77,9 @@ export default { {icon: '', name: 'addTask', label: '添加任务'}, {icon: '', name: 'createMeeting', label: '新会议'}, {icon: '', name: 'joinMeeting', label: '加入会议'}, + ], + [ + {icon: '', name: 'review', label: '审批中心'}, ] ], diff --git a/resources/assets/js/pages/manage/review/details.vue b/resources/assets/js/pages/manage/review/details.vue index 1837825e0..01bf76343 100644 --- a/resources/assets/js/pages/manage/review/details.vue +++ b/resources/assets/js/pages/manage/review/details.vue @@ -251,8 +251,12 @@ export default { comment: desc, } }).then(({msg}) => { - this.getInfo() - this.$emit('approve') + $A.messageSuccess(msg); + if(this.$route.name=='manage-review-details'){ + this.getInfo() + }else{ + this.$emit('approve') + } }).catch(({msg}) => { $A.modalError(msg); }); @@ -274,9 +278,13 @@ export default { proc_inst_id: this.datas.id, } }).then(({msg}) => { + $A.messageSuccess(msg); resolve(); - this.getInfo() - this.$emit('revocation') + if(this.$route.name=='manage-review-details'){ + this.getInfo() + }else{ + this.$emit('revocation') + } }).catch(({msg}) => { $A.modalError(msg); resolve(); diff --git a/resources/assets/js/pages/manage/review/index.vue b/resources/assets/js/pages/manage/review/index.vue index 5963e3f17..0f2467d2b 100644 --- a/resources/assets/js/pages/manage/review/index.vue +++ b/resources/assets/js/pages/manage/review/index.vue @@ -114,7 +114,7 @@ - +
- +
+ + + +
- +
+ + + +
@@ -160,18 +180,22 @@ import list from "./list.vue"; import listDetails from "./details.vue"; import DrawerOverlay from "../../../components/DrawerOverlay"; import { mapState } from 'vuex' + export default { components:{list,listDetails,DrawerOverlay}, name: "review", data(){ return{ + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), + currentDate: new Date(2021, 0, 17), + procdefList: [], page: 1, pageSize: 250, total: 0, noText: '', loadIng:false, - tabsValue:"", // @@ -201,20 +225,30 @@ export default { // addTitle:'', addShow:false, + startTimeOpen:false, + endTimeOpen:false, addData: { department_id:0, type: '', - startTime:"", - endTime:"", + startTime:"2023-04-20", + startTimeHour:"09", + startTimeMinute:"00", + endTime: "2023-04-20", + endTimeHour:"18", + endTimeMinute:"00", + }, addRule: { department_id:{ type: 'number',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' }, + description:{ type: 'string',required: true, message: this.$L('请输入事由！'), trigger: 'change' }, }, selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"], + + // + showDateTime:false } }, computed: { @@ -252,28 +286,44 @@ export default { this.addData.department_id = this.userInfo.department[0] || 0; }, methods:{ + formatter(type, val) { + if (type === 'year') { + return `${val}月`; + }else if (type === 'month') { + return `${val}月`; + } else if (type === 'day') { + return `${val}日`; + } else if (type === 'hour') { + return `${val}时`; + }else if (type === 'minute') { + return `${val}分`; + } + return val; + }, // tab切换事件 tabsClick(val){ - this.__tabsClick && clearTimeout(this.__tabsClick) - this.__tabsClick = setTimeout(() => { - this.tabsValue = val || this.tabsValue - if(val!=""){ - this.approvalType = this.searchState = "all" - } - if(this.tabsValue == 'backlog'){ - this.getBacklogList(); - } - if(this.tabsValue == 'done'){ - this.getDoneList(); - } - if(this.tabsValue == 'notify'){ - this.getNotifyList(); - } - if(this.tabsValue == 'initiated'){ - this.getInitiatedList(); - } - }, 200) + if(!val && this.__tabsClick){ + return; + } + this.__tabsClick = setTimeout(() => { this.__tabsClick =null; },1000) + + this.tabsValue = val || this.tabsValue + if(val!=""){ + this.approvalType = this.searchState = "all" + } + if(this.tabsValue == 'backlog'){ + this.getBacklogList(); + } + if(this.tabsValue == 'done'){ + this.getDoneList(); + } + if(this.tabsValue == 'notify'){ + this.getNotifyList(); + } + if(this.tabsValue == 'initiated'){ + this.getInitiatedList(); + } }, // 列表点击事件 @@ -434,12 +484,17 @@ export default { this.$refs.initiateRef.validate((valid) => { if (valid) { this.loadIng++; + var obj = JSON.parse(JSON.stringify(this.addData)) + // if((addTitle || '').indexOf('班') == -1){ + obj.startTime = obj.startTime +" "+ obj.startTimeHour + ":" + obj.startTimeMinute; + obj.endTime = obj.endTime +" "+ obj.endTimeHour + ":" + obj.endTimeMinute; + // } this.$store.dispatch("call", { url: 'workflow/process/start', data: { proc_name:this.addTitle, - department_id:this.addData.department_id, - var: JSON.stringify(this.addData) + department_id: obj.department_id, + var: JSON.stringify(obj) }, method: 'post', }).then(({data, msg}) => { @@ -465,7 +520,6 @@ export default { .page-review .review-details{ border-radius: 8px; } - .page-review .ivu-tabs-nav { display: flex; width: 350px; @@ -478,4 +532,7 @@ export default { text-align: center; } } + .page-review-initiate .ivu-modal-body{ + padding: 16px 22px 2px !important; + } diff --git a/resources/assets/js/pages/manage/setting/approve.vue b/resources/assets/js/pages/manage/setting/approve.vue index 12b35b9c7..a1b569135 100644 --- a/resources/assets/js/pages/manage/setting/approve.vue +++ b/resources/assets/js/pages/manage/setting/approve.vue @@ -8,7 +8,7 @@ -->
-

{{$L('流程名称：')}}{{$L(item.name)}}

+

{{$L('流程名称：')}}{{$L(item.name)}}

{{$L('是否发布')}}：

diff --git a/resources/assets/sass/pages/page-review.scss b/resources/assets/sass/pages/page-review.scss index 06f6e16aa..5501bc889 100644 --- a/resources/assets/sass/pages/page-review.scss +++ b/resources/assets/sass/pages/page-review.scss @@ -213,12 +213,14 @@ } .review-operation{ flex: 0 0 auto; - height: 55px; padding: 0 24px; border-top: 1px solid #F4F4F5; display: flex; align-items: center; gap: 10px; + button{ + margin: 10px 0; + } } .comment{ diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index fcf01b202..00ce5f4c8 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -139,7 +139,16 @@ 开始时间：{{$data->start_time}} 结束时间：{{$data->end_time}}
- + @if ($action === 'pass') + + @elseif ($action === 'refuse') + + @elseif ($action === 'withdraw') + + @else + + + @endif
@elseif ($type === 'workflow_submitter') @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif @@ -151,7 +160,16 @@ 开始时间：{{$data->start_time}} 结束时间：{{$data->end_time}}
- + @if ($action === 'pass') + + @elseif ($action === 'refuse') + + @elseif ($action === 'withdraw') + + @else + + + @endif
@else 你好，我是你的机器人助理，你可以发送 /help 查看帮助菜单。