|
@@ -3,25 +3,25 @@
|
|
|
<HcNewCard :scrollbar="false" action-size="lg">
|
|
|
<template #header>
|
|
|
<div class="w-64">
|
|
|
- <el-input v-model="searchForm.evisaUserName" block clearable placeholder="请输入用户名称检索" @keyup="keyUpEvent" />
|
|
|
+ <el-input v-model="searchForm.evisaUserName" clearable block placeholder="请输入用户名称检索" @keyup="keyUpEvent" />
|
|
|
</div>
|
|
|
- <div class="w-32 ml-3">
|
|
|
- <el-select v-model="searchForm.contractId" block clearable placeholder="合同段" @change="ContractIdChange">
|
|
|
+ <div class="ml-3 w-32">
|
|
|
+ <el-select v-model="searchForm.contractId" clearable block placeholder="合同段" @change="ContractIdChange">
|
|
|
<el-option v-for="item in contractList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div class="w-32 ml-3">
|
|
|
+ <div class="ml-3 w-32">
|
|
|
<el-select v-model="searchForm.visaStatus" block placeholder="电签状态" @change="visaStatusChange">
|
|
|
<el-option label="电签失败" :value="1" />
|
|
|
<el-option label="电签成功" :value="2" />
|
|
|
</el-select>
|
|
|
</div>
|
|
|
|
|
|
- <div class="w-64 ml-3">
|
|
|
+ <div class="ml-3 w-64">
|
|
|
<HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
|
|
|
</div>
|
|
|
- <div class="w-56 ml-3">
|
|
|
- <el-input v-model="searchForm.queryValue" block clearable placeholder="请输入名称关键词检索" @keyup="keyUpEvent" />
|
|
|
+ <div class="ml-3 w-56">
|
|
|
+ <el-input v-model="searchForm.queryValue" clearable block placeholder="请输入名称关键词检索" @keyup="keyUpEvent" />
|
|
|
</div>
|
|
|
<div class="ml-2">
|
|
|
<el-button type="primary" @click="searchClick">
|
|
@@ -54,11 +54,15 @@
|
|
|
{{ row.taskStatusName }}
|
|
|
</el-tag>
|
|
|
</template>
|
|
|
+ <template #approvalType="{ row }">
|
|
|
+ {{ getTaskType(row.approvalType) }}
|
|
|
+ </template>
|
|
|
|
|
|
<template #taskApproveUserNamesList="{ row }">
|
|
|
<template v-for="item in row.taskApproveUserNamesList">
|
|
|
<el-tag
|
|
|
v-if="item.taskUserName"
|
|
|
+ :key="item.taskUserName"
|
|
|
:type="`${item.evisaStatus === 2 ? 'success' : item.evisaStatus === 3 ? 'warning' : item.evisaStatus === 999 ? 'danger' : 'info'}`" class="mx-1" effect="dark"
|
|
|
>
|
|
|
{{ item.taskUserName }}
|
|
@@ -89,6 +93,7 @@ import { useAppStore } from '~src/store'
|
|
|
import { arrToId, getArrValue, getObjValue } from 'js-fast-way'
|
|
|
import signApi from '~api/tasks/sign'
|
|
|
import { toPdfPage } from '~uti/btn-auth'
|
|
|
+import { getDictionaryData } from '~uti/tools'
|
|
|
|
|
|
//变量
|
|
|
const useAppState = useAppStore()
|
|
@@ -104,11 +109,22 @@ onMounted(() => {
|
|
|
const { contractType } = contractInfo.value
|
|
|
searchForm.value.contractId = contractId.value
|
|
|
contractTypeTabKey.value = contractType === 2 ? '2' : '1'
|
|
|
+ getMajorDataTypeOptions() // 添加这行来获取任务类型选项
|
|
|
getTableData()
|
|
|
})
|
|
|
+//获取任务类型
|
|
|
+const taskTypeOptions = ref([])
|
|
|
+const getMajorDataTypeOptions = async () => {
|
|
|
+ taskTypeOptions.value = (await getDictionaryData('approval_type', false)).filter(item => item.value !== 0)
|
|
|
+}
|
|
|
+
|
|
|
+// 添加获取任务类型标签的方法
|
|
|
+const getTaskType = (type) => {
|
|
|
+ const option = taskTypeOptions.value.find(item => item.value === type)
|
|
|
+ return option ? option.label : type
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
-const tasksData = ref([])
|
|
|
-const statusData = ref([])
|
|
|
const contractTypeTabKey = ref('1')
|
|
|
|
|
|
//合同段
|
|
@@ -192,6 +208,7 @@ const tableSelectionChange = (rows) => {
|
|
|
const tableListColumn = ref([
|
|
|
{ key: 'taskName', name: '流程名称' },
|
|
|
{ key: 'taskStatusName', name: '任务状态' },
|
|
|
+ { key: 'approvalType', name: '任务类型' },
|
|
|
{ key: 'evisaStatusName', name: '电签状态' },
|
|
|
{ key: 'startTime', name: '开始时间' },
|
|
|
{ key: 'endTime', name: '限定时间' },
|