From a6f12be59f4d9b6272079d84ef2d81aaf1532c3c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 26 十二月 2024 23:19:59 +0800
Subject: [PATCH] 流程推进关闭优化、项目码显示临时调整、流程推进分页当前页字段调整
---
src/views/projectEngineering/projectLibrary/index.vue | 2 +-
src/views/flowable/task/myProcess/send/index.vue | 10 +++++++---
src/views/flowable/task/myProcess/detail/index.vue | 2 ++
src/views/projectProcess/index.vue | 15 ++++++++++-----
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 6d4a7ce..363169a 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -192,6 +192,8 @@
},
/** 杩斿洖椤甸潰 */
goBack() {
+ // 鍏抽棴褰撳墠鏍囩椤�
+ this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({
path: '/projectFlow/detail',
query: {
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 8049573..70d044d 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -83,10 +83,10 @@
</el-alert>
<el-form-item label="鐢ㄦ埛绫诲瀷" prop="peopleType">
<el-select v-model="delegationForm.peopleType" @change="peopleTypeChange" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
- <el-option label="鎸囧畾浜哄憳" value="FIX_USER"></el-option>
- <el-option label="鍊欓�夌敤鎴�" value="USER"></el-option>
+ <el-option label="鎸囧畾浜哄憳" disabled value="FIX_USER"></el-option>
+ <el-option label="鍊欓�夌敤鎴�" disabled value="USER"></el-option>
<el-option label="鍊欓�夐儴闂�" value="DEPT"></el-option>
- <el-option label="鍊欓�夎鑹�" value="ROLE"></el-option>
+ <el-option label="鍊欓�夎鑹�" disabled value="ROLE"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="鍊欓�夐儴闂�" prop="targetId">
@@ -201,6 +201,7 @@
}).then(() => {
taskDelegation(this.delegationForm).then(res => {
this.$message.success("宸插彂璧疯浆鍔炵敵璇�")
+ this.goBack()
})
}).catch(() => {
this.$message({
@@ -304,6 +305,9 @@
},
/** 杩斿洖椤甸潰 */
goBack() {
+ // 鍏抽棴褰撳墠鏍囩椤�
+ this.$store.dispatch("tagsView/delView", this.$route);
+ // 璺宠浆璺敱
this.$router.push({
path: '/projectFlow/detail',
query: {
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index ef50cbe..c4c907e 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -217,7 +217,7 @@
<dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
</template>
<!-- projectColorCode鎻掓Ы -->
- <template v-if="item.slotName === 'coding'">
+ <template v-if="item.slotName === 'projectColorCode'">
<dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
</template>
<!-- projectType鎻掓Ы -->
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 969ae34..db7e1d4 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -206,8 +206,13 @@
<dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
</template>
<!-- projectColorCode鎻掓Ы -->
- <template v-if="item.slotName === 'projectColorCode'">
- <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+ <template v-if="item.slotName === 'projectColorCode' || item.slotName === 'coding'">
+ <div v-if="scope.row.projectColorCode">
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+ </div>
+ <div v-else>
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
+ </div>
</template>
<!-- projectType鎻掓Ы -->
<template v-if="item.slotName === 'projectType'">
@@ -259,7 +264,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -341,7 +346,7 @@
timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
projectName: null,
projectCode: null,
@@ -535,7 +540,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.currentPage = 1;
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
--
Gitblit v1.8.0