From c143be72329489ce0cb74e74bf3455ac405087e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 10 一月 2025 17:16:20 +0800
Subject: [PATCH] 表单回显优化
---
src/views/projectProcess/detail/index.vue | 303 +++++++++++++++++++++++++++++--------------------
1 files changed, 178 insertions(+), 125 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 31d5d71..207b6a4 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -1,103 +1,119 @@
<template>
- <div class="app-container" v-loading.fullscreen.lock="loading">
- <div class="top">
- <div class="project-title">
- <h2>椤圭洰鍚嶇О锛歿{detailData.projectName}}</h2>
- </div>
- <div class="project-info">
- <div class="project-info-item"></div>
- <div class="project-info-item">椤圭洰浠ｇ爜锛歿{detailData.projectCode}}</div>
- <div class="project-info-item">
- <div style="color: black">
- <div>涓璧勯噾</div>
- <div>甯傞噸鐐归」鐩�</div>
+ <div class="app-container">
+ <div v-loading="loading">
+ <div class="top">
+ <div class="project-title">
+ <h2>椤圭洰鍚嶇О锛歿{detailData.projectName}}</h2>
+ </div>
+ <div class="project-info">
+ <div class="project-info-item">娴佺▼鍚嶇О锛歿{queryParams.processName}}</div>
+ <div class="project-info-item">椤圭洰浠ｇ爜锛歿{detailData.projectCode}}</div>
+ <div class="project-info-item">
+ <div style="color: black">
+ <div>涓璧勯噾</div>
+ <div>甯傞噸鐐归」鐩�</div>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="search-warp">
- <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
- <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">浠ｅ姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
- <div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
- <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
- <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚锛�0锛�</div>
- <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
- <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>
- <div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫ｅ姙浜嬮」锛�0锛�</div>
- </div>
- <div style="display: flex;justify-content: center;align-items: center;margin-top: 20px">
- <el-form :inline="true" :model="queryParams" class="demo-form-inline">
- <el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="queryParams.taskName" placeholder="浠诲姟鍚嶇О"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="getList">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div class="table">
- <el-table
- v-loading="tableLoading"
- :data="taskList"
- border
- style="width: 100%">
- <el-table-column
- prop="taskName"
- label="浠诲姟鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- prop="processName"
- label="娴佺▼鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- prop="promoterName"
- label="鍙戣捣浜�"
- >
- </el-table-column>
- <el-table-column
- prop="promoterUnitName"
- label="鍙戣捣鍗曚綅"
- >
- </el-table-column>
- <el-table-column
- prop="handlerUnitName"
- label="澶勭悊鍗曚綅"
- >
- </el-table-column>
- <el-table-column
- prop="handlerName"
- label="瀹為檯澶勭悊浜�"
- >
- </el-table-column>
- <el-table-column
- prop="taskStatus"
- label="浠诲姟鐘舵��"
- >
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- width="100">
- <template slot-scope="scope">
- <el-button v-if="scope.row.taskStatus !== '鏈紑濮�'" @click="goToProcessDetail(scope.row)" type="text" size="small">鏌ョ湅</el-button>
- <el-button v-if="showHandle(scope.row)" @click="goToDo(scope.row)" type="text" size="small">鍔炵悊</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div class="table" style="margin-top: 15px">
- <el-pagination
- v-if="total > queryParams.pageSize"
- @size-change="getList"
- @current-change="getList"
- :current-page.sync="queryParams.currentPage"
- :page-sizes="[5, 10, 20]"
- :page-size="100"
- layout="sizes, prev, pager, next"
- :total="total">
- </el-pagination>
+ <div class="search-warp">
+ <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
+ <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">浠ｅ姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
+ <div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
+ <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
+ <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚锛�0锛�</div>
+ <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
+ <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>
+ <div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫ｅ姙浜嬮」锛�0锛�</div>
+ </div>
+ <div style="display: flex;justify-content: center;align-items: center;margin-top: 20px">
+ <el-form :inline="true" :model="queryParams" class="demo-form-inline">
+ <el-form-item label="浠诲姟鍚嶇О">
+ <el-input v-model="queryParams.taskName" placeholder="浠诲姟鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="search">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="table">
+ <el-table
+ v-loading="tableLoading"
+ :data="taskList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="taskName"
+ label="浠诲姟鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="promoterUnitName"
+ label="鍙戣捣鍗曚綅"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="promoterName"
+ label="鍙戣捣浜�"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="handlerType"
+ label="澶勭悊鏂圭被鍨�"
+ >
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.handlerType === 'USER'">浜哄憳璐﹀彿</el-tag>
+ <el-tag type="success" v-else-if="scope.row.handlerType === 'DEPT'">鍗曚綅</el-tag>
+ <el-tag type="info" v-else-if="scope.row.handlerType === 'ROLE'">瑙掕壊</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="handlerUnitName"
+ label="澶勭悊鍗曚綅"
+ :formatter="unitFormatter"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="handlerName"
+ label="鍊欓�夊鐞嗕汉"
+ :formatter="candidateFormatter"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="handlerName"
+ label="瀹為檯澶勭悊浜�"
+ :formatter="finalFinishedFormatter"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="taskStatus"
+ label="浠诲姟鐘舵��"
+ >
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ width="100">
+ <template slot-scope="scope">
+ <el-button v-if="scope.row.taskStatus !== '鏈紑濮�'" @click="goToProcessDetail(scope.row)" type="text" size="small">鏌ョ湅</el-button>
+ <el-button v-if="showHandle(scope.row)" @click="goToDo(scope.row)" type="text" size="small">鍔炵悊</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="table" style="margin-top: 15px">
+ <el-pagination
+ @size-change="sizeChange"
+ @current-change="pageChange"
+ :current-page.sync="queryParams.currentPage"
+ :page-sizes="[5, 10, 20]"
+ :page-size="100"
+ layout="sizes, prev, pager, next"
+ :total="total">
+ </el-pagination>
+ </div>
</div>
</div>
</template>
@@ -110,7 +126,7 @@
} from "@/api/projectProcess/projectProcess";
export default {
- name: "index",
+ name: "Detail",
data() {
return {
loading: false,
@@ -126,23 +142,54 @@
currentPage: 1,
projectId: null,
processDefId: null,
+ processName: '' // 娴佺▼鍚嶇О
}
}
},
mounted() {
+ console.log(this.$route.query, "鍙傛暟")
this.queryParams.projectId = this.$route.query.projectId
this.queryParams.processDefId = this.$route.query.processDefId
+ this.queryParams.processName = this.$route.query.processName
this.loading = true
this.getProjectProcessInfo()
},
methods: {
+ unitFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return null;
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join("銆�")
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ candidateFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return row.handlerName.join('銆�')
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join('銆�')
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ finalFinishedFormatter(row) {
+ // 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
+ if (row.taskStatus !== '宸插畬鎴�') {
+ return null
+ } else {
+ return row.handlerName
+ }
+ },
showHandle(row) {
- console.log(this.$store.state.user, "鐢ㄦ埛淇℃伅")
if (row.taskStatus === '寰呭姙') {
if (row.handlerType === "USER") {
- return this.$store.state.user.id === row.handlerId
+ console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
+ return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} else if (row.handlerType === "DEPT") {
- return this.$store.state.user.id === row.handlerId
+ console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
+ // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
} else if (row.handlerType === "ROLE") {
return this.$auth.hasRole(row.handlerUnitName)
}
@@ -151,47 +198,53 @@
}
},
goToDo(row) {
- // TODO 杩欓噷鐨勫垽鏂潯浠舵牴鎹疄闄呮儏鍐佃缃�
- // let params = {
- // processDefId: row.processDefId,
- // taskId: row.taskId
- // }
- // getTaskIsAuditing(params).then(res => {
- //
- // })
- // if (this.showHandle(row)) {
- console.log("zhe")
+ // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
+ let params = {
+ processDefId: row.processDefId,
+ taskId: row.taskId
+ }
+ getTaskIsAuditing(params).then(res => {
this.$router.push({
path: '/flowable/task/myProcess/send/index',
query: {
deployId: row.deployId,
procDefId: row.processDefId,
processName: row.taskName,
- taskId: row.taskId
+ flowName: this.queryParams.processName,
+ projectName: this.detailData.projectName,
+ taskId: row.taskId,
+ showAuditing: res.data,
+ goBackParams: this.queryParams
}
})
- // } else {
- // this.$router.push({
- // path: '/flowable/task/todo/detail/index',
- // query: {
- // taskName: row.taskName,
- // startUser: row.promoterName,
- // deployId: row.deployId,
- // taskId: row.taskId,
- // procInsId: row.processInsId,
- // executionId: row.executionId
- // }
- // })
- // }
+ })
},
goToProcessDetail(row) {
this.$router.push({ path: '/flowable/task/myProcess/detail/index',
query: {
+ projectName: this.detailData.projectName,
+ flowName: this.queryParams.processName,
procInsId: row.processInsId,
deployId: row.deployId,
- taskId: row.taskId
+ taskId: row.taskId,
+ goBackParams: this.queryParams
}})
},
+ search() {
+ this.queryParams.currentPage = 1;
+ this.tableLoading = true
+ this.getList()
+ },
+ sizeChange(pageSize) {
+ this.tableLoading = true
+ this.queryParams.pageSize = pageSize;
+ this.getList()
+ },
+ pageChange(pageNum) {
+ this.tableLoading = true
+ this.queryParams.currentPage = pageNum;
+ this.getList()
+ },
getList() {
// 鑾峰彇浠诲姟鍒楄〃
getProjectProcessDetailTaskList(this.queryParams).then(res => {
--
Gitblit v1.8.0