From 2d6fe27b4337e84c86529bcc7067547cda98d6b2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 23 Jan 2023 00:03:56 +0800
Subject: [PATCH] =?UTF-8?q?bpm=EF=BC=9A=E5=AE=8C=E6=88=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=9A=84=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bpm/definition/index.vue        |  4 +-
 .../src/views/bpm/oa/leave/index.vue          |  2 +-
 .../src/views/bpm/processInstance/index.vue   | 72 ++++++-------------
 .../views/bpm/processInstance/process.data.ts |  2 +-
 .../src/views/bpm/processInstance/index.vue   |  2 +-
 5 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue b/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue
index 467e1dd3f..b37c3f5a6 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue
@@ -45,11 +45,9 @@
     </XModal>
   </ContentWrap>
 </template>
-
 <script setup lang="ts">
 // 全局相关的 import
 import { ref } from 'vue'
-// import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 
 // 业务相关的 import
 import * as DefinitionApi from '@/api/bpm/definition'
@@ -87,7 +85,7 @@ const handleFormDetail = async (row) => {
     // 弹窗打开
     formDetailVisible.value = true
   } else {
-    router.push({
+    await router.push({
       path: row.formCustomCreatePath
     })
   }
diff --git a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/index.vue
index c6cd4875c..a08ecbf16 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/index.vue
@@ -15,7 +15,7 @@
           @click="cancelLeave(row)"
         />
         <!-- 操作: 详情 -->
-        <XTextButton preIcon="ep:delete" :title="t('action.detail')" @click="handleDetail(row)" />
+        <XTextButton preIcon="ep:view" :title="t('action.detail')" @click="handleDetail(row)" />
         <!-- 操作: 审批进度 -->
         <XTextButton preIcon="ep:edit-pen" title="审批进度" @click="handleProcessDetail(row)" />
       </template>
diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
index aa834d531..4b524b7e2 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
@@ -14,97 +14,69 @@
       </template>
       <!-- 当前审批任务 -->
       <template #tasks_default="{ row }">
-        <el-button
-          v-for="task in row.tasks"
-          :key="task.id"
-          type="text"
-          @click="handleFormDetail(task.id)"
-        >
+        <el-button v-for="task in row.tasks" :key="task.id" type="text">
           <span>{{ task.name }}</span>
         </el-button>
       </template>
       <!-- 操作 -->
       <template #actionbtns_default="{ row }">
+        <XButton preIcon="ep:view" :title="t('action.detail')" @click="handleDetail(row)" />
         <XButton
-          type="primary"
+          preIcon="ep:delete"
           title="取消"
           v-if="row.result === 1"
-          preIcon="ep:delete"
           @click="handleCancel(row)"
         />
-        <XButton type="primary" title="详情" preIcon="ep:edit-pen" @click="handleDetail(row)" />
       </template>
     </XTable>
   </ContentWrap>
 </template>
 <script setup lang="ts">
 // 全局相关的 import
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useXTable } from '@/hooks/web/useXTable'
-import { useRouter } from 'vue-router'
+import { ElMessageBox } from 'element-plus'
 
 // 业务相关的 import
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
-// import { decodeFields } from '@/utils/formGenerator' // TODO 芋艿：后续根据情况清理
 import { allSchemas } from './process.data'
 
 const router = useRouter() // 路由
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
 // ========== 列表相关 ==========
-const [registerTable] = useXTable({
+const [registerTable, { reload }] = useXTable({
   allSchemas: allSchemas,
   getListApi: ProcessInstanceApi.getMyProcessInstancePageApi
 })
-// 流程表单的弹出框
-const detailOpen = ref(false)
-const detailForm = ref()
+
 /** 发起流程操作 **/
 const handleCreate = () => {
   router.push({
     name: 'BpmProcessInstanceCreate'
   })
 }
-/** 流程表单的详情按钮操作 */
-const handleFormDetail = (row) => {
-  // 情况一：使用流程表单
-  if (row.formId) {
-    // 设置值 TODO 芋艿：动态表单做完后，需要测试下
-    detailForm.value = {
-      ...JSON.parse(row.formConf),
-      fields: decodeFields([], row.formFields)
-    }
-    // 弹窗打开
-    detailOpen.value = true
-    // 情况二：使用业务表单
-  } else if (row.formCustomCreatePath) {
-    router.push({ path: row.formCustomCreatePath })
-  }
-}
 
 // 列表操作
 const handleDetail = (row) => {
-  console.log(row, 'row')
-  router.push({ path: '/process-instance/detail', query: { id: row.id } })
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstanceId
+    }
+  })
 }
+
 /** 取消按钮操作 */
 const handleCancel = (row) => {
-  const id = row.id
-  ElMessageBox.prompt('请输入取消原因？', '取消流程', {
-    type: 'warning',
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
+  ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
     inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
     inputErrorMessage: '取消原因不能为空'
+  }).then(async ({ value }) => {
+    await ProcessInstanceApi.cancelProcessInstanceApi(row.id, value)
+    message.success('取消成功')
+    reload()
   })
-    .then(({ value }) => {
-      return ProcessInstanceApi.cancelProcessInstanceApi(id, value)
-    })
-    .then(() => {
-      ElMessage({
-        message: '取消成功',
-        type: 'success'
-      })
-    })
 }
 </script>
diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts
index b399f601a..c5ce76715 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts
@@ -41,7 +41,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
       title: '当前审批任务',
       field: 'tasks',
       table: {
-        width: 100,
+        width: 140,
         slots: {
           default: 'tasks_default'
         }
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
index e57da88a9..b15751325 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
@@ -58,7 +58,7 @@
       </el-table-column>
       <el-table-column label="当前审批任务" align="center" prop="tasks">
         <template v-slot="scope">
-          <el-button v-for="task in scope.row.tasks" :key="task.id" type="text" @click="handleFormDetail(task.id)">
+          <el-button v-for="task in scope.row.tasks" :key="task.id" type="text"">
             <span>{{ task.name }}</span>
           </el-button>
         </template>