add 添加流程实例，全部待办表单查看

2024-03-22 23:42:30 +08:00
parent 31f4219f3d
commit d186c800f0
4 changed files with 78 additions and 59 deletions
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@ -77,27 +77,9 @@
            </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>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" :width="tab === 'finish' ? '130' : '160'">
              <template #default="scope">
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">审批记录</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-                  </el-col>
-                </el-row>
                <el-row v-if="tab === 'running'" :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button
-                      link
-                      type="primary"
-                      size="small"
-                      icon="Sort"
-                      @click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
-                      >切换版本</el-button
-                    >
-                  </el-col>
                  <el-col :span="1.5">
                    <el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300">
                      <el-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" />
@ -110,6 +92,24 @@
                      </template>
                    </el-popover>
                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button
+                      link
+                      type="primary"
+                      size="small"
+                      icon="Sort"
+                      @click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
+                      >切换版本</el-button
+                    >
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5">
+                    <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                  </el-col>
                </el-row>
              </template>
            </el-table-column>
@ -146,8 +146,6 @@
        </el-table-column>
      </el-table>
    </el-dialog>
-    <!-- 审批记录 -->
-    <approvalRecord ref="approvalRecordRef" />
  </div>
 </template>

@ -160,12 +158,10 @@ import {
  deleteRunInstance
 } from '@/api/workflow/processInstance';
 import { getListByKey, migrationDefinition } from '@/api/workflow/processDefinition';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import { listCategory } from '@/api/workflow/category';
 import { CategoryVO } from '@/api/workflow/category/types';
 import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
 //审批记录组件
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
@ -213,11 +209,6 @@ const queryParams = ref<ProcessInstanceQuery>({
  categoryCode: undefined
 });

-onMounted(() => {
-  getProcessInstanceRunningList();
-  getTreeselect();
-});
-
 /** 节点单击事件 */
 const handleNodeClick = (data: CategoryVO) => {
  queryParams.value.categoryCode = data.categoryCode;
@ -250,12 +241,6 @@ const getTreeselect = async () => {
  categoryOptions.value.push(data);
 };

-//审批记录
-const handleApprovalRecord = (row: any) => {
-  if (approvalRecordRef.value) {
-    approvalRecordRef.value.init(row.id);
-  }
-};
 /** 搜索按钮操作 */
 const handleQuery = () => {
  if ('running' === tab.value) {
@ -312,6 +297,7 @@ const handleDelete = async (row: any) => {
  proxy?.$modal.msgSuccess('删除成功');
 };
 const changeTab = async (data: string) => {
+  processInstanceList.value = []
  queryParams.value.pageNum = 1;
  if ('running' === data) {
    getProcessInstanceRunningList();
@ -359,4 +345,20 @@ const handleChange = async (id: string) => {
    loading.value = false;
  });
 };
+/** 查看按钮操作 */
+const handleView = (row) => {
+  if(row.wfFormDefinitionVo){
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+    })
+  }else{
+    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
+  }
+};
+
+onMounted(() => {
+  getProcessInstanceRunningList();
+  getTreeselect();
+});
 </script>
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@ -72,22 +72,24 @@
        </el-table-column>
        <el-table-column align="center" v-if="tab === 'waiting'" prop="createTime" label="创建时间" width="160"></el-table-column>
        <el-table-column align="center" v-if="tab === 'finish'" prop="startTime" label="创建时间" width="160"></el-table-column>
-        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" :width="tab === 'finish' ? '80' : '151'">
          <template #default="scope">
            <el-row :gutter="10" class="mb8">
              <el-col :span="1.5">
-                <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">审批记录</el-button>
-              </el-col>
-              <el-col v-if="scope.row.multiInstance" :span="1.5">
-                <el-button link type="primary" size="small" icon="CirclePlus" @click="addMultiInstanceUser(scope.row)">加签</el-button>
-              </el-col>
-              <el-col v-if="scope.row.multiInstance" :span="1.5">
-                <el-button link type="primary" size="small" icon="Remove" @click="deleteMultiInstanceUser(scope.row)">减签</el-button>
+                <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
              </el-col>
              <el-col v-if="tab === 'waiting'" :span="1.5">
                <el-button link type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">流程变量</el-button>
              </el-col>
            </el-row>
+            <el-row :gutter="10" class="mb8" v-if="scope.row.multiInstance" >
+              <el-col :span="1.5">
+                <el-button link type="primary" size="small" icon="Remove" @click="deleteMultiInstanceUser(scope.row)">减签</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button link type="primary" size="small" icon="CirclePlus" @click="addMultiInstanceUser(scope.row)">加签</el-button>
+              </el-col>
+            </el-row>
          </template>
        </el-table-column>
      </el-table>
@ -99,8 +101,6 @@
        @pagination="handleQuery"
      />
    </el-card>
-    <!-- 审批记录 -->
-    <approvalRecord ref="approvalRecordRef" />
    <!-- 加签组件 -->
    <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="handleQuery" />
    <!-- 选人组件 -->
@ -126,12 +126,10 @@

 <script lang="ts" setup>
 import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable } from '@/api/workflow/task';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
 import UserSelect from '@/components/UserSelect';
 import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
 //审批记录组件
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 //加签组件
 const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
 //选人组件 
@ -173,15 +171,7 @@ const queryParams = ref<TaskQuery>({
  processDefinitionKey: undefined
 });
 const tab = ref('waiting');
-onMounted(() => {
-  getWaitingList();
-});
-//审批记录
-const handleApprovalRecord = (row: TaskVO) => {
-  if (approvalRecordRef.value) {
-    approvalRecordRef.value.init(row.processInstanceId);
-  }
-};
+
 //加签
 const addMultiInstanceUser = (row: TaskVO) => {
  if (multiInstanceUserRef.value) {
@ -218,6 +208,7 @@ const handleSelectionChange = (selection: any) => {
  multiple.value = !selection.length;
 };
 const changeTab = async (data: string) => {
+  taskList.value = []
  queryParams.value.pageNum = 1;
  if ('waiting' === data) {
    getWaitingList();
@ -267,4 +258,18 @@ const handleInstanceVariable  = async (row: TaskVO) => {
  variableList.value = data.data
  variableLoading.value = false
 };
+/** 查看按钮操作 */
+const handleView = (row) => {
+  if(row.wfFormDefinitionVo){
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+    })
+  }else{
+    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
+  }
+};
+onMounted(() => {
+  getWaitingList();
+});
 </script>
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@ -127,8 +127,14 @@ const getTaskCopyList = () => {

 /** 查看按钮操作 */
 const handleView = (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push(`/demo/leaveEdit/index/${row.id}/view`);
+  if(row.wfFormDefinitionVo){
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+    })
+  }else{
+    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
+  }
 };


--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@ -114,8 +114,14 @@ const getFinishList = () => {
 };
 /** 查看按钮操作 */
 const handleView = (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push(`/demo/leaveEdit/index/${row.businessKey}/view`);
+  if(row.wfFormDefinitionVo){
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+    })
+  }else{
+    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
+  }
 };

 onMounted(() => {