From b24e925c5a36126cd58c7c0153613adc00030d46 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 19 Oct 2022 11:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AbilityApplication.vue              | 14 +++++++++++++-
 .../personalCenter/components/PutOnTheShelf .vue   |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 3230512e..ef1a6069 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -62,7 +62,7 @@
             <a-button type="primary" @click="modify(props.refObj.id, item)" v-if="item.backToFirst">
               修改
             </a-button>
-            <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
+            <a-popconfirm class="aaa"  v-if="!item.ended" title="是否撤回此流程?" ok-text="是" cancel-text="否"
               @confirm="endThis(item.instanceId)" @cancel="cancel">
               <a-button type="primary" danger style="margin-left: 10px">
                 撤回申请
@@ -463,7 +463,19 @@ const openView = (url) => {
 }
 
 </script>
+
 <style lang="less" scoped>
+.aaa{
+  margin-right: 30px;
+}
+ :deep(.ant-popover-inner) {
+    position: fixed !important;
+  
+    margin-right: 100px;
+  
+    
+    
+  }
 .title {
   font-size: 0.18rem;
   color: #000;
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index cc37393a..b23a28aa 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue	
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue	
@@ -13,7 +13,7 @@
       <div class="title">基本信息</div>
       <a-popconfirm
         v-if="!props.refObj.ended"
-        title="是否终止此流程?"
+        title="是否撤回此流程?"
         ok-text="是"
         cancel-text="否"
         @confirm="endThis"