Forráskód Böngészése

update 调整流程状态

gssong 1 éve
szülő
commit
4752b4eb01

+ 3 - 3
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 { cancelProcessApply } from '@/api/workflow/processInstance';
 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);

+ 4 - 3
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 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>();
 

+ 3 - 2
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 userSelectRef = ref<InstanceType<typeof UserSelect>>();
 
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组

+ 4 - 3
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 { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processI
 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>();
 

+ 3 - 2
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 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组

+ 4 - 4
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 { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
 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);
 // 选中数组