From 1ad0c3a3ec7b0f2fb1a5bf653112ce7ad16ee76c Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 30 May 2023 17:58:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E8=B0=83=E6=95=B4=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...owController.php => ApproveController.php} | 116 ++++++++---------
docker-compose.yml | 5 +-
docker/nginx/default.conf | 16 +--
.../assets/js/components/Mobile/Tabbar.vue | 2 +-
resources/assets/js/pages/manage.vue | 38 +++---
.../manage/{review => approve}/details.vue | 80 ++++++------
.../manage/{review => approve}/index.vue | 120 +++++++++---------
.../pages/manage/{review => approve}/list.vue | 2 +-
.../{WorkflowExport.vue => ApproveExport.vue} | 6 +-
.../pages/manage/components/DialogWrapper.vue | 10 +-
.../js/pages/manage/setting/approve.vue | 6 +-
resources/assets/js/routes.js | 12 +-
resources/assets/js/store/actions.js | 14 +-
resources/assets/js/store/state.js | 2 +-
resources/assets/sass/dark.scss | 2 +-
resources/assets/sass/pages/_.scss | 2 +-
.../sass/pages/components/dialog-wrapper.scss | 2 +-
.../{page-review.scss => page-approve.scss} | 54 ++++----
resources/views/push/bot.blade.php | 12 +-
routes/web.php | 8 +-
20 files changed, 254 insertions(+), 255 deletions(-)
rename app/Http/Controllers/Api/{WorkflowController.php => ApproveController.php} (91%)
rename resources/assets/js/pages/manage/{review => approve}/details.vue (84%)
rename resources/assets/js/pages/manage/{review => approve}/index.vue (86%)
rename resources/assets/js/pages/manage/{review => approve}/list.vue (97%)
rename resources/assets/js/pages/manage/components/{WorkflowExport.vue => ApproveExport.vue} (97%)
rename resources/assets/sass/pages/{page-review.scss => page-approve.scss} (88%)
diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/ApproveController.php
similarity index 91%
rename from app/Http/Controllers/Api/WorkflowController.php
rename to app/Http/Controllers/Api/ApproveController.php
index 198fdb7d5..25c10ba68 100755
--- a/app/Http/Controllers/Api/WorkflowController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -20,20 +20,20 @@ use App\Models\WebSocketDialogMsg;
use App\Module\BillMultipleExport;
use Hhxsv5\LaravelS\Swoole\Task\Task;
/**
- * @apiDefine workflow
+ * @apiDefine approve
*
* 工作流
*/
-class WorkflowController extends AbstractController
+class ApproveController extends AbstractController
{
private $flow_url = '';
public function __construct()
{
- $this->flow_url = env('FLOW_URL') ?: 'http://dootask-workflow-'.env('APP_ID');
+ $this->flow_url = env('FLOW_URL') ?: 'http://dootask-approve-'.env('APP_ID');
}
/**
- * @api {get} api/workflow/verifyToken 01. 验证APi登录
+ * @api {get} api/approve/verifyToken 01. 验证APi登录
*
* @apiVersion 1.0.0
* @apiGroup users
@@ -54,11 +54,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/procdef/all 02. 查询流程定义
+ * @api {post} api/approve/procdef/all 02. 查询流程定义
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName procdef__all
*
* @apiQuery {String} name 流程名称
@@ -80,11 +80,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {get} api/workflow/procdef/del 03. 删除流程定义
+ * @api {get} api/approve/procdef/del 03. 删除流程定义
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName procdef__del
*
* @apiQuery {String} id 流程ID
@@ -106,11 +106,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/process/start 04. 启动流程(审批中)
+ * @api {post} api/approve/process/start 04. 启动流程(审批中)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__start
*
* @apiQuery {String} proc_name 流程名称
@@ -153,14 +153,14 @@ class WorkflowController extends AbstractController
if (empty($dialog)) {
continue;
}
- $this->workflowMsg('workflow_reviewer', $dialog, $botUser, $val, $process, 'start');
+ $this->approveMsg('approve_reviewer', $dialog, $botUser, $val, $process, 'start');
}
// 抄送人
$notifier = $this->handleProcessNode($process);
if ($notifier) {
foreach ($notifier as $val) {
$dialog = WebSocketDialog::checkUserDialog($botUser, $val['target_id']);
- $this->workflowMsg('workflow_notifier', $dialog, $botUser, $process, $process);
+ $this->approveMsg('approve_notifier', $dialog, $botUser, $process, $process);
}
}
}
@@ -169,11 +169,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/process/addGlobalComment 05. 添加全局评论
+ * @api {post} api/approve/process/addGlobalComment 05. 添加全局评论
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__addGlobalComment
*
* @apiQuery {Number} proc_inst_id 流程实例ID
@@ -201,11 +201,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/task/complete 06. 审批
+ * @api {post} api/approve/task/complete 06. 审批
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName task__complete
*
* @apiQuery {Number} task_id 流程ID
@@ -243,13 +243,13 @@ class WorkflowController extends AbstractController
if (empty($dialog)) {
continue;
}
- $this->workflowMsg('workflow_reviewer', $dialog, $botUser, $val, $process, $pass);
+ $this->approveMsg('approve_reviewer', $dialog, $botUser, $val, $process, $pass);
}
// 发起人
if($process['is_finished'] == true) {
$dialog = WebSocketDialog::checkUserDialog($botUser, $process['start_user_id']);
if (!empty($dialog)) {
- $this->workflowMsg('workflow_submitter', $dialog, $botUser, ['userid' => $data['userid']], $process, $pass);
+ $this->approveMsg('approve_submitter', $dialog, $botUser, ['userid' => $data['userid']], $process, $pass);
}
}else if ($process['candidate']) {
// 下个审批人
@@ -263,7 +263,7 @@ class WorkflowController extends AbstractController
if (empty($dialog)) {
continue;
}
- $this->workflowMsg('workflow_reviewer', $dialog, $botUser, $val, $process,'start');
+ $this->approveMsg('approve_reviewer', $dialog, $botUser, $val, $process,'start');
}
}
@@ -273,7 +273,7 @@ class WorkflowController extends AbstractController
foreach ($notifier as $val) {
$dialog = WebSocketDialog::checkUserDialog($botUser, $val['target_id']);
if (!empty($dialog)) {
- $this->workflowMsg('workflow_notifier', $dialog, $botUser, $process, $process);
+ $this->approveMsg('approve_notifier', $dialog, $botUser, $process, $process);
}
}
}
@@ -281,11 +281,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/task/withdraw 07. 撤回
+ * @api {post} api/approve/task/withdraw 07. 撤回
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName task__withdraw
*
* @apiQuery {Number} task_id 流程ID
@@ -320,17 +320,17 @@ class WorkflowController extends AbstractController
continue;
}
//发送撤回提醒
- $this->workflowMsg('workflow_reviewer', $dialog, $botUser, $val, $process, 'withdraw');
+ $this->approveMsg('approve_reviewer', $dialog, $botUser, $val, $process, 'withdraw');
}
return Base::retSuccess('已撤回', Base::arrayKeyToUnderline($task['data']));
}
/**
- * @api {post} api/workflow/process/findTask 08. 查询需要我审批的流程(审批中)
+ * @api {post} api/approve/process/findTask 08. 查询需要我审批的流程(审批中)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__findTask
*
* @apiQuery {String} proc_def_name 流程名称
@@ -368,11 +368,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/process/startByMyselfAll 09. 查询我启动的流程(全部)
+ * @api {post} api/approve/process/startByMyselfAll 09. 查询我启动的流程(全部)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__startByMyselfAll
*
* @apiQuery {String} proc_def_name 流程分类
@@ -410,11 +410,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/process/startByMyself 10. 查询我启动的流程(审批中)
+ * @api {post} api/approve/process/startByMyself 10. 查询我启动的流程(审批中)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__startByMyself
*
* @apiQuery {Number} page 页码
@@ -448,11 +448,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/process/findProcNotify 11. 查询抄送我的流程(审批中)
+ * @api {post} api/approve/process/findProcNotify 11. 查询抄送我的流程(审批中)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__findProcNotify
*
* @apiQuery {Number} userid 用户ID
@@ -492,11 +492,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {get} api/workflow/identitylink/findParticipant 12. 查询流程实例的参与者(审批中)
+ * @api {get} api/approve/identitylink/findParticipant 12. 查询流程实例的参与者(审批中)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName identitylink__findParticipant
*
* @apiQuery {Number} proc_inst_id 流程实例ID
@@ -527,11 +527,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/procHistory/findTask 13. 查询需要我审批的流程(已结束)
+ * @api {post} api/approve/procHistory/findTask 13. 查询需要我审批的流程(已结束)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName procHistory__findTask
*
* @apiQuery {String} proc_def_name 流程分类
@@ -569,11 +569,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/procHistory/startByMyself 14. 查询我启动的流程(已结束)
+ * @api {post} api/approve/procHistory/startByMyself 14. 查询我启动的流程(已结束)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName procHistory__startByMyself
*
* @apiQuery {Number} page 页码
@@ -607,11 +607,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {post} api/workflow/procHistory/findProcNotify 15. 查询抄送我的流程(已结束)
+ * @api {post} api/approve/procHistory/findProcNotify 15. 查询抄送我的流程(已结束)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName procHistory__findProcNotify
*
* @apiQuery {String} proc_def_name 流程分类
@@ -650,11 +650,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {get} api/workflow/identitylinkHistory/findParticipant 16. 查询流程实例的参与者(已结束)
+ * @api {get} api/approve/identitylinkHistory/findParticipant 16. 查询流程实例的参与者(已结束)
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName identitylinkHistory__findParticipant
*
* @apiQuery {Number} proc_inst_id 流程实例ID
@@ -685,11 +685,11 @@ class WorkflowController extends AbstractController
}
/**
- * @api {get} api/workflow/process/detail 17. 根据流程ID查询流程详情
+ * @api {get} api/approve/process/detail 17. 根据流程ID查询流程详情
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName process__detail
*
* @apiQuery {Number} id 流程ID
@@ -702,16 +702,16 @@ class WorkflowController extends AbstractController
{
User::auth();
$data['id'] = intval(Request::input('id'));
- $workflow = $this->getProcessById($data['id']);
- return Base::retSuccess('success', $workflow);
+ $approve = $this->getProcessById($data['id']);
+ return Base::retSuccess('success', $approve);
}
/**
- * @api {post} api/workflow/export 18. 导出数据
+ * @api {post} api/approve/export 18. 导出数据
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
- * @apiGroup workflow
+ * @apiGroup approve
* @apiName export
*
* @apiQuery {String} proc_def_name 流程分类
@@ -839,7 +839,7 @@ class WorkflowController extends AbstractController
];
//
$fileName = '审批记录_' . Base::time() . '.xls';
- $filePath = "temp/workflow/export/" . date("Ym", Base::time());
+ $filePath = "temp/approve/export/" . date("Ym", Base::time());
$export = new BillMultipleExport($sheets);
$res = $export->store($filePath . "/" . $fileName);
if ($res != 1) {
@@ -860,10 +860,10 @@ class WorkflowController extends AbstractController
$base64 = base64_encode(Base::array2string([
'file' => $zipFile,
]));
- Session::put('workflow::export:userid', $user->userid);
+ Session::put('approve::export:userid', $user->userid);
return Base::retSuccess('success', [
'size' => Base::twoFloat(filesize($zipPath) / 1024, true),
- 'url' => Base::fillUrl('api/workflow/down?key=' . urlencode($base64)),
+ 'url' => Base::fillUrl('api/approve/down?key=' . urlencode($base64)),
]);
} else {
return Base::retError('打包失败,请稍后再试...');
@@ -882,7 +882,7 @@ class WorkflowController extends AbstractController
}
/**
- * @api {get} api/workflow/down 19. 下载导出的审批数据
+ * @api {get} api/approve/down 19. 下载导出的审批数据
*
* @apiVersion 1.0.0
* @apiGroup system
@@ -894,7 +894,7 @@ class WorkflowController extends AbstractController
*/
public function down()
{
- $userid = Session::get('workflow::export:userid');
+ $userid = Session::get('approve::export:userid');
if (empty($userid)) {
return Base::ajaxError("请求已过期,请重新导出!", [], 0, 502);
}
@@ -947,11 +947,11 @@ class WorkflowController extends AbstractController
// 审批机器人消息
- public function workflowMsg($type, $dialog, $botUser, $toUser, $process, $action = null)
+ public function approveMsg($type, $dialog, $botUser, $toUser, $process, $action = null)
{
$data = [
'id' => $process['id'],
- 'nickname' => User::userid2nickname($type == 'workflow_submitter' ? $toUser['userid'] : $process['start_user_id']),
+ 'nickname' => User::userid2nickname($type == 'approve_submitter' ? $toUser['userid'] : $process['start_user_id']),
'proc_def_name' => $process['proc_def_name'],
'department' => $process['department'],
'type' => $process['var']['type'],
@@ -964,7 +964,7 @@ class WorkflowController extends AbstractController
$msg_action = null;
if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') {
// 任务完成,给发起人发送消息
- if($type == 'workflow_submitter' && $action != 'withdraw'){
+ if($type == 'approve_submitter' && $action != 'withdraw'){
return WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
}
// 查找最后一条消息msg_id
@@ -982,12 +982,12 @@ class WorkflowController extends AbstractController
$proc_msg->save();
}
// 更新工作报告 未读数量
- if($type == 'workflow_reviewer' && $toUser['userid']){
+ if($type == 'approve_reviewer' && $toUser['userid']){
$params = [
'userid' => [ $toUser['userid'], User::auth()->userid() ],
'msg' => [
- 'type' => 'workflow',
- 'action' => 'backlog',
+ 'type' => 'approve',
+ 'action' => 'unread',
'userid' => $toUser['userid'],
]
];
diff --git a/docker-compose.yml b/docker-compose.yml
index d441c8534..c9aff6f97 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,7 +49,6 @@ services:
- drawio-webapp
- drawio-export
- minder
- - workflow
restart: unless-stopped
redis:
@@ -149,8 +148,8 @@ services:
ipv4_address: "${APP_IPPR}.10"
restart: unless-stopped
- workflow:
- container_name: "dootask-workflow-${APP_ID}"
+ approve:
+ container_name: "dootask-approve-${APP_ID}"
image: "hitosea2020/go-workflow:latest"
environment:
TZ: "Asia/Shanghai"
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 2eda6e165..906db1e6f 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -169,19 +169,19 @@ server {
proxy_pass http://minder/;
}
- # 工作流
- location /workflow/ {
- proxy_pass http://workflow/;
+ # 审批
+ location /approve/ {
+ proxy_pass http://approve/;
}
- location /workflow/api/ {
- auth_request /workflowauth;
- proxy_pass http://workflow/api/;
+ location /approve/api/ {
+ auth_request /approveAuth;
+ proxy_pass http://approve/api/;
}
- location /workflowauth {
+ location /approveAuth {
internal;
proxy_set_header Content-Type "application/json";
proxy_set_header Content-Length $request_length;
- proxy_pass http://service/api/workflow/verifyToken;
+ proxy_pass http://service/api/approve/verifyToken;
}
}
diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue
index 9c65b998c..3768eea4e 100644
--- a/resources/assets/js/components/Mobile/Tabbar.vue
+++ b/resources/assets/js/components/Mobile/Tabbar.vue
@@ -79,7 +79,7 @@ export default {
{icon: '', name: 'joinMeeting', label: '加入会议'},
],
[
- {icon: '', name: 'review', label: '审批中心'},
+ {icon: '', name: 'approve', label: '审批中心'},
]
],
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 4b42ed08a..821c78145 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -11,7 +11,7 @@
{{$L(datas.var?.type)}}
{{datas.var?.start_time}}
{{datas.var?.end_time}}
{{ datas.var?.start_time ? getTimeDifference(datas.var?.start_time,datas.var?.end_time)['time'] : 0 }}
{{datas.var?.description}}
{{$L('提交')}}
{{data.start_user_name || datas.start_user_name}}
-{{$L('已提交')}}
+{{data.start_user_name || datas.start_user_name}}
+{{$L('已提交')}}
{{ getTimeAgo(item.claim_time) }}
{{item.claim_time?.substr(0,16)}}
{{$L('审批')}}
{{item.approver}}
-待审批
-+
{{item.approver}}
+待审批
+{{$L('审批中')}} {{$L('已通过')}} {{$L('已拒绝')}} {{$L('已撤回')}}
{{ item.identitylink?.state==0 ? ($L('已等待') + " " + getTimeAgo( datas.node_infos[key-1].claim_time,2)) : @@ -100,8 +100,8 @@
{{$L('抄送')}}
{{$L('系统')}}
+{{$L('系统')}}
{{$L('自动抄送')}}
{{ item.node_user_list?.map(h=>h.name).join(',') }}
@@ -117,8 +117,8 @@
{{$L('结束')}} {{$L('系统')}} {{$L('系统')}} {{ datas.is_finished ? $L('已结束') : $L('未结束') }}{{$L('全文评论')}}
-
{{$L('全文评论')}}
+