From d30d3d2d352abfcd9e16cece8a34f2a517f8abc0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 三月 2025 16:05:19 +0800
Subject: [PATCH] 动态表单必填提示修改
---
src/views/projectProcess/detail/index.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index d7d4f59..00e54ed 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -23,7 +23,7 @@
<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}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></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(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; position: relative">
@@ -329,7 +329,7 @@
this.superviseForm.content ='';
this.superviseForm.taskId = row.taskId;
this.superviseForm.projectId = this.$route.query.projectId;
- this.superviseForm.processInsId = row.taskId;
+ this.superviseForm.processInsId = row.processInsId;
this.superviseForm.superviseType = "SUPERVISE";
this.superviseForm.receiverType = row.handlerType;
if (row.handlerType === 'USER') {
@@ -391,19 +391,13 @@
if (row.taskStatus != '宸插畬鎴�') {
return null
}
- if (row.handlerType === 'USER') {
- return null;
- } else if (row.handlerType === 'DEPT') {
- return row.handlerUnitName.join("銆�")
- } else if (row.handlerType === 'ROLE') {
- return row.handlerUnitName.join('銆�')
- }
+ return row.handlerUnitName.join("銆�")
},
candidateFormatter(row) {
if (row.taskStatus != '宸插畬鎴�') {
return null
}
- return row.handlerName.join('銆�')
+ return row.handlerName.join("銆�")
// if (row.handlerType === 'USER') {
// return row.handlerName.join('銆�')
// } else if (row.handlerType === 'DEPT') {
@@ -423,12 +417,9 @@
showHandle(row) {
if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣') {
if (row.handlerType === "USER") {
- 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") {
- 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 === '甯備綇寤哄眬'
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1 || row.handlerUnitId.some(id => this.$store.state.user.childDeptIds.indexOf(id) !== -1)
} else if (row.handlerType === "ROLE") {
return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
}
@@ -497,9 +488,19 @@
this.total = res.total
})
},
+ isProject(id) {
+ const numericPattern = /^\d+(\.\d+)?$/;
+ return numericPattern.test(id)
+ },
// 鏌ヨ璇︽儏
getProjectProcessInfo() {
- getProjectProcessDetail(this.queryParams.projectId, this.queryParams.processDefId).then(res => {
+ const projectType = this.isProject(this.queryParams.projectId) ? "PROJECT" : "ENGINEERING"
+ const param = {
+ projectId: this.queryParams.projectId,
+ processDefId: this.queryParams.processDefId,
+ projectType: projectType
+ }
+ getProjectProcessDetail(param).then(res => {
this.detailData = res.data
this.taskList = res.taskList
this.total = res.total
--
Gitblit v1.8.0