From 8d8777ba95b00fe09e1a611fc0ecae6bce8451d7 Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Thu, 10 Aug 2023 08:05:31 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=A1=86=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                         | 2 +-
 resources/assets/js/functions/web.js                 | 2 ++
 resources/assets/js/pages/manage/approve/details.vue | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4fabb308..adfb0cb8b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "stylus-loader": "^7.1.0",
         "tinymce": "^5.10.3",
         "tui-calendar-hi": "^1.15.1-5",
-        "view-design-hi": "^4.7.0-47",
+        "view-design-hi": "^4.7.0-48",
         "vite": "^2.9.15",
         "vite-plugin-file-copy": "^1.0.0",
         "vite-plugin-require": "^1.1.10",
diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index b157595c5..5203c905a 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -990,6 +990,8 @@
                 loading: true,
                 okText: $A.L(config.okText || '确定'),
                 cancelText: $A.L(config.cancelText || '取消'),
+                okType: config.okType || 'primary',
+                cancelType: config.cancelType || 'text',
             });
             setTimeout(() => {
                 document.getElementById(inputId) && document.getElementById(inputId).focus();
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index 4a16f77fd..178e55ae2 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -326,6 +326,7 @@ export default {
                 placeholder: `请输入审批意见`,
                 type:"textarea",
                 okText: type == 1 ? "同意" : "拒绝",
+                okType: type == 1 ? "primary" : "error",
                 onOk: (desc) => {
                     if (type !=1 && !desc) {
                         return `请输入审批意见`
@@ -356,6 +357,7 @@ export default {
             $A.modalConfirm({
                 content: "你确定要撤销吗？",
                 loading: true,
+                okType: "warning",
                 onOk: () => {
                     return new Promise((resolve, reject) => {
                         this.$store.dispatch("call", {