Merge branch 'dev' into sit

src/views/process/columns.js

@@ -189,7 +189,12 @@ const columns = [
 
   {
     prop: "action_name",
-    label: "操作人",
+    label: "上一步的操作人",
+  },
+  {
+    prop: "handle_user_list",
+    label: "当前操作人",
+    _slot_:'current_handle_name'
   },
   {
     prop: "addtime",
@@ -262,4 +267,4 @@ const readUnRead =[
 ]
 
 
-export { routerList, columns,readUnRead }
+export { routerList, columns,readUnRead }

src/views/process/done/index.vue

@@ -153,7 +153,7 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns: columns,
+      columns: columns.filter(({_slot_}) => _slot_ !== 'current_handle_name'),
     };
   },
   mounted() {

src/views/process/oing/index.vue

@@ -81,16 +81,9 @@
           </el-row>
         </div>
       </template>
-      <!-- <template #status="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="scope.row.status == '0' ? 'warning' : ''"
-          v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template> -->
+      <template #current_handle_name="{ scope }">
+          {{scope.row.handle_user_list ? scope.row.handle_user_list.join(',') : ''}}
+      </template>
 
       <template #operation="{ scope }">
         <el-tooltip