Commit 9e35ca512cdf78e570c4226f601a5488ff65f64d
1 parent
63055cc5
基本流通
Showing
5 changed files
with
13 additions
and
7 deletions
yudao-ui-admin-vue3/src/views/bpm/model/index.vue
| @@ -426,7 +426,7 @@ const handleCreate = async () => { | @@ -426,7 +426,7 @@ const handleCreate = async () => { | ||
| 426 | // 修改操作 | 426 | // 修改操作 |
| 427 | const handleUpdate = async (rowId: number) => { | 427 | const handleUpdate = async (rowId: number) => { |
| 428 | resetForm() | 428 | resetForm() |
| 429 | - await setDialogTile('create') | 429 | + await setDialogTile('edit') |
| 430 | // 设置数据 | 430 | // 设置数据 |
| 431 | saveForm.value = await ModelApi.getModelApi(rowId) | 431 | saveForm.value = await ModelApi.getModelApi(rowId) |
| 432 | } | 432 | } |
yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue
| @@ -45,8 +45,8 @@ const submitForm = async () => { | @@ -45,8 +45,8 @@ const submitForm = async () => { | ||
| 45 | await LeaveApi.createLeaveApi(data) | 45 | await LeaveApi.createLeaveApi(data) |
| 46 | message.success(t('common.createSuccess')) | 46 | message.success(t('common.createSuccess')) |
| 47 | // 关闭窗口 | 47 | // 关闭窗口 |
| 48 | - await router.push({ | ||
| 49 | - path: '/oa/leave/create' | 48 | + router.push({ |
| 49 | + path: '/bpm/oa/leave' | ||
| 50 | }) | 50 | }) |
| 51 | } finally { | 51 | } finally { |
| 52 | actionLoading.value = false | 52 | actionLoading.value = false |
yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | <el-col v-if="processInstance?.processDefinition?.formType === 10" :span="16" :offset="6"> | 71 | <el-col v-if="processInstance?.processDefinition?.formType === 10" :span="16" :offset="6"> |
| 72 | <form-create | 72 | <form-create |
| 73 | :rule="detailForm.rule" | 73 | :rule="detailForm.rule" |
| 74 | - v-model:api="fApi" | 74 | + :api="fApi" |
| 75 | :option="detailForm.option" | 75 | :option="detailForm.option" |
| 76 | v-model="detailForm.value" | 76 | v-model="detailForm.value" |
| 77 | /> | 77 | /> |
| @@ -108,7 +108,7 @@ | @@ -108,7 +108,7 @@ | ||
| 108 | <el-card :body-style="{ padding: '10px' }"> | 108 | <el-card :body-style="{ padding: '10px' }"> |
| 109 | <label v-if="item.assigneeUser" style="font-weight: normal; margin-right: 30px"> | 109 | <label v-if="item.assigneeUser" style="font-weight: normal; margin-right: 30px"> |
| 110 | 审批人：{{ item.assigneeUser.nickname }} | 110 | 审批人：{{ item.assigneeUser.nickname }} |
| 111 | - <el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag> | 111 | + <el-tag type="info" size="small">{{ item.assigneeUser.deptName }}</el-tag> |
| 112 | </label> | 112 | </label> |
| 113 | <label style="font-weight: normal" v-if="item.createTime">创建时间：</label> | 113 | <label style="font-weight: normal" v-if="item.createTime">创建时间：</label> |
| 114 | <label style="color: #8a909c; font-weight: normal"> | 114 | <label style="color: #8a909c; font-weight: normal"> |
| @@ -220,6 +220,9 @@ const auditRule = reactive({ | @@ -220,6 +220,9 @@ const auditRule = reactive({ | ||
| 220 | 220 | ||
| 221 | // 处理审批通过和不通过的操作 | 221 | // 处理审批通过和不通过的操作 |
| 222 | const handleAudit = async (task, pass) => { | 222 | const handleAudit = async (task, pass) => { |
| 223 | + console.log(task, 'task') | ||
| 224 | + console.log(pass, 'pass') | ||
| 225 | + console.log(runningTasks.value, 'runningTasks.value') | ||
| 223 | // 1.1 获得对应表单 | 226 | // 1.1 获得对应表单 |
| 224 | const index = runningTasks.value.indexOf(task) | 227 | const index = runningTasks.value.indexOf(task) |
| 225 | const auditFormRef = proxy.$refs['form' + index][0] | 228 | const auditFormRef = proxy.$refs['form' + index][0] |
| @@ -236,6 +239,9 @@ const handleAudit = async (task, pass) => { | @@ -236,6 +239,9 @@ const handleAudit = async (task, pass) => { | ||
| 236 | id: task.id, | 239 | id: task.id, |
| 237 | reason: auditForms.value[index].reason | 240 | reason: auditForms.value[index].reason |
| 238 | } | 241 | } |
| 242 | + console.log(data, '是否通过') | ||
| 243 | + console.log(pass, 'pass是否通过') | ||
| 244 | + console.log(task, 'task') | ||
| 239 | if (pass) { | 245 | if (pass) { |
| 240 | await TaskApi.approveTask(data) | 246 | await TaskApi.approveTask(data) |
| 241 | message.success('审批通过成功') | 247 | message.success('审批通过成功') |
yudao-ui-admin-vue3/src/views/bpm/task/done/index.vue
| @@ -30,7 +30,7 @@ const handleAudit = (row) => { | @@ -30,7 +30,7 @@ const handleAudit = (row) => { | ||
| 30 | router.push({ | 30 | router.push({ |
| 31 | name: 'BpmProcessInstanceDetail', | 31 | name: 'BpmProcessInstanceDetail', |
| 32 | query: { | 32 | query: { |
| 33 | - id: row.processInstanceId | 33 | + id: row.processInstance.id |
| 34 | } | 34 | } |
| 35 | }) | 35 | }) |
| 36 | } | 36 | } |
yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
| @@ -30,7 +30,7 @@ const handleAudit = (row) => { | @@ -30,7 +30,7 @@ const handleAudit = (row) => { | ||
| 30 | router.push({ | 30 | router.push({ |
| 31 | name: 'BpmProcessInstanceDetail', | 31 | name: 'BpmProcessInstanceDetail', |
| 32 | query: { | 32 | query: { |
| 33 | - id: row.processInstanceId | 33 | + id: row.processInstance.id |
| 34 | } | 34 | } |
| 35 | }) | 35 | }) |
| 36 | } | 36 | } |