From b2e47f3938cfbd6cdf65db20aa9dcf381a17ce54 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 17 May 2024 20:59:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bpmn/index.vue                           | 44 ++++++++++----------
 src/components/BpmnView/index.vue            |  1 +
 src/components/Process/approvalRecord.vue    |  4 +-
 src/views/workflow/leave/index.vue           | 42 ++++++++++++-------
 src/views/workflow/processInstance/index.vue | 14 +------
 5 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/src/bpmn/index.vue b/src/bpmn/index.vue
index 13b3847..924a838 100644
--- a/src/bpmn/index.vue
+++ b/src/bpmn/index.vue
@@ -14,29 +14,6 @@
           <el-header>
             <div class="process-toolbar">
               <el-space wrap :size="10">
-                <el-button size="small" type="primary" @click="saveXml">保 存</el-button>
-                <el-dropdown size="small">
-                  <el-button size="small" type="primary"> 预 览 </el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item icon="Document" @click="previewXML">XML预览</el-dropdown-item>
-                      <el-dropdown-item icon="View" @click="previewSVG"> SVG预览</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-
-                <el-dropdown size="small">
-                  <el-button size="small" type="primary"> 下 载 </el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item icon="Download" @click="downloadXML">下载XML</el-dropdown-item>
-                      <el-dropdown-item icon="Download" @click="downloadSVG"> 下载SVG</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-                <el-tooltip effect="dark" content="新建" placement="bottom">
-                  <el-button size="small" icon="CirclePlus" @click="newDiagram" />
-                </el-tooltip>
                 <el-tooltip effect="dark" content="自适应屏幕" placement="bottom">
                   <el-button size="small" icon="Rank" @click="fitViewport" />
                 </el-tooltip>
@@ -53,6 +30,27 @@
                   <el-button size="small" icon="Right" @click="bpmnModeler.get('commandStack').redo()" />
                 </el-tooltip>
               </el-space>
+              <el-space wrap :size="10" style="float: right; padding-right: 10px">
+                <el-button size="small" type="primary" @click="saveXml">保 存</el-button>
+                <el-dropdown size="small">
+                  <el-button size="small" type="primary"> 预 览 </el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item icon="Document" @click="previewXML">XML预览</el-dropdown-item>
+                      <el-dropdown-item icon="View" @click="previewSVG"> SVG预览</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+                <el-dropdown size="small">
+                  <el-button size="small" type="primary"> 下 载 </el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item icon="Download" @click="downloadXML">下载XML</el-dropdown-item>
+                      <el-dropdown-item icon="Download" @click="downloadSVG"> 下载SVG</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </el-space>
             </div>
           </el-header>
           <div ref="canvas" class="canvas" />
diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
index 4ea890d..a79f084 100644
--- a/src/components/BpmnView/index.vue
+++ b/src/components/BpmnView/index.vue
@@ -405,5 +405,6 @@ defineExpose({
     margin: 0;
     padding: 0;
   }
+  cursor: pointer;
 }
 </style>
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 1610f27..cbce87a 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -62,7 +62,6 @@ const props = defineProps({
 const loading = ref(false);
 const visible = ref(false);
 const historyList = ref<Array<any>>([]);
-const deleteReason = ref<string>('');
 const tabActiveName = ref('bpmn');
 
 const bpmnViewRef = ref<BpmnView>();
@@ -74,8 +73,7 @@ const init = async (instanceId: string) => {
   tabActiveName.value = 'bpmn';
   historyList.value = [];
   processApi.getHistoryRecord(instanceId).then((resp) => {
-    historyList.value = resp.data.historyRecordList;
-    deleteReason.value = resp.data.deleteReason;
+    historyList.value = resp.data;
     loading.value = false;
   });
   await nextTick(() => {
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 2e8a9b7..23d5442 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -58,34 +58,44 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip
+            <el-button
               v-if="
                 scope.row.processInstanceVo.businessStatus === 'draft' ||
                 scope.row.processInstanceVo.businessStatus === 'cancel' ||
                 scope.row.processInstanceVo.businessStatus === 'back'
               "
-              content="修改"
-              placement="top"
+              v-hasPermi="['demo:leave:edit']"
+              size="small"
+              link
+              type="primary"
+              icon="Edit"
+              @click="handleUpdate(scope.row)"
+              >修改</el-button
             >
-              <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip
+            <el-button
               v-if="
                 scope.row.processInstanceVo.businessStatus === 'draft' ||
                 scope.row.processInstanceVo.businessStatus === 'cancel' ||
                 scope.row.processInstanceVo.businessStatus === 'back'
               "
-              content="删除"
-              placement="top"
+              v-hasPermi="['demo:leave:remove']"
+              size="small"
+              link
+              type="primary"
+              icon="Delete"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
+            <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+            <el-button
+              v-if="scope.row.processInstanceVo.businessStatus === 'waiting'"
+              link
+              size="small"
+              type="primary"
+              icon="Notification"
+              @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"
+              >撤销</el-button
             >
-              <el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip placement="top" content="查看">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip v-if="scope.row.processInstanceVo.businessStatus === 'waiting'" content="撤销" placement="top">
-              <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 764ca2f..4f994af 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -81,7 +81,7 @@
             </el-table-column>
             <el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
             <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" :width="tab === 'finish' ? '130' : '160'">
+            <el-table-column label="操作" align="center" :width="130">
               <template #default="scope">
                 <el-row v-if="tab === 'running'" :gutter="10" class="mb8">
                   <el-col :span="1.5">
@@ -97,23 +97,13 @@
                     </el-popover>
                   </el-col>
                   <el-col :span="1.5">
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      icon="Sort"
-                      @click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
-                      >切换版本</el-button
-                    >
+                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
                   </el-col>
                 </el-row>
                 <el-row :gutter="10" class="mb8">
                   <el-col :span="1.5">
                     <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
                   </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-                  </el-col>
                 </el-row>
               </template>
             </el-table-column>