From 4752b4eb01d5529eb4b107d1c6118b2c75213333 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期日, 31 三月 2024 19:30:31 +0800 Subject: [PATCH] update 调整流程状态 --- src/views/workflow/task/allTaskWaiting.vue | 5 +++-- src/views/workflow/task/taskWaiting.vue | 8 ++++---- src/views/workflow/processInstance/index.vue | 7 ++++--- src/views/workflow/leave/index.vue | 6 +++--- src/views/workflow/task/myDocument.vue | 7 ++++--- src/views/workflow/task/taskCopyList.vue | 5 +++-- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue index 4f7c8e1..c18eb3d 100644 --- a/src/views/workflow/leave/index.vue +++ b/src/views/workflow/leave/index.vue @@ -51,9 +51,9 @@ </el-table-column> <el-table-column label="璇峰亣澶╂暟" align="center" prop="leaveDays" /> <el-table-column label="璇峰亣鍘熷洜" align="center" prop="remark" /> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.processInstanceVo.businessStatusName }}</el-tag> + <dict-tag :options="wf_business_status" :value="scope.row.processInstanceVo.businessStatus"></dict-tag> </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> @@ -101,7 +101,7 @@ import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; - +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); const leaveList = ref<LeaveVO[]>([]); const loading = ref(true); const showSearch = ref(true); diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 0da78bc..06b59b4 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -70,10 +70,10 @@ <el-tag v-else type="danger">鎸傝捣</el-tag> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> - </template> + <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> + </template> </el-table-column> <el-table-column align="center" prop="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column> <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="缁撴潫鏃堕棿" width="160"></el-table-column> @@ -165,6 +165,7 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; //瀹℃壒璁板綍缁勪欢 const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); const queryFormRef = ref<ElFormInstance>(); const categoryTreeRef = ref<ElTreeInstance>(); diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index 45ec729..e1c72b7 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -64,9 +64,9 @@ </el-tag> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag v-if="tab === 'waiting'" type="success">{{ scope.row.businessStatusName }}</el-tag> + <dict-tag v-if="tab === 'waiting'" :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> <el-tag v-else type="success">宸插畬鎴�</el-tag> </template> </el-table-column> @@ -139,6 +139,7 @@ const queryFormRef = ref<ElFormInstance>(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); // 閬僵灞� const loading = ref(true); // 閫変腑鏁扮粍 diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index 8ccb3a5..7b72954 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -57,10 +57,10 @@ <el-tag v-else type="danger">鎸傝捣</el-tag> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> - </template> + <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> + </template> </el-table-column> <el-table-column align="center" prop="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column> <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="缁撴潫鏃堕棿" width="160"></el-table-column> @@ -120,6 +120,7 @@ import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); const queryFormRef = ref<ElFormInstance>(); const categoryTreeRef = ref<ElTreeInstance>(); diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 7393999..88c38ed 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -48,9 +48,9 @@ </template> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> + <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" width="200"> @@ -78,6 +78,7 @@ //瀹℃壒璁板綍缁勪欢 const queryFormRef = ref<ElFormInstance>(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); // 閬僵灞� const loading = ref(true); // 閫変腑鏁扮粍 diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index af609cb..5eb6d83 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -48,9 +48,9 @@ </template> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> + <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> </template> </el-table-column> <el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column> @@ -81,10 +81,10 @@ import { TaskQuery, TaskVO } from '@/api/workflow/task/types'; import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; - +const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); //鎻愪氦缁勪欢 const queryFormRef = ref<ElFormInstance>(); -const { proxy } = getCurrentInstance() as ComponentInternalInstance; // 閬僵灞� const loading = ref(true); // 閫変腑鏁扮粍 -- Gitblit v1.9.3