From d76f2b857d2ec75027981566616828f34251848e Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期二, 02 四月 2024 20:53:29 +0800 Subject: [PATCH] add 添加流程版本 --- src/views/workflow/task/allTaskWaiting.vue | 14 ++++-- src/views/workflow/task/taskFinish.vue | 14 ++++-- src/views/workflow/task/taskWaiting.vue | 16 +++++--- src/views/workflow/processInstance/index.vue | 6 ++ src/views/workflow/task/myDocument.vue | 12 ++++-- src/views/workflow/task/taskCopyList.vue | 14 ++++-- src/views/workflow/processDefinition/index.vue | 6 +- src/views/workflow/model/index.vue | 2 8 files changed, 54 insertions(+), 30 deletions(-) diff --git a/src/views/workflow/model/index.vue b/src/views/workflow/model/index.vue index c738e78..b3a7a68 100644 --- a/src/views/workflow/model/index.vue +++ b/src/views/workflow/model/index.vue @@ -60,7 +60,7 @@ <el-table border v-loading="loading" :data="modelList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column fixed align="center" type="index" label="搴忓彿" width="50"></el-table-column> - <el-table-column align="center" prop="name" label="妯″瀷鍚嶇О" width="200"></el-table-column> + <el-table-column align="center" :show-overflow-tooltip="true" prop="name" label="妯″瀷鍚嶇О" width="200"></el-table-column> <el-table-column align="center" prop="key" label="妯″瀷KEY"></el-table-column> <el-table-column align="center" prop="version" label="鐗堟湰鍙�" width="90"> <template #default="scope"> v{{ scope.row.version }}.0</template> diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index 2712929..d41bc95 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -56,7 +56,7 @@ <el-table border v-loading="loading" :data="processDefinitionList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column align="center" prop="name" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="name" label="娴佺▼瀹氫箟鍚嶇О" :show-overflow-tooltip="true"></el-table-column> <el-table-column align="center" prop="key" label="鏍囪瘑KEY" width="80"></el-table-column> <el-table-column align="center" prop="version" label="鐗堟湰鍙�" width="80"> <template #default="scope"> v{{ scope.row.version }}.0</template> @@ -167,8 +167,8 @@ <el-table v-loading="loading" :data="processDefinitionHistoryList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column align="center" prop="name" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column align="center" prop="key" label="鏍囪瘑Key"></el-table-column> + <el-table-column align="center" prop="name" label="娴佺▼瀹氫箟鍚嶇О" :show-overflow-tooltip="true" min-width="80"></el-table-column> + <el-table-column align="center" prop="key" label="鏍囪瘑KEY"></el-table-column> <el-table-column align="center" prop="version" label="鐗堟湰鍙�" width="90"> <template #default="scope"> v{{ scope.row.version }}.0</template> </el-table-column> diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 06b59b4..4fed6ba 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -59,7 +59,11 @@ <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> <el-table-column align="center" prop="processDefinitionVersion" label="鐗堟湰鍙�" width="90"> <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template> diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index e1c72b7..3adadf5 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -41,11 +41,15 @@ <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�"> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�"> <template v-if="tab === 'waiting'" #default="scope"> <template v-if="scope.row.participantVo && scope.row.assignee === null"> <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success"> diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index 7b72954..01e0a30 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -44,10 +44,14 @@ <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column v-if="false" fixed align="center" prop="id" label="id"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> <el-table-column align="center" prop="processDefinitionVersion" label="鐗堟湰鍙�" width="90"> <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template> </el-table-column> diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 88c38ed..6eb07c9 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -30,11 +30,15 @@ <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�"> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�"> <template #default="scope"> <template v-if="scope.row.participantVo && scope.row.assignee === null"> <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success"> diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index e6e3d6c..4d47145 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -30,11 +30,15 @@ <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�"> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�"> <template #default="scope"> <el-tag type="success"> {{ scope.row.assigneeName || '鏃�'}} diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index 5eb6d83..746d33b 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -27,14 +27,18 @@ <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar> </el-row> </template> - + <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�"> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�"> <template #default="scope"> <template v-if="scope.row.participantVo && scope.row.assignee === null"> <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success"> -- Gitblit v1.9.3