From a5d6866a2e195dc1cb91be88b42fbeb53f85adc6 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 1 Nov 2023 16:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/OaApprove.php | 6 +++---
 app/oa/view/approve/index.html   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/OaApprove.php b/app/api/controller/OaApprove.php
index e2372b8..367ead8 100644
--- a/app/api/controller/OaApprove.php
+++ b/app/api/controller/OaApprove.php
@@ -156,7 +156,7 @@ class OaApprove extends ApiController
         $this->did = $loginAdmin['did'];
         $param = get_params();
 		if (empty($param['flow_id'])) {
-            $this->apiError("审批类型id不能为空");
+            $this->apiError("审批流程id不能为空");
         }
 		if (isset($param['detail_time'])) {
 			$param['detail_time'] = strtotime($param['detail_time']);
@@ -250,7 +250,7 @@ class OaApprove extends ApiController
 				$users = $param['check_admin_ids'];
 				sendMessage($users,21,$msg);
 			} catch (\Exception $e) {
-				$this->apiError($e->getError());
+				$this->apiError($e->getMessage());
 			}
 		} else {
 			$param['admin_id'] = $this->uid;
@@ -317,7 +317,7 @@ class OaApprove extends ApiController
 				$users = $param['check_admin_ids'];
 				sendMessage($users, 21, $msg);
 			} catch (\Exception $e) {
-				$this->apiError($e->getError());
+				$this->apiError($e->getMessage());
 			}
 		}
 		$this->apiSuccess('操作成功'); 
diff --git a/app/oa/view/approve/index.html b/app/oa/view/approve/index.html
index f718e00..9b4d566 100644
--- a/app/oa/view/approve/index.html
+++ b/app/oa/view/approve/index.html
@@ -24,7 +24,7 @@
 					<div class="layui-row">
 						{volist name="list" id="vo"}
 							{eq name="vo.type" value="$v.id"}
-								<div class="layui-col-md4" data-type="{$vo.id}" title="{$vo.title}"><div><i class="iconfont {$vo.icon}"></i>{$vo.title}</div></div>	
+								<div class="layui-col-md4" data-type="{$vo.id}" title="{$vo.title}"><div><i class="iconfont {$vo.icon}"></i>{$vo.title}-{$vo.id}</div></div>	
 							{/eq}
 						{/volist}
 					</div>