From 282bdf98d5ce95482bc1b4fa37da790e81297619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 1 Sep 2025 11:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FlowBusinessKeyController.java |    8 +-
 .../src/components/flow/User/index.vue        |  250 ++-
 .../task/myProcess/detail/indexDrawer.vue     | 1400 ++++++++++-------
 .../flowable/task/todo/detail/indexDrawer.vue |    3 +
 4 files changed, 979 insertions(+), 682 deletions(-)

diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
index c1d76380..72e20ad2 100644
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
@@ -179,16 +179,10 @@ public class FlowBusinessKeyController extends BaseController {
             }
         }else{
             if(SecurityUtils.isAdmin(loginUser.getUserid())){
-                // 超管查询所有申请...
-                if(Objects.nonNull(projectId)){
-                    flowTaskEntity.setStartComId(Convert.toStr(projectId));
-                }
                 if(Objects.nonNull(projectId)){
                     flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
             }else if(SecurityUtils.isGSAdmin()){
-                // 公司管理员查询公司内的所有申请...
-                flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
                 if(Objects.nonNull(projectId)){
                     flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
@@ -220,7 +214,7 @@ public class FlowBusinessKeyController extends BaseController {
         startPage();
         flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long projectId=loginUser.getSysUser().getActiveProjectId();
+        Long projectId = loginUser.getSysUser().getActiveProjectId();
         flowTaskEntity.setStartProId(Convert.toStr(projectId));
         return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity));
     }
diff --git a/yanzhu-ui-vue3/src/components/flow/User/index.vue b/yanzhu-ui-vue3/src/components/flow/User/index.vue
index 176de04d..28c7219b 100644
--- a/yanzhu-ui-vue3/src/components/flow/User/index.vue
+++ b/yanzhu-ui-vue3/src/components/flow/User/index.vue
@@ -28,7 +28,14 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="18" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom: 20px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+          style="margin-bottom: 20px"
+        >
           <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -38,49 +45,131 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-<!--          <el-form-item label="手机号码" prop="phonenumber">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.phonenumber"-->
-<!--              placeholder="请输入手机号码"-->
-<!--              clearable-->
-<!--              style="width: 150px"-->
-<!--              @keyup.enter="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="手机号码" prop="phonenumber">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.phonenumber"-->
+          <!--              placeholder="请输入手机号码"-->
+          <!--              clearable-->
+          <!--              style="width: 150px"-->
+          <!--              @keyup.enter="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-show="checkType === 'multiple'" ref="dataTable" v-loading="loading" :row-key="getRowKey" :data="userList" @selection-change="handleMultipleUserSelect">
-          <el-table-column type="selection" width="50" align="center" reserve-selection/>
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+        <el-table
+          v-show="checkType === 'multiple'"
+          ref="dataTable"
+          v-loading="loading"
+          :row-key="getRowKey"
+          :data="userList"
+          @selection-change="handleMultipleUserSelect"
+        >
+          <el-table-column type="selection" width="50" align="center" reserve-selection />
+          <el-table-column
+            label="用户编号"
+            align="center"
+            key="userId"
+            prop="userId"
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="登录账号"
+            align="center"
+            key="userName"
+            prop="userName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="用户姓名"
+            align="center"
+            key="nickName"
+            prop="nickName"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            key="deptName"
+            prop="dept.deptName"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="phonenumber"
+            prop="phonenumber"
+            v-if="columns[4].visible"
+            width="120"
+          />
         </el-table>
-        <el-table v-show="checkType === 'single'" v-loading="loading" :data="userList" @current-change="handleSingleUserSelect">
-          <el-table-column  width="55" align="center" >
+        <el-table
+          v-show="checkType === 'single'"
+          v-loading="loading"
+          :data="userList"
+          @current-change="handleSingleUserSelect"
+        >
+          <el-table-column width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="radioSelected" :label="scope.row.userId">{{''}}</el-radio>
+              <el-radio v-model="radioSelected" :label="scope.row.userId">{{
+                ""
+              }}</el-radio>
             </template>
           </el-table-column>
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column
+            label="用户编号"
+            align="center"
+            key="userId"
+            prop="userId"
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="登录账号"
+            align="center"
+            key="userName"
+            prop="userName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="用户姓名"
+            align="center"
+            key="nickName"
+            prop="nickName"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            key="deptName"
+            prop="dept.deptName"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="phonenumber"
+            prop="phonenumber"
+            v-if="columns[4].visible"
+            width="120"
+          />
         </el-table>
 
         <pagination
-            v-show="total>0"
-            :total="total"
-            :page-sizes="[5,10]"
-            layout="prev, pager, next"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            @pagination="getList"
+          v-show="total > 0"
+          :total="total"
+          :page-sizes="[5, 10]"
+          layout="prev, pager, next"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
         />
       </el-col>
     </el-row>
@@ -89,11 +178,14 @@
 
 <script setup name="FlowUser">
 import { listUser, deptTreeSelect } from "@/api/system/user";
-import {markRaw} from "@vue/reactivity";
+import { markRaw } from "@vue/reactivity";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
 
 const userList = ref([]);
 const open = ref(false);
@@ -110,6 +202,16 @@ const deptOptions = ref(undefined);
 const radioSelected = ref(null);
 // 回显数据传值
 const selectUserList = ref([]);
+const defaultProps = ref({
+  children: "children",
+  label: "name",
+});
+
+const checkType = ref({
+  type: String,
+  default: "multiple",
+  required: true,
+});
 
 // 列显隐信息
 const columns = ref([
@@ -119,7 +221,7 @@ const columns = ref([
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
   { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true }
+  { key: 6, label: `创建时间`, visible: true },
 ]);
 
 const data = reactive({
@@ -129,27 +231,21 @@ const data = reactive({
     userName: undefined,
     phonenumber: undefined,
     status: undefined,
-    deptId: undefined
+    deptId: undefined,
   },
 });
 
 const { queryParams } = toRefs(data);
 
-const emit = defineEmits(['handleUserSelect'])
+const emit = defineEmits(["handleUserSelect"]);
 
 /** 组件传值  */
 const props = defineProps({
   // 回显数据传值
   selectValues: {
-    type: [Number , String , Array],
+    type: [Number, String, Array],
     default: null,
-    required: false
-  },
-  // 表格类型
-  checkType: {
-    type: String,
-    default: 'multiple',
-    required: true
+    required: false,
   },
 });
 
@@ -159,56 +255,59 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 /** 根据名称筛选部门树 */
-watch(deptName, val => {
+watch(deptName, (val) => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 
 /** 传值监听 */
-watch(() => props.selectValues, newValue => {
-      if (newValue) {
-        if (typeof newValue === 'number') {
-          radioSelected.value = newValue
-        } else {
-          selectUserList.value = newValue;
-        }
-      }
-    }, {immediate: true}
-);
-
-watch(userList, newValue => {
-      if (newValue.length > 0) {
-        proxy.$nextTick(() => {
-          proxy.$refs.dataTable.clearSelection();
-          selectUserList.value.forEach(key => {
-            proxy.$refs.dataTable.toggleRowSelection(userList.value.find(
-                item => key === item.userId
-            ), true)
-          });
-        });
+watch(
+  () => props.selectValues,
+  (newValue) => {
+    if (newValue) {
+      if (typeof newValue === "number") {
+        radioSelected.value = newValue;
+      } else {
+        selectUserList.value = newValue;
       }
     }
+  },
+  { immediate: true }
 );
 
+watch(userList, (newValue) => {
+  if (newValue.length > 0) {
+    proxy.$nextTick(() => {
+      proxy.$refs.dataTable.clearSelection();
+      selectUserList.value.forEach((key) => {
+        proxy.$refs.dataTable.toggleRowSelection(
+          userList.value.find((item) => key === item.userId),
+          true
+        );
+      });
+    });
+  }
+});
+
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  deptTreeSelect().then(response => {
+  deptTreeSelect().then((response) => {
     deptOptions.value = response.data;
   });
-};
+}
 
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
-  listUser(queryParams.value).then(res => {
+  listUser(queryParams.value).then((res) => {
     loading.value = false;
     userList.value = res.rows;
     total.value = res.total;
   });
-};
+}
 
 /** 保存选中的数据id,row-key就是要指定一个key标识这一行的数据 */
-function getRowKey (row) {
-  return row.userId
+function getRowKey(row) {
+  return row.userId;
 }
 
 /** 节点单击事件 */
@@ -233,17 +332,16 @@ function resetQuery() {
 
 /** 多选框选中数据 */
 function handleMultipleUserSelect(selection) {
-  emit('handleUserSelect', markRaw(selection));
+  emit("handleUserSelect", markRaw(selection));
 }
 
 /** 单选框选中数据 */
 function handleSingleUserSelect(selection) {
   // 点击当前行时,radio同样有选中效果
   radioSelected.value = selection.userId;
-  emit('handleUserSelect', markRaw(selection));
+  emit("handleUserSelect", markRaw(selection));
 }
 
 getDeptTree();
 getList();
 </script>
-
diff --git a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue
index d04f969b..bfed3a69 100644
--- a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue
+++ b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue
@@ -1,625 +1,827 @@
 <template>
-    <div class="app-detailDrawer">
-      <el-drawer v-model="onOpen" :show-close="true" size="80%">
-        <template #header>
-            <h4>流程详情 【{{ title }}】 - 当前进度【{{ jdtitle }}】<span v-if="showjd">
+  <div class="app-detailDrawer">
+    <el-drawer v-model="onOpen" :show-close="true" size="80%">
+      <template #header>
+        <h4>
+          流程详情 【{{ title }}】 - 当前进度【{{ jdtitle }}】<span v-if="showjd">
             - 当前节点【{{ dataOptions.taskName }}】</span
-            ></h4> 
-        </template>
-        <div class="drawer">
-          <div class="drawerLeft">
-            <div class="block containers">
-              <div class="canvas" ref="flowCanvas"></div>
-              <div class="maskLayer" />
-            </div>
-            <el-timeline style="padding: 5px;">
-              <el-timeline-item
-                v-for="(item, index) in flowRecordList"
-                :key="index"
-                :icon="setIcon(item)"
-                :color="setColor(item)"
-              >
-                <p style="font-weight: 700">
-                  {{ getSort(index) }}{{ item.taskName }}{{ item.commentResult }}
-                </p>
-                <el-card style="margin-top: 5px;">
-                  <el-descriptions class="margin-top" :column="1" size="small" border>
-                    <el-descriptions-item
-                      v-if="item.assigneeName"
-                      label-class-name="d-it-label"
-                    >
-                        <template #label>
-                            <div class="my-label"><el-icon><User /></el-icon>办理人</div>
-                        </template>
-                      {{ item.assigneeName }}
-                      <el-tag type="info" size="small">{{ item.deptName }}</el-tag>
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      v-if="item.candidate"
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><UserFilled /></el-icon>候选办理</div>
-                        </template>
-                      {{ item.candidate }}
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      v-if="item.deleteReason"
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><Operation /></el-icon>驳回节点</div>
-                        </template>
-                      {{ getDeleteReason(item.deleteReason) }}
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><Clock /></el-icon>接收时间</div>
-                        </template>
-                      {{ item.startTime }}
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      v-if="item.endTime"
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><Clock /></el-icon>处理时间</div>
-                        </template>
-                      {{ item.endTime }}
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      v-if="item.duration"
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><Timer /></el-icon>处理耗时</div>
-                        </template>
-                      {{ formatDuraTime(item.duration) }}
-                    </el-descriptions-item>
-                    <el-descriptions-item
-                      v-if="item.message"
-                      label-class-name="d-it-label"
-                    >
-                    <template #label>
-                        <div class="my-label"><el-icon><Warning /></el-icon>处理意见</div>
-                        </template>
-                      {{ item.message }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-card>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-          <div class="drawerRight">
-            <el-tabs v-model="activeName" type="card" class="demo-tabs">
-              <el-tab-pane label="单位信息" name="base" v-if="dataOptions.category=='1'">
-                    <el-form label-width="100px" size="small" >
-                      <el-form-item label="单位类型">
-                            <el-tag effect="dark">{{ initData.subDeptTypeName }}</el-tag>
-                        </el-form-item>
-                        <el-form-item label="单位名称">
-                            {{ initData.subDeptName }} <el-tag type="info">{{ parData.subDeptCode }}</el-tag>
-                      </el-form-item>
-                      <el-form-item label="进入场地时间" v-if="dataOptions.category=='1'">
-                            {{ parseTime(parData.useDates, '{y}-{m}-{d}') }}
-                        </el-form-item>
-                        <el-row v-if="dataOptions.category=='1'">
-                            <el-col :span="12">
-                                <el-form-item label="计划开工时间">
-                                    {{ parseTime(parData.startWorkDates, '{y}-{m}-{d}') }}
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="计划完工时间">
-                                    {{ parseTime(parData.endWorkDates, '{y}-{m}-{d}') }}
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-form-item label="营业执照">
-                            <ImagePreview :src="parData.businessLicensePath" :width="120" :height="70"/>
-                        </el-form-item>
-                        <el-form-item label="合同约定范围">
-                            {{ parData.contractInfos }}
-                        </el-form-item>
-                        <el-form-item label="法人身份证">
-                            <ImagePreview :src="parData.subDeptInfos.legalPersonCardImgPos" :width="120" :height="70"/>
-                            <ImagePreview :src="parData.subDeptInfos.legalPersonCardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
-                        </el-form-item>
-                        <el-form-item label="法人姓名">
-                            {{ parData.subDeptInfos.legalPerson }}
-                        </el-form-item>
-                        <el-form-item label="法人身份证号">
-                            {{ parData.subDeptInfos.legalPersonCard }}
-                        </el-form-item>
-                    </el-form>
-                </el-tab-pane>
-                <el-tab-pane label="人员信息" name="users" v-if="dataOptions.category=='1' || dataOptions.category=='2' || dataOptions.category=='3' || dataOptions.category=='4' || dataOptions.category=='5' || dataOptions.category=='6' || dataOptions.category=='8'">
-                    <el-form label-width="100px" size="small" >
-                        <el-form-item label="代理人身份证" v-if="dataOptions.category=='1'">
-                            <ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
-                            <ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
-                        </el-form-item>
-                        <el-form-item label="入场肖像近照" v-if="dataOptions.category=='1'">
-                            <ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
-                        </el-form-item>
-                        <el-form-item label="单位委托证明" v-if="dataOptions.category!='3' && dataOptions.category!='4' && dataOptions.category!='5' && dataOptions.category!='8'">
-                            <ImagePreview :src="initData.subDeptPowerPath" :width="120" :height="70"/>
-                        </el-form-item>
-                        <el-form-item label="委托人姓名" v-if="dataOptions.category=='1'">
-                            {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
-                        </el-form-item>
-                        <el-form-item label="人员姓名" v-if="dataOptions.category!='1'">
-                            {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
-                        </el-form-item>
-                        <el-form-item label="工种岗位" v-if="dataOptions.category!='1'">
-                            {{ initData.craftPostName }}
-                        </el-form-item>
-                        <el-form-item label="工种班组" v-if="dataOptions.category!='1' && dataOptions.category!='2'">
-                            {{ initData.subDeptGroupName }}
-                        </el-form-item>
-                        <el-form-item label="民族" v-if="dataOptions.category!='1'">
-                            {{ initData.userInfos.nation }}
-                        </el-form-item>
-                        <el-form-item label="籍贯" v-if="dataOptions.category!='1'">
-                            {{ initData.userInfos.nativePlace }}
-                        </el-form-item>
-                        <el-form-item label="详细地址" v-if="dataOptions.category!='1'">
-                            {{ initData.userInfos.address }}
-                        </el-form-item>
-                        <el-form-item label="身份证照片" v-if="dataOptions.category!='1'">
-                            <ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
-                            <ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
-                        </el-form-item>
-                        <el-form-item label="入场肖像近照" v-if="dataOptions.category!='1'">
-                          <ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
-                        </el-form-item>
-                        <el-form-item label="紧急联系人" v-if="dataOptions.category!='1'">
-                            {{ initData.userInfos.emergencyContact }} <el-tag type="info">{{ initData.userInfos.contactPhone }}</el-tag>
-                        </el-form-item>
-                        <el-form-item label="开户行名称" v-if="dataOptions.category=='4'">
-                            {{ initData.userInfos.bankName }}
-                        </el-form-item>
-                        <el-form-item label="开户行网点" v-if="dataOptions.category=='4'">
-                          {{ initData.userInfos.bankName }}
-                        </el-form-item>
-                        <el-form-item label="工资银行卡号" v-if="dataOptions.category=='4'">
-                          {{ initData.userInfos.bankName }}
-                        </el-form-item>
-                        <el-form-item label="联系电话">
-                            {{ initData.userPhone }}
-                        </el-form-item>
-                        <el-form-item label="文化程度">
-                            <el-tag effect="dark">{{ initData.degreeGradeName }}</el-tag>
-                        </el-form-item>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="身体健康问题">
-                                    <el-tag effect="dark" :type="initData.illnessStatus==0?'success':'danger'">{{ initData.illnessStatus==0?'无':'有' }}</el-tag>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="严重疾病情况">
-                                    <el-tag effect="dark" :type="initData.supIllnessStatus==0?'success':'danger'">{{ initData.supIllnessStatus==0?'无':'有' }}</el-tag>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-form-item label="安全培训承诺书">
-                            <el-button link type="primary" icon="Link" @click="handleDownloadEduFile(initData.eduFilePath)">点击下载安全培训安全承诺书</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-tab-pane>
-                <el-tab-pane label="视频培训" name="video" v-if="dataOptions.category=='1' || dataOptions.category=='2' || dataOptions.category=='3' || dataOptions.category=='4'">
-                    <el-table :data="userEduVideoList">
-                        <el-table-column label="播放时间" align="center" prop="playDates" width="180">
-                            <template #default="scope">
-                                <span>{{ parseTime(scope.row.playDates, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="播放时长" align="center" prop="playTimes" width="100">
-                            <template #default="scope">
-                                <span>{{ (scope.row.playTimes/1000).toFixed(2)+' 秒' }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="培训名称" align="center" prop="trainTitle" :show-overflow-tooltip="true"/>
-                        <el-table-column label="培训类型" align="center" prop="trainTypeName"/>
-                        <el-table-column label="培训级别" align="center" prop="trainLevelName"/>
-                    </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="考试情况" name="exams" v-if="dataOptions.category=='1' || dataOptions.category=='2' || dataOptions.category=='3' || dataOptions.category=='4'">
-                    <el-row class="task_panel">
-                        <el-col :span="6">
-                            <el-statistic class="statistic_div">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                    <el-icon style="margin-right: 4px; color: #409eff" :size="12">
-                                        <InfoFilled />
-                                    </el-icon>
-                                    <strong>考试结果</strong>
-                                </div>
-                            </template>
-                            </el-statistic>
-                            <div v-if="userEduExamInfos.resStatus == '0'" class="countdown-footer">
-                            <strong style="font-size: 16px; color: #909399; font-weight: 800;">未提交</strong>
-                            </div>
-                            <div v-if="userEduExamInfos.resStatus == '1'" class="countdown-footer">
-                            <strong style="font-size: 16px; color: #67c23a; font-weight: 800;">已通过</strong>
-                            </div>
-                            <div v-if="userEduExamInfos.resStatus == '2'" class="countdown-footer">
-                            <strong style="font-size: 16px; color: #f56c6c; font-weight: 800;">不通过</strong>
-                            </div>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-statistic class="statistic_div">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                <el-icon style="margin-right: 4px; color: #67c23a" :size="12">
-                                    <TrendCharts />
-                                </el-icon>
-                                <strong>考试分数</strong>
-                                </div>
-                            </template>
-                            </el-statistic>
-                            <div class="countdown-footer">
-                            <strong style="font-size: 16px; color: #909399">{{userEduExamInfos.userMark!=null?userEduExamInfos.userMark:'-'}}</strong>
-                            </div>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-statistic class="statistic_div">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                <el-icon style="margin-right: 4px; color: #409eff" :size="12">
-                                    <InfoFilled />
-                                </el-icon>
-                                <strong>答题耗时</strong>
-                                </div>
-                            </template>
-                            </el-statistic>
-                            <div class="countdown-footer">
-                              <strong style="font-size: 16px; color: #909399" v-if="userEduExamInfos.useTimes">{{formatDuraTime(userEduExamInfos.useTimes)}}</strong>
-                              <strong style="font-size: 16px; color: #909399" v-if="!userEduExamInfos.useTimes"> - </strong>
-                            </div>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-statistic class="statistic_div">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                <el-icon style="margin-right: 4px" :size="12">
-                                    <Calendar />
-                                </el-icon>
-                                答题时间
-                                </div>
-                            </template>
-                            </el-statistic>
-                            <div class="countdown-footer">
-                            <strong>{{ parseTime(userEduExamInfos.createTime, "{y}-{m}-{d} {h}:{i}") }}</strong>
-                            </div>
-                        </el-col>
-                    </el-row>
-                    <div class="startExamination">
-                        <ul>
-                            <li v-for="(item,idx) in userEduQuestionList" :key="item.id">
-                            <div class="topicTilte" style="font-weight: bold" ref="topicTilte">
-                                {{ idx + 1 }}、<span class="score">[{{ item.questionType==1?'单选题':(item.questionType==2?'多选题':'判断题')}}]</span>{{ item.questionTitle }}
-                            </div>
-                            <template v-if="item.questionType === 1">
-                                <el-radio-group v-model="item.userAnswer" class="ml-4 Selected_item_radio" style="width: 100%">
-                                <div v-for="(option,ox) in item.questionOption" class="Selected_item">
-                                    <el-radio :label="option.opt" disabled> {{ option.result }} </el-radio>
-                                </div>
-                                </el-radio-group>
-                                <div :class="item.answer == item.userAnswer?'answer':'error'">
-                                <div class="correctAnswer">正确答案：{{ item.answer }}</div>
-                                <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
-                                </div>
-                            </template>
-                            <template v-if="item.questionType === 2">
-                                <el-checkbox-group v-model="item.userAnswerValues" class="ml-4 Selected_item_radio" style="width: 100%">
-                                <div v-for="option in item.questionOption" class="Selected_item">
-                                    <el-checkbox :label="option.opt" disabled> {{ option.result }} </el-checkbox>
-                                </div>
-                                </el-checkbox-group>
-                                <div :class="item.answer == item.userAnswer?'answer':'error'">
-                                <div class="correctAnswer">正确答案：{{ item.answer }}</div>
-                                <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
-                                </div>
-                            </template>
-                            <template v-if="item.questionType === 3">
-                                <el-checkbox-group v-model="item.userAnswerValues" class="ml-4 Selected_item_radio" style="width: 100%">
-                                <div v-for="option in item.questionOption" class="Selected_item">
-                                    <el-checkbox :label="option.opt" disabled> {{ option.result }} </el-checkbox>
-                                </div>
-                                </el-checkbox-group>
-                                <div :class="item.answer == item.userAnswer?'answer':'error'">
-                                <div class="correctAnswer">正确答案：{{ item.answer }}</div>
-                                <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
-                                </div>
-                            </template>
-                            </li>
-                        </ul>
-                        </div>
-                </el-tab-pane>
-            </el-tabs>
+          >
+        </h4>
+      </template>
+      <div class="drawer">
+        <div class="drawerLeft">
+          <div class="block containers">
+            <div class="canvas" ref="flowCanvas"></div>
+            <div class="maskLayer" />
           </div>
+          <el-timeline style="padding: 5px">
+            <el-timeline-item
+              v-for="(item, index) in flowRecordList"
+              :key="index"
+              :icon="setIcon(item)"
+              :color="setColor(item)"
+            >
+              <p style="font-weight: 700">
+                {{ getSort(index) }}{{ item.taskName }}{{ item.commentResult }}
+              </p>
+              <el-card style="margin-top: 5px">
+                <el-descriptions class="margin-top" :column="1" size="small" border>
+                  <el-descriptions-item
+                    v-if="item.assigneeName"
+                    label-class-name="d-it-label"
+                  >
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><User /></el-icon>办理人
+                      </div>
+                    </template>
+                    {{ item.assigneeName }}
+                    <el-tag type="info" size="small">{{ item.deptName }}</el-tag>
+                  </el-descriptions-item>
+                  <el-descriptions-item
+                    v-if="item.candidate"
+                    label-class-name="d-it-label"
+                  >
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><UserFilled /></el-icon>候选办理
+                      </div>
+                    </template>
+                    {{ item.candidate }}
+                  </el-descriptions-item>
+                  <el-descriptions-item
+                    v-if="item.deleteReason"
+                    label-class-name="d-it-label"
+                  >
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><Operation /></el-icon>驳回节点
+                      </div>
+                    </template>
+                    {{ getDeleteReason(item.deleteReason) }}
+                  </el-descriptions-item>
+                  <el-descriptions-item label-class-name="d-it-label">
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><Clock /></el-icon>接收时间
+                      </div>
+                    </template>
+                    {{ item.startTime }}
+                  </el-descriptions-item>
+                  <el-descriptions-item v-if="item.endTime" label-class-name="d-it-label">
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><Clock /></el-icon>处理时间
+                      </div>
+                    </template>
+                    {{ item.endTime }}
+                  </el-descriptions-item>
+                  <el-descriptions-item
+                    v-if="item.duration"
+                    label-class-name="d-it-label"
+                  >
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><Timer /></el-icon>处理耗时
+                      </div>
+                    </template>
+                    {{ formatDuraTime(item.duration) }}
+                  </el-descriptions-item>
+                  <el-descriptions-item v-if="item.message" label-class-name="d-it-label">
+                    <template #label>
+                      <div class="my-label">
+                        <el-icon><Warning /></el-icon>处理意见
+                      </div>
+                    </template>
+                    {{ item.message }}
+                  </el-descriptions-item>
+                </el-descriptions>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-      </el-drawer>
-    </div>
-  </template>
-  
-  <script setup name="myProcessDrawer">
-  import { flowXmlAndNode } from "@/api/flowable/definition";
-  import { CustomViewer as BpmnViewer } from "@/components/Process/common";
-  import { Clock, Select, CloseBold } from '@element-plus/icons-vue'
-  import {
-    findCommentByProcInsId,
-  } from "@/api/flowable/businessKey";
-  import { getProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
-  import { getProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
-  import { getBusExamUserLast } from "@/api/manage/busExamUser";
-  import { getBusTrainingVideoUserLast } from "@/api/manage/busTrainingVideoUser";
-  
-  const { proxy } = getCurrentInstance();
-  
-    const onOpen = ref(false);
-    const bpmnViewer = ref(null);
-    const title = ref("");
-    const jdtitle = ref("");
-    const showjd = ref(false);
-    const dataOptions = ref({});
-    const activeName = ref("");
-    const flowRecordList = ref([]);
-    const userEduVideoList = ref([]);
-    const userEduExamInfos = ref({});
-    const userEduQuestionList = ref([]);
-    const data = reactive({
-        parData: {
-            subDeptInfos:{}
-        },
-        initData: {
-          userInfos: {}
-        },
+        <div class="drawerRight">
+          <el-tabs v-model="activeName" type="card" class="demo-tabs">
+            <el-tab-pane label="单位信息" name="base" v-if="dataOptions.category == '1'">
+              <el-form label-width="100px" size="small">
+                <el-form-item label="单位类型">
+                  <el-tag effect="dark">{{ initData.subDeptTypeName }}</el-tag>
+                </el-form-item>
+                <el-form-item label="单位名称">
+                  {{ initData.subDeptName }}
+                  <el-tag type="info">{{ parData.subDeptCode }}</el-tag>
+                </el-form-item>
+                <el-form-item label="进入场地时间" v-if="dataOptions.category == '1'">
+                  {{ parseTime(parData.useDates, "{y}-{m}-{d}") }}
+                </el-form-item>
+                <el-row v-if="dataOptions.category == '1'">
+                  <el-col :span="12">
+                    <el-form-item label="计划开工时间">
+                      {{ parseTime(parData.startWorkDates, "{y}-{m}-{d}") }}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="计划完工时间">
+                      {{ parseTime(parData.endWorkDates, "{y}-{m}-{d}") }}
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="营业执照">
+                  <ImagePreview
+                    :src="parData.businessLicensePath"
+                    :width="120"
+                    :height="70"
+                  />
+                </el-form-item>
+                <el-form-item label="合同约定范围">
+                  {{ parData.contractInfos }}
+                </el-form-item>
+                <el-form-item label="法人身份证">
+                  <ImagePreview
+                    :src="parData.subDeptInfos.legalPersonCardImgPos"
+                    :width="120"
+                    :height="70"
+                  />
+                  <ImagePreview
+                    :src="parData.subDeptInfos.legalPersonCardImgInv"
+                    :width="120"
+                    :height="70"
+                    style="margin-left: 20px"
+                  />
+                </el-form-item>
+                <el-form-item label="法人姓名">
+                  {{ parData.subDeptInfos.legalPerson }}
+                </el-form-item>
+                <el-form-item label="法人身份证号">
+                  {{ parData.subDeptInfos.legalPersonCard }}
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane
+              label="人员信息"
+              name="users"
+              v-if="
+                dataOptions.category == '1' ||
+                dataOptions.category == '2' ||
+                dataOptions.category == '3' ||
+                dataOptions.category == '4' ||
+                dataOptions.category == '5' ||
+                dataOptions.category == '6' ||
+                dataOptions.category == '8'
+              "
+            >
+              <el-form label-width="100px" size="small">
+                <el-form-item label="代理人身份证" v-if="dataOptions.category == '1'">
+                  <ImagePreview
+                    :src="initData.userInfos.cardImgPos"
+                    :width="120"
+                    :height="70"
+                  />
+                  <ImagePreview
+                    :src="initData.userInfos.cardImgInv"
+                    :width="120"
+                    :height="70"
+                    style="margin-left: 20px"
+                  />
+                </el-form-item>
+                <el-form-item label="入场肖像近照" v-if="dataOptions.category == '1'">
+                  <ImagePreview :src="initData.userPicture" :width="120" :height="70" />
+                </el-form-item>
+                <el-form-item
+                  label="单位委托证明"
+                  v-if="
+                    dataOptions.category != '3' &&
+                    dataOptions.category != '4' &&
+                    dataOptions.category != '5' &&
+                    dataOptions.category != '8'
+                  "
+                >
+                  <ImagePreview
+                    :src="initData.subDeptPowerPath"
+                    :width="120"
+                    :height="70"
+                  />
+                </el-form-item>
+                <el-form-item label="委托人姓名" v-if="dataOptions.category == '1'">
+                  {{ initData.userName }}
+                  <el-tag type="info">{{ initData.cardCode }}</el-tag>
+                </el-form-item>
+                <el-form-item label="分包单位" v-if="dataOptions.category != '1'">
+                  {{ initData.subDeptName }}
+                </el-form-item>
+                <el-form-item label="人员姓名" v-if="dataOptions.category != '1'">
+                  {{ initData.userName }}
+                  <el-tag type="info">{{ initData.cardCode }}</el-tag>
+                </el-form-item>
+                <el-form-item label="工种岗位" v-if="dataOptions.category != '1'">
+                  {{ initData.craftPostName }}
+                </el-form-item>
+                <el-form-item
+                  label="工种班组"
+                  v-if="dataOptions.category != '1' && dataOptions.category != '2'"
+                >
+                  {{ initData.subDeptGroupName }}
+                </el-form-item>
+                <el-form-item label="民族" v-if="dataOptions.category != '1'">
+                  {{ initData.userInfos.nation }}
+                </el-form-item>
+                <el-form-item label="籍贯" v-if="dataOptions.category != '1'">
+                  {{ initData.userInfos.nativePlace }}
+                </el-form-item>
+                <el-form-item label="详细地址" v-if="dataOptions.category != '1'">
+                  {{ initData.userInfos.address }}
+                </el-form-item>
+                <el-form-item label="身份证照片" v-if="dataOptions.category != '1'">
+                  <ImagePreview
+                    :src="initData.userInfos.cardImgPos"
+                    :width="120"
+                    :height="70"
+                  />
+                  <ImagePreview
+                    :src="initData.userInfos.cardImgInv"
+                    :width="120"
+                    :height="70"
+                    style="margin-left: 20px"
+                  />
+                </el-form-item>
+                <el-form-item label="入场肖像近照" v-if="dataOptions.category != '1'">
+                  <ImagePreview :src="initData.userPicture" :width="120" :height="70" />
+                </el-form-item>
+                <el-form-item label="紧急联系人" v-if="dataOptions.category != '1'">
+                  {{ initData.userInfos.emergencyContact }}
+                  <el-tag type="info">{{ initData.userInfos.contactPhone }}</el-tag>
+                </el-form-item>
+                <el-form-item label="开户行名称" v-if="dataOptions.category == '4'">
+                  {{ initData.userInfos.bankName }}
+                </el-form-item>
+                <el-form-item label="开户行网点" v-if="dataOptions.category == '4'">
+                  {{ initData.userInfos.bankName }}
+                </el-form-item>
+                <el-form-item label="工资银行卡号" v-if="dataOptions.category == '4'">
+                  {{ initData.userInfos.bankName }}
+                </el-form-item>
+                <el-form-item label="联系电话">
+                  {{ initData.userPhone }}
+                </el-form-item>
+                <el-form-item label="文化程度">
+                  <el-tag effect="dark">{{ initData.degreeGradeName }}</el-tag>
+                </el-form-item>
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label="身体健康问题">
+                      <el-tag
+                        effect="dark"
+                        :type="initData.illnessStatus == 0 ? 'success' : 'danger'"
+                        >{{ initData.illnessStatus == 0 ? "无" : "有" }}</el-tag
+                      >
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="严重疾病情况">
+                      <el-tag
+                        effect="dark"
+                        :type="initData.supIllnessStatus == 0 ? 'success' : 'danger'"
+                        >{{ initData.supIllnessStatus == 0 ? "无" : "有" }}</el-tag
+                      >
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="安全培训承诺书">
+                  <el-button
+                    link
+                    type="primary"
+                    icon="Link"
+                    @click="handleDownloadEduFile(initData.eduFilePath)"
+                    >点击下载安全培训安全承诺书</el-button
+                  >
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane
+              label="视频培训"
+              name="video"
+              v-if="
+                dataOptions.category == '1' ||
+                dataOptions.category == '2' ||
+                dataOptions.category == '3' ||
+                dataOptions.category == '4'
+              "
+            >
+              <el-table :data="userEduVideoList">
+                <el-table-column
+                  label="播放时间"
+                  align="center"
+                  prop="playDates"
+                  width="180"
+                >
+                  <template #default="scope">
+                    <span>{{
+                      parseTime(scope.row.playDates, "{y}-{m}-{d} {h}:{i}:{s}")
+                    }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="播放时长"
+                  align="center"
+                  prop="playTimes"
+                  width="100"
+                >
+                  <template #default="scope">
+                    <span>{{ (scope.row.playTimes / 1000).toFixed(2) + " 秒" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="培训名称"
+                  align="center"
+                  prop="trainTitle"
+                  :show-overflow-tooltip="true"
+                />
+                <el-table-column label="培训类型" align="center" prop="trainTypeName" />
+                <el-table-column label="培训级别" align="center" prop="trainLevelName" />
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane
+              label="考试情况"
+              name="exams"
+              v-if="
+                dataOptions.category == '1' ||
+                dataOptions.category == '2' ||
+                dataOptions.category == '3' ||
+                dataOptions.category == '4'
+              "
+            >
+              <el-row class="task_panel">
+                <el-col :span="6">
+                  <el-statistic class="statistic_div">
+                    <template #title>
+                      <div style="display: inline-flex; align-items: center">
+                        <el-icon style="margin-right: 4px; color: #409eff" :size="12">
+                          <InfoFilled />
+                        </el-icon>
+                        <strong>考试结果</strong>
+                      </div>
+                    </template>
+                  </el-statistic>
+                  <div v-if="userEduExamInfos.resStatus == '0'" class="countdown-footer">
+                    <strong style="font-size: 16px; color: #909399; font-weight: 800"
+                      >未提交</strong
+                    >
+                  </div>
+                  <div v-if="userEduExamInfos.resStatus == '1'" class="countdown-footer">
+                    <strong style="font-size: 16px; color: #67c23a; font-weight: 800"
+                      >已通过</strong
+                    >
+                  </div>
+                  <div v-if="userEduExamInfos.resStatus == '2'" class="countdown-footer">
+                    <strong style="font-size: 16px; color: #f56c6c; font-weight: 800"
+                      >不通过</strong
+                    >
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <el-statistic class="statistic_div">
+                    <template #title>
+                      <div style="display: inline-flex; align-items: center">
+                        <el-icon style="margin-right: 4px; color: #67c23a" :size="12">
+                          <TrendCharts />
+                        </el-icon>
+                        <strong>考试分数</strong>
+                      </div>
+                    </template>
+                  </el-statistic>
+                  <div class="countdown-footer">
+                    <strong style="font-size: 16px; color: #909399">{{
+                      userEduExamInfos.userMark != null ? userEduExamInfos.userMark : "-"
+                    }}</strong>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <el-statistic class="statistic_div">
+                    <template #title>
+                      <div style="display: inline-flex; align-items: center">
+                        <el-icon style="margin-right: 4px; color: #409eff" :size="12">
+                          <InfoFilled />
+                        </el-icon>
+                        <strong>答题耗时</strong>
+                      </div>
+                    </template>
+                  </el-statistic>
+                  <div class="countdown-footer">
+                    <strong
+                      style="font-size: 16px; color: #909399"
+                      v-if="userEduExamInfos.useTimes"
+                      >{{ formatDuraTime(userEduExamInfos.useTimes) }}</strong
+                    >
+                    <strong
+                      style="font-size: 16px; color: #909399"
+                      v-if="!userEduExamInfos.useTimes"
+                    >
+                      -
+                    </strong>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <el-statistic class="statistic_div">
+                    <template #title>
+                      <div style="display: inline-flex; align-items: center">
+                        <el-icon style="margin-right: 4px" :size="12">
+                          <Calendar />
+                        </el-icon>
+                        答题时间
+                      </div>
+                    </template>
+                  </el-statistic>
+                  <div class="countdown-footer">
+                    <strong>{{
+                      parseTime(userEduExamInfos.createTime, "{y}-{m}-{d} {h}:{i}")
+                    }}</strong>
+                  </div>
+                </el-col>
+              </el-row>
+              <div class="startExamination">
+                <ul>
+                  <li v-for="(item, idx) in userEduQuestionList" :key="item.id">
+                    <div class="topicTilte" style="font-weight: bold" ref="topicTilte">
+                      {{ idx + 1 }}、<span class="score"
+                        >[{{
+                          item.questionType == 1
+                            ? "单选题"
+                            : item.questionType == 2
+                            ? "多选题"
+                            : "判断题"
+                        }}]</span
+                      >{{ item.questionTitle }}
+                    </div>
+                    <template v-if="item.questionType === 1">
+                      <el-radio-group
+                        v-model="item.userAnswer"
+                        class="ml-4 Selected_item_radio"
+                        style="width: 100%"
+                      >
+                        <div
+                          v-for="(option, ox) in item.questionOption"
+                          class="Selected_item"
+                        >
+                          <el-radio :label="option.opt" disabled>
+                            {{ option.result }}
+                          </el-radio>
+                        </div>
+                      </el-radio-group>
+                      <div :class="item.answer == item.userAnswer ? 'answer' : 'error'">
+                        <div class="correctAnswer">正确答案：{{ item.answer }}</div>
+                        <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
+                      </div>
+                    </template>
+                    <template v-if="item.questionType === 2">
+                      <el-checkbox-group
+                        v-model="item.userAnswerValues"
+                        class="ml-4 Selected_item_radio"
+                        style="width: 100%"
+                      >
+                        <div v-for="option in item.questionOption" class="Selected_item">
+                          <el-checkbox :label="option.opt" disabled>
+                            {{ option.result }}
+                          </el-checkbox>
+                        </div>
+                      </el-checkbox-group>
+                      <div :class="item.answer == item.userAnswer ? 'answer' : 'error'">
+                        <div class="correctAnswer">正确答案：{{ item.answer }}</div>
+                        <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
+                      </div>
+                    </template>
+                    <template v-if="item.questionType === 3">
+                      <el-checkbox-group
+                        v-model="item.userAnswerValues"
+                        class="ml-4 Selected_item_radio"
+                        style="width: 100%"
+                      >
+                        <div v-for="option in item.questionOption" class="Selected_item">
+                          <el-checkbox :label="option.opt" disabled>
+                            {{ option.result }}
+                          </el-checkbox>
+                        </div>
+                      </el-checkbox-group>
+                      <div :class="item.answer == item.userAnswer ? 'answer' : 'error'">
+                        <div class="correctAnswer">正确答案：{{ item.answer }}</div>
+                        <div class="testAnswers">试卷答案：{{ item.userAnswer }}</div>
+                      </div>
+                    </template>
+                  </li>
+                </ul>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup name="myProcessDrawer">
+import { flowXmlAndNode } from "@/api/flowable/definition";
+import { CustomViewer as BpmnViewer } from "@/components/Process/common";
+import { Clock, Select, CloseBold } from "@element-plus/icons-vue";
+import { findCommentByProcInsId } from "@/api/flowable/businessKey";
+import { getProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
+import { getProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
+import { getBusExamUserLast } from "@/api/manage/busExamUser";
+import { getBusTrainingVideoUserLast } from "@/api/manage/busTrainingVideoUser";
+
+const { proxy } = getCurrentInstance();
+
+const onOpen = ref(false);
+const bpmnViewer = ref(null);
+const title = ref("");
+const jdtitle = ref("");
+const showjd = ref(false);
+const dataOptions = ref({});
+const activeName = ref("");
+const flowRecordList = ref([]);
+const userEduVideoList = ref([]);
+const userEduExamInfos = ref({});
+const userEduQuestionList = ref([]);
+const data = reactive({
+  parData: {
+    subDeptInfos: {},
+  },
+  initData: {
+    userInfos: {},
+  },
+});
+
+const { parData, initData } = toRefs(data);
+
+/** 获取节点图标 */
+const setIcon = (row) => {
+  if (row.endTime) {
+    if (row.commentResult == "驳回") {
+      return CloseBold;
+    } else {
+      return Select;
+    }
+  } else {
+    return Clock;
+  }
+};
+
+/** 获取节点颜色 */
+const setColor = (row) => {
+  if (row.endTime) {
+    if (row.commentResult == "驳回") {
+      return "#f56c6c";
+    } else {
+      return "#2bc418";
+    }
+  } else {
+    return "#409eff";
+  }
+};
+
+/** 获取节点排序 */
+const getSort = (i) => {
+  let num = flowRecordList.value.length - i;
+  if (num < 10) {
+    num = "0" + num;
+  }
+  return num + ". ";
+};
+
+const doCanel = () => {
+  onOpen.value = false;
+};
+
+/** 显示流程详情 */
+const show = (options) => {
+  dataOptions.value = options;
+  title.value = options.procDefName;
+  onOpen.value = true;
+  showjd.value = false;
+  if (options.finishTime == null) {
+    jdtitle.value = "进行中";
+    showjd.value = true;
+  } else if (options.finishTime != null && options.assigneeId == null) {
+    jdtitle.value = "已终止";
+  } else {
+    jdtitle.value = "已完成";
+  }
+  activeName.value = "users";
+  initFormValues();
+  getFlowRecordList(options.procInsId, options.deployId);
+  flowXmlAndNode({ procInsId: options.procInsId, deployId: options.deployId }).then(
+    (res) => {
+      initFlowImage(res.data);
+    }
+  );
+};
+
+/** 初始化工作流 */
+const initFlowImage = async (data) => {
+  try {
+    bpmnViewer.value && bpmnViewer.value.destroy();
+    bpmnViewer.value = new BpmnViewer({
+      container: proxy.$refs.flowCanvas,
+      height: "90px",
     });
-
-    const { parData, initData } = toRefs(data);
-
-    /** 获取节点图标 */
-    const setIcon = (row) => {
-    if (row.endTime) {
-        if (row.commentResult == "驳回") {
-        return CloseBold;
-        } else {
-        return Select;
-        }
-    } else {
-        return Clock;
+    await bpmnViewer.value.importXML(data.xmlData);
+    // 自适应
+    bpmnViewer.value.get("canvas").zoom("fit-viewport", "auto");
+    // 流程线高亮设置
+    if (data.nodeData !== undefined && data.nodeData.length > 0) {
+      await fillColor(data.nodeData);
     }
-    };
+  } catch (err) {
+    console.error(err.message, err.warnings);
+  }
+};
 
-    /** 获取节点颜色 */
-    const setColor = (row) => {
-    if (row.endTime) {
-        if (row.commentResult == "驳回") {
-        return "#f56c6c";
-        } else {
-        return "#2bc418";
+/** 获取流程节点 */
+const getFlowRecordList = (procInsId, deployId) => {
+  const params = { procInsId: procInsId };
+  findCommentByProcInsId(params)
+    .then((res) => {
+      flowRecordList.value = res.data;
+    })
+    .catch((res) => {
+      console.error("数据异常，请联系管理员...");
+    });
+};
+
+/** 获取表单数据 */
+const initFormValues = () => {
+  let category = parseInt(dataOptions.value.category);
+  if (
+    category == 1 ||
+    category == 2 ||
+    category == 3 ||
+    category == 4 ||
+    category == 5 ||
+    category == 6 ||
+    category == 8
+  ) {
+    getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then((res) => {
+      if (res.data.userInfos) {
+        res.data.userInfos = JSON.parse(res.data.userInfos);
+      }
+      initData.value = res.data;
+      getProProjectInfoSubdepts(res.data.subDeptId).then((parRes) => {
+        if (parRes.data.subDeptInfos) {
+          parRes.data.subDeptInfos = JSON.parse(parRes.data.subDeptInfos);
         }
-    } else {
-        return "#409eff";
-    }
-    };
-  
-    /** 获取节点排序 */
-      const getSort = (i) => {
-        let num = flowRecordList.value.length - i;
-        if (num < 10) {
-          num = "0" + num;
-        }
-        return num + ". ";
-      };
-  
-      const doCanel = () => {
-        onOpen.value = false;
-      };
-  
-      /** 显示流程详情 */
-      const show = (options) => {
-        dataOptions.value = options;
-        title.value = options.procDefName;
-        onOpen.value = true;
-        showjd.value = false;
-        if (options.finishTime == null) {
-          jdtitle.value = "进行中";
-          showjd.value = true;
-        } else if (options.finishTime!= null && options.assigneeId == null) {
-          jdtitle.value = "已终止";
-        } else {
-          jdtitle.value = "已完成";
-        }
-        activeName.value = "users";
-        initFormValues();
-        getFlowRecordList(options.procInsId, options.deployId);
-        flowXmlAndNode({ procInsId: options.procInsId, deployId: options.deployId }).then(
-          (res) => {
-            initFlowImage(res.data);
+        parData.value = parRes.data;
+      });
+    });
+    findEduVideos();
+    findEduExams();
+  }
+};
+
+/** 用户视频培训 */
+function findEduVideos() {
+  getBusTrainingVideoUserLast(
+    dataOptions.value.startProId,
+    dataOptions.value.startUserId
+  ).then((res) => {
+    userEduVideoList.value = res.data || [];
+  });
+}
+
+/** 用户考试情况 */
+function findEduExams() {
+  getBusExamUserLast(dataOptions.value.startProId, dataOptions.value.startUserId).then(
+    (res) => {
+      if (res.code == 200 && res.data) {
+        userEduExamInfos.value = res.data;
+        let list = res.data.busExamUserResultList;
+        list.forEach((item) => {
+          if (item.questionType === 2) {
+            if (item.userAnswer == null) {
+              item.userAnswer = "";
+            }
+            item.userAnswerValues = item.userAnswer.split(",");
           }
-        );
-      };
-  
-      /** 初始化工作流 */
-      const initFlowImage = async (data) => {
-        try {
-            bpmnViewer.value && bpmnViewer.value.destroy();
-            bpmnViewer.value = new BpmnViewer({
-            container: proxy.$refs.flowCanvas,
-            height: '90px',
-            }); 
-            await bpmnViewer.value.importXML(data.xmlData);
-          // 自适应
-          bpmnViewer.value.get("canvas").zoom("fit-viewport", "auto");
-          // 流程线高亮设置
-            if (data.nodeData !== undefined && data.nodeData.length > 0) {
-               await fillColor(data.nodeData);
-            }
-        } catch (err) {
-          console.error(err.message, err.warnings);
-        }
-      };
-  
-      /** 获取流程节点 */
-      const getFlowRecordList = (procInsId, deployId) => {
-        const params = { procInsId: procInsId };
-        findCommentByProcInsId(params)
-         .then((res) => {
-            flowRecordList.value = res.data;
-          })
-         .catch((res) => {
-            console.error("数据异常，请联系管理员...");
-          });
-      };
-  
-      /** 获取表单数据 */
-      const initFormValues = () => {
-        let category = parseInt(dataOptions.value.category);
-        if(category==1 || category==2 || category==3 || category==4 || category==5 || category==6 || category==8){
-            getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then(res =>{
-                if(res.data.userInfos){
-                    res.data.userInfos = JSON.parse(res.data.userInfos);
-                }
-                initData.value = res.data ;
-                getProProjectInfoSubdepts(res.data.subDeptId).then(parRes =>{
-                    if(parRes.data.subDeptInfos){
-                        parRes.data.subDeptInfos = JSON.parse(parRes.data.subDeptInfos);
-                    }
-                    parData.value = parRes.data;
-                });
-            });
-            findEduVideos();
-            findEduExams();
-        }
-      };
-
-      /** 用户视频培训 */ 
-      function findEduVideos(){
-        getBusTrainingVideoUserLast(dataOptions.value.startProId, dataOptions.value.startUserId).then(res =>{
-            userEduVideoList.value = res.data||[]
+          item.questionOption = JSON.parse(item.questionOption);
         });
+        userEduQuestionList.value = list;
       }
+    }
+  );
+}
 
-      /** 用户考试情况 */ 
-      function findEduExams(){
-        getBusExamUserLast(dataOptions.value.startProId, dataOptions.value.startUserId).then(res =>{
-            if(res.code==200 && res.data){
-                userEduExamInfos.value = res.data;
-                let list = res.data.busExamUserResultList;
-                list.forEach(item => {
-                    if(item.questionType===2){
-                        if(item.userAnswer==null){
-                            item.userAnswer = "";
-                        }
-                        item.userAnswerValues = item.userAnswer.split(',');
-                    }
-                    item.questionOption = JSON.parse(item.questionOption);
-                });
-                userEduQuestionList.value = list;
-            }
-        });
-      }
+/** 下载培训承诺书 */
+function handleDownloadEduFile(filePath) {
+  proxy.$download.resource(filePath);
+}
 
-      /** 下载培训承诺书 */ 
-      function handleDownloadEduFile(filePath){
-        proxy.$download.resource(filePath);
-      };
-  
-      /** 设置高亮颜色的 */ 
+/** 设置高亮颜色的 */
 function fillColor(nodeData) {
-    const canvas = bpmnViewer.value.get('canvas')
-  bpmnViewer.value.getDefinitions().rootElements[0].flowElements.forEach(n => {
-    const completeTask = nodeData.find(m => m.key === n.id)
-    const todoTask = nodeData.find(m => !m.completed)
-    const endTask = nodeData[nodeData.length - 1]
-    if (n.$type === 'bpmn:UserTask') {
+  const canvas = bpmnViewer.value.get("canvas");
+  bpmnViewer.value.getDefinitions().rootElements[0].flowElements.forEach((n) => {
+    const completeTask = nodeData.find((m) => m.key === n.id);
+    const todoTask = nodeData.find((m) => !m.completed);
+    const endTask = nodeData[nodeData.length - 1];
+    if (n.$type === "bpmn:UserTask") {
       if (completeTask) {
-        canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-        n.outgoing?.forEach(nn => {
-          const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
+        canvas.addMarker(n.id, completeTask.completed ? "highlight" : "highlight-todo");
+        n.outgoing?.forEach((nn) => {
+          const targetTask = nodeData.find((m) => m.key === nn.targetRef.id);
           if (targetTask) {
-            if (todoTask && completeTask.key === todoTask.key && !todoTask.completed){
-              canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo')
-              canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo')
-            }else {
-              canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-              canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+            if (todoTask && completeTask.key === todoTask.key && !todoTask.completed) {
+              canvas.addMarker(
+                nn.id,
+                todoTask.completed ? "highlight" : "highlight-todo"
+              );
+              canvas.addMarker(
+                nn.targetRef.id,
+                todoTask.completed ? "highlight" : "highlight-todo"
+              );
+            } else {
+              canvas.addMarker(
+                nn.id,
+                targetTask.completed ? "highlight" : "highlight-todo"
+              );
+              canvas.addMarker(
+                nn.targetRef.id,
+                targetTask.completed ? "highlight" : "highlight-todo"
+              );
             }
           }
-        })
+        });
       }
     }
     // 排他网关
-    else if (n.$type === 'bpmn:ExclusiveGateway') {
+    else if (n.$type === "bpmn:ExclusiveGateway") {
       if (completeTask) {
-        canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-        n.outgoing?.forEach(nn => {
-          const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
+        canvas.addMarker(n.id, completeTask.completed ? "highlight" : "highlight-todo");
+        n.outgoing?.forEach((nn) => {
+          const targetTask = nodeData.find((m) => m.key === nn.targetRef.id);
           if (targetTask) {
-
-            canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-            canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+            canvas.addMarker(
+              nn.id,
+              targetTask.completed ? "highlight" : "highlight-todo"
+            );
+            canvas.addMarker(
+              nn.targetRef.id,
+              targetTask.completed ? "highlight" : "highlight-todo"
+            );
           }
-        })
+        });
       }
     }
     // 并行网关
-    else if (n.$type === 'bpmn:ParallelGateway') {
+    else if (n.$type === "bpmn:ParallelGateway") {
       if (completeTask) {
-        canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-        n.outgoing?.forEach(nn => {
-          const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
+        canvas.addMarker(n.id, completeTask.completed ? "highlight" : "highlight-todo");
+        n.outgoing?.forEach((nn) => {
+          const targetTask = nodeData.find((m) => m.key === nn.targetRef.id);
           if (targetTask) {
-            canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-            canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+            canvas.addMarker(
+              nn.id,
+              targetTask.completed ? "highlight" : "highlight-todo"
+            );
+            canvas.addMarker(
+              nn.targetRef.id,
+              targetTask.completed ? "highlight" : "highlight-todo"
+            );
           }
-        })
+        });
       }
-    }
-    else if (n.$type === 'bpmn:StartEvent') {
-      n.outgoing.forEach(nn => {
-        const completeTask = nodeData.find(m => m.key === nn.targetRef.id)
+    } else if (n.$type === "bpmn:StartEvent") {
+      n.outgoing.forEach((nn) => {
+        const completeTask = nodeData.find((m) => m.key === nn.targetRef.id);
         if (completeTask) {
-          canvas.addMarker(nn.id, 'highlight')
-          canvas.addMarker(n.id, 'highlight')
+          canvas.addMarker(nn.id, "highlight");
+          canvas.addMarker(n.id, "highlight");
           return;
         }
-      })
-    }
-    else if (n.$type === 'bpmn:EndEvent') {
+      });
+    } else if (n.$type === "bpmn:EndEvent") {
       if (endTask.key === n.id && endTask.completed) {
-        canvas.addMarker(n.id, 'highlight')
+        canvas.addMarker(n.id, "highlight");
         return;
       }
     }
-  })
+  });
 }
 
-    /** 获取审批节点 */ 
-    const getDeleteReason = (val) => {
-      val = val.replace("Change activity to ", "");
-      let flowRecordList = this.flowRecordList;
-      for (let i = 0; i < flowRecordList.length; i++) {
-        if (flowRecordList[i].taskDefKey == val) {
-          return "驳回至" + flowRecordList[i].taskName;
-        }
-      }
-    };
+/** 获取审批节点 */
+const getDeleteReason = (val) => {
+  val = val.replace("Change activity to ", "");
+  let flowRecordList = this.flowRecordList;
+  for (let i = 0; i < flowRecordList.length; i++) {
+    if (flowRecordList[i].taskDefKey == val) {
+      return "驳回至" + flowRecordList[i].taskName;
+    }
+  }
+};
 
-    /** 暴露组件 */
-    defineExpose({
-        show
-    });
+/** 暴露组件 */
+defineExpose({
+  show,
+});
 </script>
 <style lang="scss">
 .app-detailDrawer {
-  .el-drawer__header{
+  .el-drawer__header {
     margin-bottom: 0 !important;
   }
   .drawer {
@@ -646,14 +848,14 @@ function fillColor(nodeData) {
         z-index: 9999;
         top: 77px;
       }
-      .el-timeline-item{
-        .el-timeline-item__node{
-            width: 20px;
-            height: 20px;
-            margin-top: -4px;
-            .el-timeline-item__icon{
-                font-size: 16px !important;
-            }
+      .el-timeline-item {
+        .el-timeline-item__node {
+          width: 20px;
+          height: 20px;
+          margin-top: -4px;
+          .el-timeline-item__icon {
+            font-size: 16px !important;
+          }
         }
       }
     }
@@ -668,9 +870,9 @@ function fillColor(nodeData) {
         width: 100%;
         overflow: hidden;
       }
-      .el-form-item__content{
-        .el-tag--info{
-            margin-left: 5px;
+      .el-form-item__content {
+        .el-tag--info {
+          margin-left: 5px;
         }
       }
     }
@@ -740,21 +942,21 @@ function fillColor(nodeData) {
     }
   }
 }
-.mytags{
-  float:left;
+.mytags {
+  float: left;
   margin-right: 6px;
 }
-.d-it-label{
+.d-it-label {
   width: 150px;
-  .my-label{
+  .my-label {
     display: flex;
     align-items: center;
-    .el-icon{
-        margin-right: 5px;
+    .el-icon {
+      margin-right: 5px;
     }
   }
 }
-.el-divider__text{
+.el-divider__text {
   color: #409eff;
   font-weight: 800;
 }
@@ -863,9 +1065,9 @@ function fillColor(nodeData) {
   }
 }
 .el-alert {
-	margin: 20px 0 0;
+  margin: 20px 0 0;
 }
 .el-alert:first-child {
-	margin: 0;
+  margin: 0;
 }
-</style>    
\ No newline at end of file
+</style>
diff --git a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue
index 51f390e0..dbb107d4 100644
--- a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue
+++ b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue
@@ -150,6 +150,9 @@
                         <el-form-item label="委托人姓名" v-if="dataOptions.category=='1'">
                             {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
                         </el-form-item>
+                        <el-form-item label="分包单位" v-if="dataOptions.category != '1'">
+                          {{ initData.subDeptName }}
+                        </el-form-item>
                         <el-form-item label="人员姓名" v-if="dataOptions.category!='1'">
                             {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
                         </el-form-item>