From c245ec7323b0f85cccf581b6d6aeb0870eafae27 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 30 Sep 2023 18:09:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/businessForm/list.vue | 66 ++++++++++++++++++------
 src/views/workflow/task/myDocument.vue   | 13 +++--
 2 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/views/workflow/businessForm/list.vue b/src/views/workflow/businessForm/list.vue
index c569d05..f136b2f 100644
--- a/src/views/workflow/businessForm/list.vue
+++ b/src/views/workflow/businessForm/list.vue
@@ -25,10 +25,6 @@
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               v-hasPermi="['workflow:businessForm:edit']">修改</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['workflow:businessForm:remove']">删除</el-button>
-          </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport"
               v-hasPermi="['workflow:businessForm:export']">导出</el-button>
@@ -39,20 +35,36 @@
 
       <el-table v-loading="loading" :data="businessFormList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键" align="center" prop="id" v-if="true" />
+        <el-table-column label="主键" align="center" prop="id" v-if="false" />
         <el-table-column label="申请编码" align="center" prop="applyCode" />
-        <el-table-column label="表单id" align="center" prop="formId" />
         <el-table-column label="表单名称" align="center" prop="formName" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['workflow:businessForm:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['workflow:businessForm:remove']"></el-button>
-            </el-tooltip>
+            <el-tag type="success">{{ scope.row.processInstanceVo.businessStatusName }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5" v-if="scope.row.processInstanceVo.businessStatus !== 'draft'">
+                <el-button type="text" size="small" icon="Document"
+                  @click="handleApprovalRecord(scope.row.processInstanceVo.id)">审批记录</el-button>
+              </el-col>
+              <el-col :span="1.5"
+                v-if="scope.row.processInstanceVo.businessStatus === 'draft' || scope.row.processInstanceVo.businessStatus === 'cancel' || scope.row.processInstanceVo.businessStatus === 'back'">
+                <el-button v-hasPermi="['workflow:businessForm:remove']" type="text" size="small" icon="Delete"
+                  @click="handleDelete(scope.row)">删除</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.processInstanceVo.businessStatus === 'waiting'">
+                <el-button type="text" size="small" icon="Notification"
+                  @click="handleCancelProcessApply(scope.row.processInstanceVo.id)">撤销</el-button>
+              </el-col>
+              <el-col :span="1.5"
+                v-if="scope.row.processInstanceVo.businessStatus === 'draft' || scope.row.processInstanceVo.businessStatus === 'cancel' || scope.row.processInstanceVo.businessStatus === 'back'">
+                <el-button v-hasPermi="['workflow:businessForm:edit']" type="text" size="small" icon="Edit"
+                  @click="handleUpdate(scope.row)">修改</el-button>
+              </el-col>
+            </el-row>
           </template>
         </el-table-column>
       </el-table>
@@ -75,16 +87,23 @@
     </el-dialog>
     <!-- 提交组件 -->
     <submitVerify ref="submitVerifyRef" @submitCallback="submitCallback" @cancelCallback="cancelCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
   </div>
 </template>
 
 <script setup name="BusinessForm" lang="ts">
 import { listBusinessForm, getBusinessForm, delBusinessForm, updateBusinessForm } from '@/api/workflow/businessForm';
+import { cancelProcessApply } from '@/api/workflow/processInstance';
 import { BusinessFormVO, BusinessFormQuery, BusinessFormForm } from '@/api/workflow/businessForm/types';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import { startWorkFlow } from '@/api/workflow/task';
+
 //提交组件
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const businessFormList = ref<BusinessFormVO[]>([]);
@@ -243,8 +262,10 @@ const handleDelete = async (row?: BusinessFormVO) => {
   const _ids = row?.id || ids.value;
   const _applyCode = row?.applyCode || applyCodes.value;
   await proxy?.$modal.confirm('是否确认删除流程编号为【' + _applyCode + '】的数据项？').finally(() => loading.value = false);
+  loading.value = true;
   await delBusinessForm(_ids);
   proxy?.$modal.msgSuccess("删除成功");
+  loading.value = false;
   await getList();
 }
 
@@ -254,7 +275,20 @@ const handleExport = () => {
     ...queryParams.value
   }, `businessForm_${new Date().getTime()}.xlsx`)
 }
-
+//审批记录
+const handleApprovalRecord = (processInstanceId: string) => {
+  if (approvalRecordRef.value) {
+    approvalRecordRef.value.init(processInstanceId);
+  }
+};
+/** 撤销按钮操作 */
+const handleCancelProcessApply = async (processInstanceId: string) => {
+  await proxy?.$modal.confirm('是否确认撤销当前单据？');
+  loading.value = true;
+  await cancelProcessApply(processInstanceId).finally(() => (loading.value = false));
+  getList();
+  proxy?.$modal.msgSuccess('撤销成功');
+};
 onMounted(() => {
   getList();
 });
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 683a544..f994349 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -62,7 +62,7 @@
                 <el-row :gutter="10" class="mb8">
                   <el-col :span="1.5">
                     <el-button type="text" size="small" icon="Document"
-                      @click="handleApprovalRecord(scope.row)">审批记录</el-button>
+                      @click="handleApprovalRecord(scope.row.id)">审批记录</el-button>
                   </el-col>
                   <el-col :span="1.5"
                     v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'">
@@ -70,7 +70,7 @@
                   </el-col>
                   <el-col :span="1.5" v-if="scope.row.businessStatus === 'waiting'">
                     <el-button type="text" size="small" icon="Notification"
-                      @click="handleCancelProcessApply(scope.row)">撤销</el-button>
+                      @click="handleCancelProcessApply(scope.row.id)">撤销</el-button>
                   </el-col>
                   <el-col :span="1.5"
                     v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'">
@@ -180,9 +180,9 @@ const getTreeselect = async () => {
 };
 
 //审批记录
-const handleApprovalRecord = (row: any) => {
+const handleApprovalRecord = (processInstanceId: string) => {
   if (approvalRecordRef.value) {
-    approvalRecordRef.value.init(row.id);
+    approvalRecordRef.value.init(processInstanceId);
   }
 };
 /** 搜索按钮操作 */
@@ -226,12 +226,11 @@ const handleDelete = async (row: any) => {
 };
 
 /** 撤销按钮操作 */
-const handleCancelProcessApply = async (row: any) => {
-  const id = row.id || ids.value;
+const handleCancelProcessApply = async (processInstanceId: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   if ('running' === tab.value) {
-    await cancelProcessApply(id).finally(() => (loading.value = false));
+    await cancelProcessApply(processInstanceId).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('撤销成功');