From f9982608ddc642443578630a7d042fe643b2526f Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Thu, 19 Mar 2026 10:27:06 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processInstance/index.vue | 51 +++++++++++---------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 884bb424..bf8f7bd7 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -49,28 +49,12 @@
         </div>
         <el-card shadow="hover" class="table-panel">
           <template #header>
-            <div class="toolbar-shell">
-              <div class="table-heading">
-                <h3>流程实例</h3>
-              </div>
-              <div class="toolbar-actions">
-                <el-button
-                  v-hasPermi="['workflow:instance:remove']"
-                  type="danger"
-                  plain
-                  icon="Delete"
-                  :disabled="multiple"
-                  @click="() => handleDelete()"
-                >
-                  删除
-                </el-button>
-                <right-toolbar
-                  v-model:show-search="showSearch"
-                  :search="false"
-                  @query-table="handleQuery"
-                ></right-toolbar>
-              </div>
-            </div>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button v-hasPermi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+              </el-col>
+              <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
+            </el-row>
           </template>
           <el-tabs v-model="tab" @tab-click="changeTab">
             <el-tab-pane name="running" label="运行中"></el-tab-pane>
@@ -113,6 +97,7 @@
               <el-table-column align="center" prop="version" label="版本号" width="90">
                 <template #default="scope">v{{ scope.row.version }}.0</template>
               </el-table-column>
+<<<<<<< HEAD
               <el-table-column
                 v-if="tab === 'running'"
                 v-hasPermi="['workflow:instance:active']"
@@ -121,6 +106,9 @@
                 label="状态"
                 min-width="70"
               >
+=======
+              <el-table-column v-if="tab === 'running'" v-hasPermi="['workflow:instance:active']" align="center" prop="isSuspended" label="状态" min-width="70">
+>>>>>>> 73f2374 (add 增加流程实例权限)
                 <template #default="scope">
                   <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
                   <el-tag v-else type="danger">挂起</el-tag>
@@ -166,6 +154,7 @@
                       </el-popover>
                     </el-col>
                     <el-col :span="1.5">
+<<<<<<< HEAD
                       <el-button
                         v-hasPermi="['workflow:instance:remove']"
                         type="danger"
@@ -175,10 +164,14 @@
                       >
                         删除
                       </el-button>
+=======
+                      <el-button v-hasPermi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
+>>>>>>> 73f2374 (add 增加流程实例权限)
                     </el-col>
                   </el-row>
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
+<<<<<<< HEAD
                       <el-button
                         v-hasPermi="['workflow:instance:query']"
                         type="primary"
@@ -199,6 +192,12 @@
                       >
                         变量
                       </el-button>
+=======
+                      <el-button v-hasPermi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                      <el-button v-hasPermi="['workflow:instance:variableQuery']" type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
+>>>>>>> 73f2374 (add 增加流程实例权限)
                     </el-col>
                   </el-row>
                 </template>
@@ -229,6 +228,7 @@
         <el-table-column align="center" prop="version" label="版本号" width="90">
           <template #default="scope">v{{ scope.row.version }}.0</template>
         </el-table-column>
+<<<<<<< HEAD
         <el-table-column
           v-hasPermi="['workflow:instance:active']"
           align="center"
@@ -236,6 +236,9 @@
           label="状态"
           min-width="70"
         >
+=======
+        <el-table-column v-hasPermi="['workflow:instance:active']" align="center" prop="suspensionState" label="状态" min-width="70">
+>>>>>>> 73f2374 (add 增加流程实例权限)
           <template #default="scope">
             <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
             <el-tag v-else type="danger">挂起</el-tag>
@@ -280,9 +283,13 @@
             <el-input v-model="form.value" placeholder="请输入变量值" />
           </el-form-item>
           <el-form-item>
+<<<<<<< HEAD
             <el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">
               确认
             </el-button>
+=======
+            <el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
+>>>>>>> 73f2374 (add 增加流程实例权限)
           </el-form-item>
         </el-form>
       </el-card>