|
@@ -127,6 +127,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
+import { useRoute } from 'vue-router'
|
|
|
import useTaskProcessStore from '@/store/modules/taskProcess'
|
|
|
import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'
|
|
|
// import { Search, Filter, Refresh } from '@element-plus/icons-vue'
|
|
@@ -187,12 +188,7 @@ const instanceStateOps = [
|
|
|
label: '强制终止'
|
|
|
}
|
|
|
]
|
|
|
-// const processName = ref('') // 流程名称
|
|
|
-// const createId = ref(null) // 发起人
|
|
|
-// const createBy = ref(null) // 创建人
|
|
|
-// const instanceState = ref(null) // 流程状态
|
|
|
-// const beginTime = ref(null) // 开始时间
|
|
|
-// const endTime = ref(null) // 结束时间
|
|
|
+const routeId = ref(null)
|
|
|
const searchMoreVisible = ref(false)
|
|
|
const isCollapsed = ref(false)
|
|
|
// store值
|
|
@@ -269,6 +265,11 @@ const loadList = () => {
|
|
|
getPagedSatellites()
|
|
|
}
|
|
|
|
|
|
+// 点击当前实例的具体
|
|
|
+const getTaskDetail = item => {
|
|
|
+ taskProcessInfo.setCurrentTaskRow(item)
|
|
|
+}
|
|
|
+
|
|
|
// 获取分页数据
|
|
|
const getPagedSatellites = async isInit => {
|
|
|
loading.value = true
|
|
@@ -277,14 +278,7 @@ const getPagedSatellites = async isInit => {
|
|
|
const { currentTaskType } = props
|
|
|
const params = {
|
|
|
...condition,
|
|
|
- data: searchParams
|
|
|
- /*data: {
|
|
|
- processName: processName.value,
|
|
|
- createBy: createBy.value,
|
|
|
- instanceState: instanceState.value,
|
|
|
- beginTime: beginTime.value,
|
|
|
- endTime: endTime.value
|
|
|
- }*/
|
|
|
+ data: { ...searchParams, instanceId: routeId.value }
|
|
|
}
|
|
|
if (currentTaskType === 'pendingApproval') {
|
|
|
responseData = await processTaskPagePendingApprovalApi(params)
|
|
@@ -313,6 +307,12 @@ const getPagedSatellites = async isInit => {
|
|
|
}
|
|
|
})
|
|
|
|
|
|
+ // 只针对从通知中心代办跳转进入待审核页面使用
|
|
|
+ if (routeId.value && currentTaskType === 'pendingApproval') {
|
|
|
+ const item = records.find(item => item.instanceId === routeId.value)
|
|
|
+ getTaskDetail(item)
|
|
|
+ }
|
|
|
+
|
|
|
if (isInit) {
|
|
|
listData.value.list = records
|
|
|
// list.value = records
|
|
@@ -334,11 +334,6 @@ const getPagedSatellites = async isInit => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// 点击当前实例的具体
|
|
|
-const getTaskDetail = item => {
|
|
|
- taskProcessInfo.setCurrentTaskRow(item)
|
|
|
-}
|
|
|
-
|
|
|
// 开始时间的禁用
|
|
|
const disabledDateStart = time => {
|
|
|
if (!searchParams.endTime) return false
|
|
@@ -360,13 +355,18 @@ const resetSearch = type => {
|
|
|
if (type === 'external') {
|
|
|
// processName.value = ''
|
|
|
searchParams.processName = undefined
|
|
|
+ routeId.value = undefined
|
|
|
initList()
|
|
|
}
|
|
|
}
|
|
|
|
|
|
onMounted(() => {
|
|
|
+ const route = useRoute()
|
|
|
+ routeId.value = route.query.id
|
|
|
taskProcessInfo.refresh = true
|
|
|
- taskProcessInfo.setCurrentTaskRow({})
|
|
|
+ if (!routeId.value) {
|
|
|
+ taskProcessInfo.setCurrentTaskRow({})
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
/**
|