From e7ff82950218483991771f9f8eb053b8b32163af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 三月 2024 14:23:24 +0800
Subject: [PATCH] update 优化 工作流代码与接口命名
---
src/api/workflow/processDefinition/types.ts | 2
src/api/workflow/processInstance/index.ts | 40 ++++++----
src/components/Process/selectSysUser.vue | 6
src/views/workflow/task/myDocument.vue | 6
src/views/workflow/task/taskCopyList.vue | 4
src/api/workflow/workflowUser/index.ts | 12 +-
src/api/workflow/task/index.ts | 26 +++---
src/views/workflow/task/allTaskWaiting.vue | 22 ++--
src/views/workflow/task/taskFinish.vue | 4
src/views/workflow/task/taskWaiting.vue | 4
src/views/workflow/processInstance/index.vue | 26 +++---
src/api/workflow/processDefinition/index.ts | 33 ++-----
src/components/Process/multiInstanceUser.vue | 10 +-
src/components/Process/approvalRecord.vue | 6
src/views/workflow/processDefinition/index.vue | 16 ++--
15 files changed, 107 insertions(+), 110 deletions(-)
diff --git a/src/api/workflow/processDefinition/index.ts b/src/api/workflow/processDefinition/index.ts
index f64b531..23951e2 100644
--- a/src/api/workflow/processDefinition/index.ts
+++ b/src/api/workflow/processDefinition/index.ts
@@ -1,7 +1,6 @@
import request from '@/utils/request';
-import { ProcessDefinitionQuery, ProcessDefinitionVO, ProcessDefinitionXmlVO } from '@/api/workflow/processDefinition/types';
+import { ProcessDefinitionQuery, ProcessDefinitionVO, definitionXmlVO } from '@/api/workflow/processDefinition/types';
import { AxiosPromise } from 'axios';
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
/**
* 鑾峰彇娴佺▼瀹氫箟鍒楄〃
@@ -20,9 +19,9 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @returns
*/
-export const getProcessDefinitionListByKey = (key: string) => {
+export const getListByKey = (key: string) => {
return request({
- url: `/workflow/processDefinition/getProcessDefinitionListByKey/${key}`,
+ url: `/workflow/processDefinition/getListByKey/${key}`,
method: 'get'
});
};
@@ -30,9 +29,9 @@
/**
* 閫氳繃娴佺▼瀹氫箟id鑾峰彇娴佺▼鍥�
*/
-export const processDefinitionImage = (processDefinitionId: string): AxiosPromise<any> => {
+export const definitionImage = (processDefinitionId: string): AxiosPromise<any> => {
return request({
- url: `/workflow/processDefinition/processDefinitionImage/${processDefinitionId}` + '?t' + Math.random(),
+ url: `/workflow/processDefinition/definitionImage/${processDefinitionId}` + '?t' + Math.random(),
method: 'get'
});
};
@@ -42,9 +41,9 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @returns
*/
-export const processDefinitionXml = (processDefinitionId: string): AxiosPromise<ProcessDefinitionXmlVO> => {
+export const definitionXml = (processDefinitionId: string): AxiosPromise<definitionXmlVO> => {
return request({
- url: `/workflow/processDefinition/processDefinitionXml/${processDefinitionId}`,
+ url: `/workflow/processDefinition/definitionXml/${processDefinitionId}`,
method: 'get'
});
};
@@ -67,9 +66,9 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @returns
*/
-export const updateProcessDefState = (processDefinitionId: string) => {
+export const updateDefinitionState = (processDefinitionId: string) => {
return request({
- url: `/workflow/processDefinition/updateProcessDefState/${processDefinitionId}`,
+ url: `/workflow/processDefinition/updateDefinitionState/${processDefinitionId}`,
method: 'put'
});
};
@@ -104,20 +103,10 @@
* @param fromProcessDefinitionId
* @returns
*/
-export const migrationProcessDefinition = (currentProcessDefinitionId: string, fromProcessDefinitionId: string) => {
+export const migrationDefinition = (currentProcessDefinitionId: string, fromProcessDefinitionId: string) => {
return request({
- url: `/workflow/processDefinition/migrationProcessDefinition/${currentProcessDefinitionId}/${fromProcessDefinitionId}`,
+ url: `/workflow/processDefinition/migrationDefinition/${currentProcessDefinitionId}/${fromProcessDefinitionId}`,
method: 'put'
});
};
-/**
- * 鏌ヨ娴佺▼瀹氫箟鍒楄〃
- * @returns
- */
-export const getProcessDefinitionList = () => {
- return request({
- url: `/workflow/processDefinition/getProcessDefinitionList`,
- method: 'get'
- });
-};
diff --git a/src/api/workflow/processDefinition/types.ts b/src/api/workflow/processDefinition/types.ts
index 8987b33..3775ba2 100644
--- a/src/api/workflow/processDefinition/types.ts
+++ b/src/api/workflow/processDefinition/types.ts
@@ -16,7 +16,7 @@
deploymentTime: string;
}
-export interface ProcessDefinitionXmlVO {
+export interface definitionXmlVO {
xml: string[];
xmlStr: string;
}
diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index 295fc0d..869245e 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -1,17 +1,15 @@
import request from '@/utils/request';
import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
import { AxiosPromise } from 'axios';
-import { string } from 'vue-types';
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
/**
* 鏌ヨ杩愯涓疄渚嬪垪琛�
* @param query
* @returns {*}
*/
-export const getProcessInstanceRunningByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByRunning = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
return request({
- url: '/workflow/processInstance/getProcessInstanceRunningByPage',
+ url: '/workflow/processInstance/getPageByRunning',
method: 'get',
params: query
});
@@ -22,9 +20,9 @@
* @param query
* @returns {*}
*/
-export const getProcessInstanceFinishByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByFinish = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
return request({
- url: '/workflow/processInstance/getProcessInstanceFinishByPage',
+ url: '/workflow/processInstance/getPageByFinish',
method: 'get',
params: query
});
@@ -33,9 +31,19 @@
/**
* 閫氳繃娴佺▼瀹炰緥id鑾峰彇鍘嗗彶娴佺▼鍥�
*/
-export const getHistoryProcessImage = (processInstanceId: string) => {
+export const getHistoryImage = (processInstanceId: string) => {
return request({
- url: `/workflow/processInstance/getHistoryProcessImage/${processInstanceId}` + '?t' + Math.random(),
+ url: `/workflow/processInstance/getHistoryImage/${processInstanceId}` + '?t' + Math.random(),
+ method: 'get'
+ });
+};
+
+/**
+ * 閫氳繃娴佺▼瀹炰緥id鑾峰彇鍘嗗彶娴佺▼鍥捐繍琛屼腑锛屽巻鍙茬瓑鑺傜偣
+ */
+export const getHistoryList = (processInstanceId: string) => {
+ return request({
+ url: `/workflow/processInstance/getHistoryList/${processInstanceId}` + '?t' + Math.random(),
method: 'get'
});
};
@@ -57,9 +65,9 @@
* @param data 鍙傛暟
* @returns
*/
-export const deleteRuntimeProcessInst = (data: object) => {
+export const deleteRunInstance = (data: object) => {
return request({
- url: `/workflow/processInstance/deleteRuntimeProcessInst`,
+ url: `/workflow/processInstance/deleteRunInstance`,
method: 'post',
data: data
});
@@ -70,9 +78,9 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @returns
*/
-export const deleteRuntimeProcessAndHisInst = (processInstanceId: string | string[]) => {
+export const deleteRunAndHisInstance = (processInstanceId: string | string[]) => {
return request({
- url: `/workflow/processInstance/deleteRuntimeProcessAndHisInst/${processInstanceId}`,
+ url: `/workflow/processInstance/deleteRunAndHisInstance/${processInstanceId}`,
method: 'delete'
});
};
@@ -82,9 +90,9 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @returns
*/
-export const deleteFinishProcessAndHisInst = (processInstanceId: string | string[]) => {
+export const deleteFinishAndHisInstance = (processInstanceId: string | string[]) => {
return request({
- url: `/workflow/processInstance/deleteFinishProcessAndHisInst/${processInstanceId}`,
+ url: `/workflow/processInstance/deleteFinishAndHisInstance/${processInstanceId}`,
method: 'delete'
});
};
@@ -94,9 +102,9 @@
* @param query
* @returns {*}
*/
-export const getCurrentSubmitByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByCurrent = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
return request({
- url: '/workflow/processInstance/getCurrentSubmitByPage',
+ url: '/workflow/processInstance/getPageByCurrent',
method: 'get',
params: query
});
diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index 7be76f7..fbeca0e 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -6,9 +6,9 @@
* @param query
* @returns {*}
*/
-export const getTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
return request({
- url: '/workflow/task/getTaskWaitByPage',
+ url: '/workflow/task/getPageByTaskWait',
method: 'get',
params: query
});
@@ -19,9 +19,9 @@
* @param query
* @returns {*}
*/
-export const getTaskFinishByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
return request({
- url: '/workflow/task/getTaskFinishByPage',
+ url: '/workflow/task/getPageByTaskFinish',
method: 'get',
params: query
});
@@ -32,9 +32,9 @@
* @param query
* @returns {*}
*/
-export const getTaskCopyByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
return request({
- url: '/workflow/task/getTaskCopyByPage',
+ url: '/workflow/task/getPageByTaskCopy',
method: 'get',
params: query
});
@@ -45,9 +45,9 @@
* @param query
* @returns {*}
*/
-export const getAllTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
return request({
- url: '/workflow/task/getAllTaskWaitByPage',
+ url: '/workflow/task/getPageByAllTaskWait',
method: 'get',
params: query
});
@@ -58,9 +58,9 @@
* @param query
* @returns {*}
*/
-export const getAllTaskFinishByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByAllTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
return request({
- url: '/workflow/task/getAllTaskFinishByPage',
+ url: '/workflow/task/getPageByAllTaskFinish',
method: 'get',
params: query
});
@@ -169,9 +169,9 @@
/**
* 淇敼浠诲姟鍔炵悊浜�
- * @param taskIds
- * @param userId
- * @returns
+ * @param taskIds
+ * @param userId
+ * @returns
*/
export const updateAssignee = (taskIds: Array<string>,userId: string) => {
return request({
diff --git a/src/api/workflow/workflowUser/index.ts b/src/api/workflow/workflowUser/index.ts
index e3ed8d9..7822715 100644
--- a/src/api/workflow/workflowUser/index.ts
+++ b/src/api/workflow/workflowUser/index.ts
@@ -7,9 +7,9 @@
* @param query
* @returns {*}
*/
-export const getWorkflowAddMultiListByPage = (query: object) => {
+export const getPageByAddMultiInstance = (query: object) => {
return request({
- url: '/workflow/user/getWorkflowAddMultiListByPage',
+ url: '/workflow/user/getPageByAddMultiInstance',
method: 'get',
params: query
});
@@ -20,9 +20,9 @@
* @param query
* @returns {*}
*/
-export const getWorkflowDeleteMultiInstanceList = (taskId: string) => {
+export const getListByDeleteMultiInstance = (taskId: string) => {
return request({
- url: '/workflow/user/getWorkflowDeleteMultiInstanceList/' + taskId,
+ url: '/workflow/user/getListByDeleteMultiInstance/' + taskId,
method: 'get'
});
};
@@ -44,9 +44,9 @@
* @param query
* @returns {*}
*/
-export const getUserListByPage = (query: object) => {
+export const getPageByUserList = (query: object) => {
return request({
- url: '/workflow/user/getUserListByPage',
+ url: '/workflow/user/getPageByUserList',
method: 'get',
params: query
});
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index d06e7ef..eb40228 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -55,7 +55,7 @@
</template>
</el-table-column>
</el-table>
-
+
</el-popover>
</template>
</el-table-column>
@@ -69,7 +69,7 @@
</el-dialog>
</template>
<script lang="ts" setup>
-import { getHistoryProcessImage, getHistoryRecord } from '@/api/workflow/processInstance';
+import { getHistoryImage, getHistoryRecord } from '@/api/workflow/processInstance';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { ref } from 'vue';
const props = defineProps({
@@ -99,7 +99,7 @@
loading.value = true;
historyList.value = [];
graphicInfoVos.value = [];
- getHistoryProcessImage(processInstanceId).then((res) => {
+ getHistoryImage(processInstanceId).then((res) => {
src.value = 'data:image/png;base64,' + res.data
});
getHistoryRecord(processInstanceId).then((response) => {
diff --git a/src/components/Process/multiInstance-user.vue b/src/components/Process/multiInstanceUser.vue
similarity index 96%
rename from src/components/Process/multiInstance-user.vue
rename to src/components/Process/multiInstanceUser.vue
index 96fa21f..d79bac9 100644
--- a/src/components/Process/multiInstance-user.vue
+++ b/src/components/Process/multiInstanceUser.vue
@@ -84,7 +84,7 @@
<script setup name="User" lang="ts">
import { deptTreeSelect } from '@/api/system/user';
-import { getWorkflowAddMultiListByPage, getWorkflowDeleteMultiInstanceList, getUserListByIds } from '@/api/workflow/workflowUser';
+import { getPageByAddMultiInstance, getListByDeleteMultiInstance, getUserListByIds } from '@/api/workflow/workflowUser';
import { addMultiInstanceExecution, deleteMultiInstanceExecution } from '@/api/workflow/task';
import { UserVO } from '@/api/system/user/types';
import { DeptVO } from '@/api/system/dept/types';
@@ -151,7 +151,7 @@
visible.value = true;
queryParams.value.taskId = taskId;
loading.value = true;
- const res = await getWorkflowAddMultiListByPage(queryParams.value);
+ const res = await getPageByAddMultiInstance(queryParams.value);
loading.value = false;
userList.value = res.rows;
total.value = res.total;
@@ -173,7 +173,7 @@
const getList = async () => {
loading.value = true;
- const res = await getWorkflowAddMultiListByPage(queryParams.value);
+ const res = await getPageByAddMultiInstance(queryParams.value);
loading.value = false;
userList.value = res.rows;
total.value = res.total;
@@ -199,7 +199,7 @@
queryParams.value.taskId = taskId;
multiInstance.value = 'delete';
visible.value = true;
- const res = await getWorkflowDeleteMultiInstanceList(taskId);
+ const res = await getListByDeleteMultiInstance(taskId);
taskList.value = res.data;
loading.value = false;
};
@@ -359,4 +359,4 @@
getAddMultiInstanceList,
getDeleteMultiInstanceList
});
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/Process/sys-user.vue b/src/components/Process/selectSysUser.vue
similarity index 97%
rename from src/components/Process/sys-user.vue
rename to src/components/Process/selectSysUser.vue
index dc100f3..619ad65 100644
--- a/src/components/Process/sys-user.vue
+++ b/src/components/Process/selectSysUser.vue
@@ -85,7 +85,7 @@
<script setup name="User" lang="ts">
import { deptTreeSelect } from '@/api/system/user';
-import { getUserListByPage, getUserListByIds } from '@/api/workflow/workflowUser';
+import { getPageByUserList, getUserListByIds } from '@/api/workflow/workflowUser';
import { UserVO } from '@/api/system/user/types';
import { DeptVO } from '@/api/system/dept/types';
import { ComponentInternalInstance } from 'vue';
@@ -145,7 +145,7 @@
userIds.value = userIdList;
visible.value = true;
loading.value = true;
- const res = await getUserListByPage(queryParams.value);
+ const res = await getPageByUserList(queryParams.value);
loading.value = false;
userList.value = res.rows;
total.value = res.total;
@@ -167,7 +167,7 @@
const getList = async () => {
loading.value = true;
- const res = await getUserListByPage(queryParams.value);
+ const res = await getPageByUserList(queryParams.value);
loading.value = false;
userList.value = res.rows;
total.value = res.total;
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 3843573..4eca980 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -194,13 +194,13 @@
<script lang="ts" setup name="processDefinition">
import {
listProcessDefinition,
- processDefinitionImage,
- processDefinitionXml,
+ definitionImage,
+ definitionXml,
deleteProcessDefinition,
- updateProcessDefState,
+ updateDefinitionState,
convertToModel,
deployProcessFile,
- getProcessDefinitionListByKey
+ getListByKey
} from '@/api/workflow/processDefinition';
import ProcessPreview from './components/processPreview.vue';
import { listCategory } from '@/api/workflow/category';
@@ -320,7 +320,7 @@
const getProcessDefinitionHitoryList = async (id: string, key: string) => {
processDefinitionDialog.visible = true;
loading.value = true;
- const resp = await getProcessDefinitionListByKey(key);
+ const resp = await getListByKey(key);
if (resp.data && resp.data.length > 0) {
processDefinitionHistoryList.value = resp.data.filter((item: any) => item.id !== id);
}
@@ -330,7 +330,7 @@
//棰勮鍥剧墖
const clickPreviewImg = async (id: string) => {
loading.value = true;
- const resp = await processDefinitionImage(id);
+ const resp = await definitionImage(id);
if (previewRef.value) {
url.value = [];
url.value.push('data:image/png;base64,' + resp.data);
@@ -341,7 +341,7 @@
//棰勮xml
const clickPreviewXML = async (id: string) => {
loading.value = true;
- const resp = await processDefinitionXml(id);
+ const resp = await definitionXml(id);
if (previewRef.value) {
url.value = [];
url.value = resp.data.xml;
@@ -367,7 +367,7 @@
}
await proxy?.$modal.confirm(msg);
loading.value = true;
- await updateProcessDefState(row.id).finally(() => (loading.value = false));
+ await updateDefinitionState(row.id).finally(() => (loading.value = false));
await getList();
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
};
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 9830366..eafc609 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -154,13 +154,13 @@
<script lang="ts" setup>
import {
- getProcessInstanceRunningByPage,
- getProcessInstanceFinishByPage,
- deleteRuntimeProcessAndHisInst,
- deleteFinishProcessAndHisInst,
- deleteRuntimeProcessInst
+ getPageByRunning,
+ getPageByFinish,
+ deleteRunAndHisInstance,
+ deleteFinishAndHisInstance,
+ deleteRunInstance
} from '@/api/workflow/processInstance';
-import { getProcessDefinitionListByKey, migrationProcessDefinition } from '@/api/workflow/processDefinition';
+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';
@@ -282,7 +282,7 @@
//鍒嗛〉
const getProcessInstanceRunningList = () => {
loading.value = true;
- getProcessInstanceRunningByPage(queryParams.value).then((resp) => {
+ getPageByRunning(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -291,7 +291,7 @@
//鍒嗛〉
const getProcessInstanceFinishList = () => {
loading.value = true;
- getProcessInstanceFinishByPage(queryParams.value).then((resp) => {
+ getPageByFinish(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -304,10 +304,10 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎id涓恒��' + id + '銆戠殑鏁版嵁椤癸紵');
loading.value = true;
if ('running' === tab.value) {
- await deleteRuntimeProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
getProcessInstanceRunningList();
} else {
- await deleteFinishProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteFinishAndHisInstance(id).finally(() => (loading.value = false));
getProcessInstanceFinishList();
}
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
@@ -329,7 +329,7 @@
processInstanceId: row.id,
deleteReason: deleteReason.value
};
- await deleteRuntimeProcessInst(param).finally(() => (loading.value = false));
+ await deleteRunInstance(param).finally(() => (loading.value = false));
getProcessInstanceRunningList();
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
}
@@ -342,7 +342,7 @@
processDefinitionDialog.visible = true;
processDefinitionId.value = id;
loading.value = true;
- getProcessDefinitionListByKey(key).then((resp) => {
+ getListByKey(key).then((resp) => {
if (resp.data && resp.data.length > 0) {
processDefinitionHistoryList.value = resp.data.filter((item: any) => item.id !== id);
}
@@ -353,7 +353,7 @@
const handleChange = async (id: string) => {
await proxy?.$modal.confirm('鏄惁纭鍒囨崲锛�');
loading.value = true;
- migrationProcessDefinition(processDefinitionId.value, id).then((resp) => {
+ migrationDefinition(processDefinitionId.value, id).then((resp) => {
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
getProcessInstanceRunningList();
processDefinitionDialog.visible = false;
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index ef1c45e..5a5b5d4 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -101,17 +101,17 @@
<submitVerify ref="submitVerifyRef" :task-id="taskId" @submit-callback="handleQuery" />
<!-- 鍔犵缁勪欢 -->
<multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="handleQuery" />
- <!-- 鍔犵缁勪欢 -->
- <SysUser ref="sysUserRef" :multiple="true" @submit-callback="submitCallback" />
+ <!-- 閫変汉缁勪欢 -->
+ <selectSysUser ref="selectSysUserRef" :multiple="true" @submit-callback="submitCallback" />
</div>
</template>
<script lang="ts" setup>
-import { getAllTaskWaitByPage, getAllTaskFinishByPage, updateAssignee } from '@/api/workflow/task';
+import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee } from '@/api/workflow/task';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import SubmitVerify from '@/components/Process/submitVerify.vue';
-import MultiInstanceUser from '@/components/Process/multiInstance-user.vue';
-import SysUser from '@/components/Process/sys-user.vue';
+import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
+import SelectSysUser from '@/components/Process/selectSysUser.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
//鎻愪氦缁勪欢
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
@@ -120,7 +120,7 @@
//鍔犵缁勪欢
const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
//閫変汉缁勪欢
-const sysUserRef = ref<InstanceType<typeof SysUser>>();
+const selectSysUserRef = ref<InstanceType<typeof SelectSysUser>>();
const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -205,7 +205,7 @@
//鍒嗛〉
const getWaitingList = () => {
loading.value = true;
- getAllTaskWaitByPage(queryParams.value).then((resp) => {
+ getPageByAllTaskWait(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -213,22 +213,22 @@
};
const getFinishList = () => {
loading.value = true;
- getAllTaskFinishByPage(queryParams.value).then((resp) => {
+ getPageByAllTaskFinish(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
});
};
const handleUpdate = () => {
- if (sysUserRef.value) {
- sysUserRef.value.getUserList([]);
+ if (selectSysUserRef.value) {
+ selectSysUserRef.value.getUserList([]);
}
};
//淇敼鍔炵悊浜�
const submitCallback = (data) => {
if (data && data.value.length > 0) {
updateAssignee(ids.value, data.value[0].userId).then((resp) => {
- sysUserRef.value.close();
+ selectSysUserRef.value.close();
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
handleQuery();
});
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 1e1d2a0..4597a2a 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -107,7 +107,7 @@
</template>
<script lang="ts" setup>
-import { getCurrentSubmitByPage, deleteRuntimeProcessAndHisInst, cancelProcessApply } from '@/api/workflow/processInstance';
+import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import SubmitVerify from '@/components/Process/submitVerify.vue';
import { listCategory } from '@/api/workflow/category';
@@ -218,7 +218,7 @@
//鍒嗛〉
const getList = () => {
loading.value = true;
- getCurrentSubmitByPage(queryParams.value).then((resp) => {
+ getPageByCurrent(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -231,7 +231,7 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎id涓恒��' + id + '銆戠殑鏁版嵁椤癸紵');
loading.value = true;
if ('running' === tab.value) {
- await deleteRuntimeProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
getList();
}
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 6348024..112c95b 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -73,7 +73,7 @@
</template>
<script lang="ts" setup>
-import { getTaskCopyByPage} from '@/api/workflow/task';
+import { getPageByTaskCopy} from '@/api/workflow/task';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
//瀹℃壒璁板綍缁勪欢
@@ -131,7 +131,7 @@
//鍒嗛〉
const getTaskCopyList = () => {
loading.value = true;
- getTaskCopyByPage(queryParams.value).then((resp) => {
+ getPageByTaskCopy(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 3e8adba..0b092ea 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -62,7 +62,7 @@
</template>
<script lang="ts" setup>
-import { getTaskFinishByPage } from '@/api/workflow/task';
+import { getPageByTaskFinish } from '@/api/workflow/task';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
//瀹℃壒璁板綍缁勪欢
@@ -119,7 +119,7 @@
};
const getFinishList = () => {
loading.value = true;
- getTaskFinishByPage(queryParams.value).then((resp) => {
+ getPageByTaskFinish(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index c3f34aa..a6443bd 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -89,7 +89,7 @@
</template>
<script lang="ts" setup>
-import { getTaskWaitByPage, claim, returnTask } from '@/api/workflow/task';
+import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import SubmitVerify from '@/components/Process/submitVerify.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
@@ -150,7 +150,7 @@
//鍒嗛〉
const getWaitingList = () => {
loading.value = true;
- getTaskWaitByPage(queryParams.value).then((resp) => {
+ getPageByTaskWait(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
--
Gitblit v1.9.3