From ec162ea3dac90eca29068e9fe08c597b3a3607d7 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 27 Jun 2024 15:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/bpm/form/editor/index.vue    |   1 -
 src/views/system/bpm/form/index.vue           |  47 ++-
 .../detail/ProcessInstanceTaskList.vue        | 381 +++++++++---------
 .../system/bpm/task/myInstance/index.vue      |   3 -
 4 files changed, 217 insertions(+), 215 deletions(-)

diff --git a/src/views/system/bpm/form/editor/index.vue b/src/views/system/bpm/form/editor/index.vue
index a472f4a1..49a5e077 100644
--- a/src/views/system/bpm/form/editor/index.vue
+++ b/src/views/system/bpm/form/editor/index.vue
@@ -51,7 +51,6 @@
 import { onMounted, ref, reactive } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import FcDesigner from '@form-create/designer'
-import { useI18n } from '@/hooks/web/useI18n'
 import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate'
 import { useTagsViewStore } from '@/stores/modules/tagsView'
 import { useFormCreateDesigner } from '@/components/FormCreate'
diff --git a/src/views/system/bpm/form/index.vue b/src/views/system/bpm/form/index.vue
index 67203068..7c7a4f8b 100644
--- a/src/views/system/bpm/form/index.vue
+++ b/src/views/system/bpm/form/index.vue
@@ -17,8 +17,8 @@
         <!--表格-->
         <Table ref='tableRef'></Table>
         <!-- 预览表单对话框 -->
-        <el-dialog :title='render.title' v-model='render.visible' width='60%' append-to-body>
-            <v-form-render :form-json='formJson' :form-data='formData' :option-data='optionData' ref='vfRenderRef' />
+        <el-dialog v-model="detailVisible" title="表单详情" width="800">
+            <form-create :option="detailData.option" :rule="detailData.rule" />
         </el-dialog>
     </div>
 </template>
@@ -31,6 +31,7 @@ import { ElMessage } from 'element-plus'
 import { onMounted, provide, ref, reactive,nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import { deleteForm, getById } from '@/api/bpm-boot/form'
+import { setConfAndFields2 } from '@/utils/formCreate'
 
 
 const { push } = useRouter()
@@ -46,6 +47,12 @@ const render = reactive({
     title: ''
 })
 
+const detailVisible = ref(false)
+const detailData = ref({
+    rule: [],
+    option: {}
+})
+
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/form/list',
     method: 'POST',
@@ -72,24 +79,24 @@ const tableStore = new TableStore({
             minWidth: '230',
             fixed: 'right',
             buttons: [
-                // {
-                //     name: 'view',
-                //     title: '预览',
-                //     type: 'primary',
-                //     icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
-                //     click: row => {
-                //         //首先根据id查询出详细数据，然后渲染json
-                //         getById(row.id).then(res => {
-                //             render.visible = true;
-                //             render.title = '查看表单详情';
-                //             nextTick(async () => {
-                //                 vfRenderRef.value.setFormJson(res.data.content || {formConfig: {}, widgetList: []});
-                //             });
-                //
-                //         })
-                //     }
-                // },
+                {
+                    name: 'view',
+                    title: '预览',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        //首先根据id查询出详细数据，然后渲染json
+                        getById(row.id).then(res => {
+                            nextTick(async () => {
+                                setConfAndFields2(detailData, res.data.conf, res.data.fields)
+                                // 弹窗打开
+                                detailVisible.value = true
+                            });
+
+                        })
+                    }
+                },
                 {
                     name: 'update',
                     title: '设计表单',
diff --git a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
index 233ebaf7..a3ec23f5 100644
--- a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -1,98 +1,97 @@
 <template>
-  <el-card v-loading='loading' class='box-card'>
-    <el-col :offset='3' :span='17'>
-      <div class='item_line'>
-        <el-timeline>
-          <div class='end_item_line'>
-            <div class='end_item_lines'></div>
-            <el-timeline-item
-                v-if='processInstance.endTime'
-                :type='getProcessInstanceTimelineItemType(processInstance)'
-            >
-              <p style='font-weight: 700'>
-                结束流程：在 {{ formatDate(processInstance?.endTime) }} 结束
-                <el-tag :type='getTaskTimelineItemType(processInstance.status)'>
-                  {{ getTaskNameItemType(processInstance.status) }}
-                </el-tag>
-              </p>
-            </el-timeline-item>
-          </div>
-          <div class='start_item_line' v-for='(item, index) in tasksList' :key='index'>
-            <div class='start_item_lines'></div>
-            <!-- 最后一条不显示重新发起 -->
-            <el-timeline-item type='success' v-if="index != 0 && item.status != '1'">
-              <p style='font-weight: 700'>
-                重新发起：【{{ item.processInstance.startUser?.name }}】在
-                {{ formatDate(item?.createTime) }} 重新发起【 {{ item.processInstance.name }} 】流程
-              </p>
-            </el-timeline-item>
-            <el-timeline-item :type='getTaskTimelineItemType(item)'>
-              <p style='font-weight: 700; margin: 8px'>
-                审批任务：{{ item.name }}
-                <el-tag :type='getTaskTimelineItemType(item.status)'>
-                  {{ getTaskNameItemType(item.status) }}
-                </el-tag>
-                <el-button
-                    class='ml-10px'
-                    v-if='!isEmpty(item.children)'
-                    @click='openChildrenTask(item)'
-                    size='small'
-                >
-                  <Icon icon='ep:memo' />
-                  子任务
-                </el-button>
-                <el-button
-                    class='ml-10px'
-                    size='small'
-                    v-if='item.formId > 0'
-                    @click='handleFormDetail(item)'
-                >
-                  <Icon icon='ep:document' />
-                  查看表单
-                </el-button>
-              </p>
-              <el-card :body-style="{ padding: '10px' }">
-                <label v-if='item.assigneeUser' style='margin-right: 30px; font-weight: normal'>
-                  审批人：{{ item.assigneeUser.name }}
-                  <el-tag size='small' type='info'>{{ item.assigneeUser.deptName }}</el-tag>
-                </label>
-                <label v-if='item.createTime' style='font-weight: normal'>创建时间：</label>
-                <label style='font-weight: normal; color: #8a909c'>
-                  {{ formatDate(item?.createTime) }}
-                </label>
-                <label v-if='item.endTime' style='margin-left: 30px; font-weight: normal'>
-                  审批时间：
-                </label>
-                <label v-if='item.endTime' style='font-weight: normal; color: #8a909c'>
-                  {{ formatDate(item?.endTime) }}
-                </label>
-                <label v-if='item.durationInMillis' style='margin-left: 30px; font-weight: normal'>
-                  耗时：
-                </label>
-                <label v-if='item.durationInMillis' style='font-weight: normal; color: #8a909c'>
-                  {{ formatPast2(item?.durationInMillis) }}
-                </label>
-                <p v-if='item.reason'>审批建议：{{ item.reason }}</p>
-              </el-card>
-            </el-timeline-item>
-          </div>
-          <el-timeline-item type='success'>
-            <p style='font-weight: 700'>
-              发起流程：【{{ tasksList[tasksList.length - 1]?.processInstance.startUser?.name }}】在
-              {{ formatDate(tasksList[tasksList.length - 1]?.createTime) }} 发起【
-              {{ tasksList[tasksList.length - 1]?.processInstance.name }} 】流程
-            </p>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </el-col>
-  </el-card>
-  <!-- 弹窗：子任务  -->
-  <TaskSignList ref='taskSignListRef' @success='refresh' />
-  <!-- 弹窗：表单 -->
-  <el-dialog title='表单详情' v-model='taskFormVisible' width='600'>
-    <form-create ref='fApi' v-model='taskForm.value' :option='taskForm.option' :rule='taskForm.rule' />
-  </el-dialog>
+    <el-card v-loading='loading' class='box-card'>
+        <el-col :offset='3' :span='17'>
+            <div class='item_line'>
+                <el-timeline>
+                    <div class='end_item_line'>
+                        <div class='end_item_lines'></div>
+                        <el-timeline-item
+                            v-if='processInstance.endTime'
+                            :type='getProcessInstanceTimelineItemType(processInstance)'
+                        >
+                            <p style='font-weight: 700'>
+                                结束流程：在 {{ formatDate(processInstance?.endTime) }} 结束
+                                <el-tag :type='getTaskTimelineItemType(processInstance.status)'>
+                                    {{ getTaskNameItemType(processInstance.status) }}
+                                </el-tag>
+                            </p>
+                        </el-timeline-item>
+                    </div>
+                    <div class='start_item_line' v-for='(item, index) in tasksList' :key='index'>
+                        <div class='start_item_lines'></div>
+                        <!-- 最后一条不显示重新发起 -->
+                        <el-timeline-item type='success' v-if="index != 0 && item.status != '1'">
+                            <p style='font-weight: 700'>
+                                重新发起：【{{ item.processInstance.startUser?.name }}】在
+                                {{ formatDate(item?.createTime) }} 重新发起【 {{ item.processInstance.name }} 】流程
+                            </p>
+                        </el-timeline-item>
+                        <el-timeline-item :type='getTaskTimelineItemType(item)'>
+                            <p style='font-weight: 700; margin: 8px'>
+                                审批任务：{{ item.name }}
+                                <el-tag :type='getTaskTimelineItemType(item.status)'>
+                                    {{ getTaskNameItemType(item.status) }}
+                                </el-tag>
+                                <el-button
+                                    class='ml-10px'
+                                    v-if='!isEmpty(item.children)'
+                                    @click='openChildrenTask(item)'
+                                    size='small'
+                                >
+                                    <Icon icon='ep:memo' />
+                                    子任务
+                                </el-button>
+                                <el-button
+                                    class='ml-10px'
+                                    size='small'
+                                    @click='handleFormDetail(item)'
+                                >
+                                    <Icon icon='ep:document' />
+                                    查看表单
+                                </el-button>
+                            </p>
+                            <el-card :body-style="{ padding: '10px' }">
+                                <label v-if='item.assigneeUser' style='margin-right: 30px; font-weight: normal'>
+                                    审批人：{{ item.assigneeUser.name }}
+                                    <el-tag size='small' type='info'>{{ item.assigneeUser.deptName }}</el-tag>
+                                </label>
+                                <label v-if='item.createTime' style='font-weight: normal'>创建时间：</label>
+                                <label style='font-weight: normal; color: #8a909c'>
+                                    {{ formatDate(item?.createTime) }}
+                                </label>
+                                <label v-if='item.endTime' style='margin-left: 30px; font-weight: normal'>
+                                    审批时间：
+                                </label>
+                                <label v-if='item.endTime' style='font-weight: normal; color: #8a909c'>
+                                    {{ formatDate(item?.endTime) }}
+                                </label>
+                                <label v-if='item.durationInMillis' style='margin-left: 30px; font-weight: normal'>
+                                    耗时：
+                                </label>
+                                <label v-if='item.durationInMillis' style='font-weight: normal; color: #8a909c'>
+                                    {{ formatPast2(item?.durationInMillis) }}
+                                </label>
+                                <p v-if='item.reason'>审批建议：{{ item.reason }}</p>
+                            </el-card>
+                        </el-timeline-item>
+                    </div>
+                    <el-timeline-item type='success'>
+                        <p style='font-weight: 700'>
+                            发起流程：【{{ tasksList[tasksList.length - 1]?.processInstance.startUser?.name }}】在
+                            {{ formatDate(tasksList[tasksList.length - 1]?.createTime) }} 发起【
+                            {{ tasksList[tasksList.length - 1]?.processInstance.name }} 】流程
+                        </p>
+                    </el-timeline-item>
+                </el-timeline>
+            </div>
+        </el-col>
+    </el-card>
+    <!-- 弹窗：子任务  -->
+    <TaskSignList ref='taskSignListRef' @success='refresh' />
+    <!-- 弹窗：表单 -->
+    <el-dialog title='表单详情' v-model='taskFormVisible' width='750'>
+        <form-create ref='fApi' v-model='taskForm.value' :option='taskForm.option' :rule='taskForm.rule' />
+    </el-dialog>
 </template>
 <script lang='ts' setup>
 import { ref, watch, nextTick } from 'vue'
@@ -106,153 +105,153 @@ import { setConfAndFields2 } from '@/utils/formCreate'
 defineOptions({ name: 'BpmProcessInstanceTaskList' })
 
 const props = defineProps({
-  loading: propTypes.bool, // 是否加载中
-  processInstance: propTypes.object, // 流程实例
-  tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
+    loading: propTypes.bool, // 是否加载中
+    processInstance: propTypes.object, // 流程实例
+    tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
 })
 const tasksList: any = ref([])
 watch(
     () => props.tasks,
     (val, oldVal) => {
-      if (val && val.length != 0) {
-        tasksList.value = JSON.parse(JSON.stringify(val)).sort((a, b) => {
-          // 有已完成的情况，按照完成时间倒序
-          // if (a.endTime && b.endTime) {
-          //     return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
-          // } else
-          // if (a.endTime) {
-          //     return 1
-          // }
-          // else if (b.endTime) {
-          //     return -1
-          //     // 都是未完成，按照创建时间倒序
-          // }
-          //  else
-          // {
-          return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
-          // }
-        })
-      }
+        if (val && val.length != 0) {
+            tasksList.value = JSON.parse(JSON.stringify(val)).sort((a, b) => {
+                // 有已完成的情况，按照完成时间倒序
+                // if (a.endTime && b.endTime) {
+                //     return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
+                // } else
+                // if (a.endTime) {
+                //     return 1
+                // }
+                // else if (b.endTime) {
+                //     return -1
+                //     // 都是未完成，按照创建时间倒序
+                // }
+                //  else
+                // {
+                return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
+                // }
+            })
+        }
     },
     {
-      immediate: true,
-      deep: true
+        immediate: true,
+        deep: true
     }
 )
 const sortYMDHMS = val => {
-  return val.replace('-', '').replace('-', '').replace(' ', '').replace(':', '').replace(':', '') - 0
+    return val.replace('-', '').replace('-', '').replace(' ', '').replace(':', '').replace(':', '') - 0
 }
 /** 获得流程实例对应的颜色 */
 const getProcessInstanceTimelineItemType = (item: any) => {
-  if (item.status === 2) {
-    return 'success'
-  }
-  if (item.status === 3) {
-    return 'danger'
-  }
-  if (item.status === 4) {
-    return 'warning'
-  }
-  return ''
+    if (item.status === 2) {
+        return 'success'
+    }
+    if (item.status === 3) {
+        return 'danger'
+    }
+    if (item.status === 4) {
+        return 'warning'
+    }
+    return ''
 }
 
 /** 获得任务对应的颜色 */
 const getTaskTimelineItemType = (itemStatus: any) => {
-  if ([0, 1, 6, 7].includes(itemStatus)) {
+    if ([0, 1, 6, 7].includes(itemStatus)) {
+        return 'primary'
+    }
+    if (itemStatus === 2) {
+        return 'success'
+    }
+    if (itemStatus === 3) {
+        return 'danger'
+    }
+    if (itemStatus === 4) {
+        return 'info'
+    }
+    if (itemStatus === 5) {
+        return 'warning'
+    }
     return 'primary'
-  }
-  if (itemStatus === 2) {
-    return 'success'
-  }
-  if (itemStatus === 3) {
-    return 'danger'
-  }
-  if (itemStatus === 4) {
-    return 'info'
-  }
-  if (itemStatus === 5) {
-    return 'warning'
-  }
-  return 'primary'
 }
 const getTaskNameItemType = (itemStatus: any) => {
-  if (itemStatus === 1) {
+    if (itemStatus === 1) {
+        return '审批中'
+    }
+    if (itemStatus === 2) {
+        return '审批通过'
+    }
+    if (itemStatus === 3) {
+        return '审批不通过'
+    }
+    if (itemStatus === 4) {
+        return '已取消'
+    }
     return '审批中'
-  }
-  if (itemStatus === 2) {
-    return '审批通过'
-  }
-  if (itemStatus === 3) {
-    return '审批不通过'
-  }
-  if (itemStatus === 4) {
-    return '已取消'
-  }
-  return '审批中'
 }
 
 /** 子任务 */
 const taskSignListRef = ref()
 const openChildrenTask = (item: any) => {
-  taskSignListRef.value.open(item)
+    taskSignListRef.value.open(item)
 }
 
 /** 查看表单 */
 const fApi = ref<ApiAttrs>() // form-create 的 API 操作类
 const taskForm = ref({
-  rule: [],
-  option: {},
-  value: {}
+    rule: [],
+    option: {},
+    value: {}
 }) // 流程任务的表单详情
 const taskFormVisible = ref(false)
 const handleFormDetail = async row => {
-  // 设置表单
-  setConfAndFields2(taskForm, row.formConf, row.formFields, row.formVariables)
-  // 弹窗打开
-  taskFormVisible.value = true
-  // 隐藏提交、重置按钮，设置禁用只读
-  await nextTick()
-  fApi.value.fapi.btn.show(false)
-  fApi.value?.fapi?.resetBtn.show(false)
-  fApi.value?.fapi?.disabled(true)
+    // 设置表单
+    setConfAndFields2(taskForm, row.formConf, row.formFields, row.formVariables)
+    // 弹窗打开
+    taskFormVisible.value = true
+    // 隐藏提交、重置按钮，设置禁用只读
+    await nextTick()
+    fApi.value.fapi.btn.show(false)
+    fApi.value?.fapi?.resetBtn.show(false)
+    fApi.value?.fapi?.disabled(true)
 }
 
 /** 刷新数据 */
 const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
 const refresh = () => {
-  emit('refresh')
+    emit('refresh')
 }
 </script>
 <style lang='scss' scoped>
 .item_line {
-  .end_item_line {
-    position: relative;
+    .end_item_line {
+        position: relative;
 
-    .end_item_lines {
-      position: absolute;
-      left: 4px;
-      top: 10px;
-      width: 2px;
-      height: 100%;
-      background: #eeeeee;
+        .end_item_lines {
+            position: absolute;
+            left: 4px;
+            top: 10px;
+            width: 2px;
+            height: 100%;
+            background: #eeeeee;
+        }
     }
-  }
 
-  .start_item_line {
-    position: relative;
+    .start_item_line {
+        position: relative;
 
-    .start_item_lines {
-      position: absolute;
-      left: 4px;
-      top: 10px;
-      width: 2px;
-      height: 100%;
-      background: #eeeeee;
+        .start_item_lines {
+            position: absolute;
+            left: 4px;
+            top: 10px;
+            width: 2px;
+            height: 100%;
+            background: #eeeeee;
+        }
     }
-  }
 }
 
 ::v-deep .el-timeline-item__tail {
-  display: none !important;
+    display: none !important;
 }
 </style>
diff --git a/src/views/system/bpm/task/myInstance/index.vue b/src/views/system/bpm/task/myInstance/index.vue
index 60c892c4..3d6d9bf4 100644
--- a/src/views/system/bpm/task/myInstance/index.vue
+++ b/src/views/system/bpm/task/myInstance/index.vue
@@ -111,9 +111,6 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
                     click: row => {
                         flag.value = true
                         handleAudit(row.id, row.historyInstanceId)