From 9e35ca512cdf78e570c4226f601a5488ff65f64d Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Wed, 1 Feb 2023 14:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=B5=81=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/src/views/bpm/model/index.vue      |  2 +-
 yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue  |  4 ++--
 .../src/views/bpm/processInstance/detail.vue           | 10 ++++++++--
 yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue  |  2 +-
 yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue  |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
index 3ef26e59a..5fafb9606 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
@@ -426,7 +426,7 @@ const handleCreate = async () => {
 // 修改操作
 const handleUpdate = async (rowId: number) => {
   resetForm()
-  await setDialogTile('create')
+  await setDialogTile('edit')
   // 设置数据
   saveForm.value = await ModelApi.getModelApi(rowId)
 }
diff --git a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue
index bbdeca772..0e55ceda8 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue
@@ -45,8 +45,8 @@ const submitForm = async () => {
       await LeaveApi.createLeaveApi(data)
       message.success(t('common.createSuccess'))
       // 关闭窗口
-      await router.push({
-        path: '/oa/leave/create'
+      router.push({
+        path: '/bpm/oa/leave'
       })
     } finally {
       actionLoading.value = false
diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
index f6703e41a..d6ca8faa6 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
@@ -71,7 +71,7 @@
       <el-col v-if="processInstance?.processDefinition?.formType === 10" :span="16" :offset="6">
         <form-create
           :rule="detailForm.rule"
-          v-model:api="fApi"
+          :api="fApi"
           :option="detailForm.option"
           v-model="detailForm.value"
         />
@@ -108,7 +108,7 @@
               <el-card :body-style="{ padding: '10px' }">
                 <label v-if="item.assigneeUser" style="font-weight: normal; margin-right: 30px">
                   审批人：{{ item.assigneeUser.nickname }}
-                  <el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag>
+                  <el-tag type="info" size="small">{{ item.assigneeUser.deptName }}</el-tag>
                 </label>
                 <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
                 <label style="color: #8a909c; font-weight: normal">
@@ -220,6 +220,9 @@ const auditRule = reactive({
 
 // 处理审批通过和不通过的操作
 const handleAudit = async (task, pass) => {
+  console.log(task, 'task')
+  console.log(pass, 'pass')
+  console.log(runningTasks.value, 'runningTasks.value')
   // 1.1 获得对应表单
   const index = runningTasks.value.indexOf(task)
   const auditFormRef = proxy.$refs['form' + index][0]
@@ -236,6 +239,9 @@ const handleAudit = async (task, pass) => {
     id: task.id,
     reason: auditForms.value[index].reason
   }
+  console.log(data, '是否通过')
+  console.log(pass, 'pass是否通过')
+  console.log(task, 'task')
   if (pass) {
     await TaskApi.approveTask(data)
     message.success('审批通过成功')
diff --git a/yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue b/yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue
index f6314cb6f..978aa2e58 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue
@@ -30,7 +30,7 @@ const handleAudit = (row) => {
   router.push({
     name: 'BpmProcessInstanceDetail',
     query: {
-      id: row.processInstanceId
+      id: row.processInstance.id
     }
   })
 }
diff --git a/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue b/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
index a2843440b..28210cf48 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
@@ -30,7 +30,7 @@ const handleAudit = (row) => {
   router.push({
     name: 'BpmProcessInstanceDetail',
     query: {
-      id: row.processInstanceId
+      id: row.processInstance.id
     }
   })
 }