From d678c54b1adfc5681afc1f92ee7eaea8dec1a53d Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 27 Oct 2024 13:21:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=20=E9=A9=B3=E5=9B=9E=20=E7=BB=88=E6=AD=A2=E7=AD=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/approvalRecord.vue |  8 ++++++--
 src/components/Process/submitVerify.vue   | 19 ++++++++++++-------
 src/views/workflow/leave/index.vue        | 11 ++---------
 src/views/workflow/leave/leaveEdit.vue    |  8 ++++----
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index d2417f2..dec8ec3 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -15,10 +15,14 @@
                   <el-tag type="success">{{ scope.row.approveName || '无' }}</el-tag>
                 </template>
               </el-table-column>
+              <el-table-column prop="flowStatus" label="状态" sortable align="center">
+                <template #default="scope">
+                  <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+                </template>
+              </el-table-column>
               <el-table-column prop="message" label="审批意见" sortable align="center"></el-table-column>
               <el-table-column prop="createTime" label="开始时间" sortable align="center"></el-table-column>
               <el-table-column prop="updateTime" label="结束时间" sortable align="center"></el-table-column>
-              <el-table-column prop="runDuration" label="运行时长" sortable align="center"></el-table-column>
               <el-table-column prop="attachmentList" label="附件" sortable align="center">
                 <template #default="scope">
                   <el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
@@ -48,7 +52,7 @@ import processApi from '@/api/workflow/processInstance';
 import { propTypes } from '@/utils/propTypes';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const props = defineProps({
   width: propTypes.string.def('70%'),
   height: propTypes.string.def('100%')
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 5ac198f..5286b1f 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -24,16 +24,21 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
-        <el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
-        <el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
-        <el-button v-if="task.flowStatus === '1' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="addMultiInstanceUser">
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="addMultiInstanceUser">
           加签
         </el-button>
-        <el-button v-if="task.flowStatus === '1' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="deleteMultiInstanceUser">
+        <el-button
+          v-if="task.flowStatus === 'waiting' && task.multiInstance"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="deleteMultiInstanceUser"
+        >
           减签
         </el-button>
-        <el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
-        <el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
+        <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
         <el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
       </span>
     </template>
@@ -48,7 +53,7 @@
 
     <!-- 驳回开始 -->
     <el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
-      <el-form v-if="task.flowStatus === '1'" v-loading="backLoading" :model="backForm" label-width="120px">
+      <el-form v-if="task.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
         <el-form-item label="驳回节点">
           <el-select v-model="backForm.nodeCode" clearable placeholder="请选择" style="width: 300px">
             <el-option v-for="item in taskNodeList" :key="item.nodeCode" :label="item.nodeName" :value="item.nodeCode" />
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 49c4d6a..0acc721 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -59,7 +59,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button
-              v-if="scope.row.status === '0' || scope.row.status === '9' || scope.row.status === '10'"
+              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
               v-hasPermi="['workflow:leave:edit']"
               size="small"
               link
@@ -68,14 +68,7 @@
               @click="handleUpdate(scope.row)"
               >修改</el-button
             >
-            <el-button
-              v-if="scope.row.status === '0' || scope.row.status === '9' || scope.row.status === '10'"
-              v-hasPermi="['workflow:leave:remove']"
-              size="small"
-              link
-              type="primary"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
+            <el-button v-hasPermi="['workflow:leave:remove']" size="small" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
               >删除</el-button
             >
             <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 4ba3a28..3b9662d 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -3,10 +3,10 @@
     <el-card shadow="never">
       <div style="display: flex; justify-content: space-between">
         <div>
-          <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('0')">暂存</el-button>
+          <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">暂存</el-button>
           <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">提 交</el-button>
           <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">审批</el-button>
-          <el-button v-if="form && form.id && form.status !== '0'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+          <el-button v-if="form && form.id && form.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
         </div>
         <div>
           <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -230,13 +230,13 @@ const submitButtonShow = computed(() => {
     routeParams.value.type === 'add' ||
     (routeParams.value.type === 'update' &&
       form.value.status &&
-      (form.value.status === '0' || form.value.status === '9' || form.value.status === '10'))
+      (form.value.status === 'draft' || form.value.status === 'cancel' || form.value.status === 'back'))
   );
 });
 
 //校验审批按钮是否显示
 const approvalButtonShow = computed(() => {
-  return routeParams.value.type === 'approval' && form.value.status && form.value.status === '1';
+  return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
 });
 
 onMounted(() => {