fix: 空间审批问题
Showing
3 changed files
with
14 additions
and
4 deletions
| ... | @@ -144,6 +144,7 @@ const passDialogBtnClick = (btn, info) => { | ... | @@ -144,6 +144,7 @@ const passDialogBtnClick = (btn, info) => { |
| 144 | passDialogInfo.value.visible = false; | 144 | passDialogInfo.value.visible = false; |
| 145 | getDetail(); | 145 | getDetail(); |
| 146 | updateDetailStatus.value = true; | 146 | updateDetailStatus.value = true; |
| 147 | productSpaceStore.setIsRefresh(true); | ||
| 147 | approvalProcessRef.value?.renderProcessNodes(); | 148 | approvalProcessRef.value?.renderProcessNodes(); |
| 148 | } else { | 149 | } else { |
| 149 | proxy.$ElMessage.error('审批失败'); | 150 | proxy.$ElMessage.error('审批失败'); |
| ... | @@ -272,6 +273,7 @@ const btnClick = (btn: any) => { | ... | @@ -272,6 +273,7 @@ const btnClick = (btn: any) => { |
| 272 | ElMessage.success('该审批流程撤销成功!'); | 273 | ElMessage.success('该审批流程撤销成功!'); |
| 273 | getDetail(); | 274 | getDetail(); |
| 274 | updateDetailStatus.value = true; | 275 | updateDetailStatus.value = true; |
| 276 | productSpaceStore.setIsRefresh(true); | ||
| 275 | approvalProcessRef.value?.renderProcessNodes(); | 277 | approvalProcessRef.value?.renderProcessNodes(); |
| 276 | } else { | 278 | } else { |
| 277 | ElMessage.error('该审批流程撤销失败!'); | 279 | ElMessage.error('该审批流程撤销失败!'); | ... | ... |
| ... | @@ -140,7 +140,7 @@ const newCreate = () => { | ... | @@ -140,7 +140,7 @@ const newCreate = () => { |
| 140 | 140 | ||
| 141 | const handleDataClick = (item) => { | 141 | const handleDataClick = (item) => { |
| 142 | let approveState = item.bizApproveState; | 142 | let approveState = item.bizApproveState; |
| 143 | if (approveState == 'A' || approveState == 'Y') { //通过或审批中,点进去是详情 | 143 | if (approveState == 'A') { //审批中,点进去是详情;审批通过的也可以修改吧 |
| 144 | router.push({ | 144 | router.push({ |
| 145 | name: 'productSpaceDetail', | 145 | name: 'productSpaceDetail', |
| 146 | query: { | 146 | query: { |
| ... | @@ -151,9 +151,9 @@ const handleDataClick = (item) => { | ... | @@ -151,9 +151,9 @@ const handleDataClick = (item) => { |
| 151 | return; | 151 | return; |
| 152 | } | 152 | } |
| 153 | const staffGuid = item.createUserId || ''; | 153 | const staffGuid = item.createUserId || ''; |
| 154 | let currentStaffGuid = userData.tenantGuid; | 154 | let currentStaffGuid = userData.userGuid; |
| 155 | // 如果是驳回等状态,是自己创建的可以编辑。 | 155 | // 如果是驳回等状态,是自己创建的可以编辑。 |
| 156 | if ((approveState == 'C' || approveState == 'E' || approveState == 'R')) { | 156 | if ((approveState == 'C' || approveState == 'E' || approveState == 'R' || approveState == 'Y')) { |
| 157 | router.push({ | 157 | router.push({ |
| 158 | name: staffGuid == currentStaffGuid ? 'productSpaceEdit' : 'productSpaceDetail', | 158 | name: staffGuid == currentStaffGuid ? 'productSpaceEdit' : 'productSpaceDetail', |
| 159 | query: { | 159 | query: { | ... | ... |
| ... | @@ -157,6 +157,10 @@ const getTableBtns = (row) => { | ... | @@ -157,6 +157,10 @@ const getTableBtns = (row) => { |
| 157 | btnsArr.push({ label: "重新提交", value: "edit" }) | 157 | btnsArr.push({ label: "重新提交", value: "edit" }) |
| 158 | } | 158 | } |
| 159 | } | 159 | } |
| 160 | /** 此处添加一下审批通过之后,可以重新编辑提交 */ | ||
| 161 | if (approveState == 'Y' && bizApproveState != 'D' && !row.nodeId && staffGuid == currentStaffGuid) { | ||
| 162 | btnsArr.push({ label: "编辑", value: "edit" }) | ||
| 163 | } | ||
| 160 | isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" }) | 164 | isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" }) |
| 161 | flowState === 3 && btnsArr.push({ label: "删除", value: "delete" }) | 165 | flowState === 3 && btnsArr.push({ label: "删除", value: "delete" }) |
| 162 | } | 166 | } |
| ... | @@ -259,7 +263,7 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -259,7 +263,7 @@ const tableBtnClick = (scope, btn) => { |
| 259 | name: 'productSpaceDetail', | 263 | name: 'productSpaceDetail', |
| 260 | query: { | 264 | query: { |
| 261 | guid: row.guid, | 265 | guid: row.guid, |
| 262 | name: row.connectorName | 266 | name: row.spaceName |
| 263 | } | 267 | } |
| 264 | }); | 268 | }); |
| 265 | } else if (type === 'pass') { | 269 | } else if (type === 'pass') { |
| ... | @@ -454,4 +458,8 @@ const rejectDialogBtnClick = (btn, info) => { | ... | @@ -454,4 +458,8 @@ const rejectDialogBtnClick = (btn, info) => { |
| 454 | .container_wrap { | 458 | .container_wrap { |
| 455 | padding: 0px 16px; | 459 | padding: 0px 16px; |
| 456 | } | 460 | } |
| 461 | |||
| 462 | .tools_btns { | ||
| 463 | padding-bottom: 8px; | ||
| 464 | } | ||
| 457 | </style> | 465 | </style> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or sign in to post a comment