From 79950e4f7b59fecd435a1c9f7a0cbbd70bea6a1d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 二月 2025 23:39:33 +0800
Subject: [PATCH] 项目总投资额 必填 bug
---
src/views/projectProcess/detail/index.vue | 207 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 128 insertions(+), 79 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index d860034..acacce6 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -37,7 +37,7 @@
</el-form>
<div style="position: absolute; right: 0; top: 0">
<el-button @click="openProcessImg" v-loading="imgLoading" type="primary">娴佺▼鍥�</el-button>
- <el-button @click="openRecord" type="info" v-loading="recordLoading">娴佽浆璁板綍</el-button>
+ <el-button @click="openRecord" type="info" v-loading="recordLoading">娴佺▼鏃ュ織</el-button>
</div>
</div>
<div class="table">
@@ -53,24 +53,13 @@
</el-table-column>
<el-table-column
prop="promoterUnitName"
- label="鍙戣捣鍗曚綅"
+ label="璐ｄ换鍗曚綅"
>
</el-table-column>
<el-table-column
prop="promoterName"
- label="鍙戣捣浜�"
+ 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"
@@ -80,16 +69,49 @@
</el-table-column>
<el-table-column
prop="handlerName"
- label="鍊欓�夊鐞嗕汉"
+ label="澶勭悊浜哄強鑱旂郴鐢佃瘽"
:formatter="candidateFormatter"
>
</el-table-column>
- <el-table-column
- prop="handlerName"
- label="瀹為檯澶勭悊浜�"
- :formatter="finalFinishedFormatter"
- >
- </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"
@@ -99,7 +121,8 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
- width="100">
+ align="center"
+ width="140">
<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>
@@ -133,61 +156,72 @@
</div>
</el-dialog>
- <el-dialog
- :title="`${this.queryParams.processName}锛氭祦杞褰昤"
+ <el-drawer
+ :title="`${this.queryParams.processName}锛氭祦绋嬫棩蹇梎"
:visible.sync="processRecordShow"
- :fullscreen="true"
- :close-on-click-modal="false"
- :destroy-on-close="true"
- >
- <div>
- <div class="block">
- <el-timeline>
- <el-timeline-item
- v-for="(item,index ) in flowRecordList"
- :key="index"
- :icon="setIcon(item.finishTime)"
- :color="setColor(item.finishTime)"
- >
- <p style="font-weight: 700">{{item.taskName}}
- <span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>
- <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>
- <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>
- </p>
- <el-card :body-style="{ padding: '10px' }">
- <el-descriptions class="margin-top" :column="1" size="small" border>
- <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
- <template slot="label"><i class="el-icon-user"></i>鍔炵悊浜�</template>
- {{item.assigneeName}}
- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
- <template slot="label"><i class="el-icon-user"></i>鍊欓�夊姙鐞�</template>
- {{item.candidate}}
- </el-descriptions-item>
- <el-descriptions-item label-class-name="my-label">
- <template slot="label"><i class="el-icon-date"></i>鎺ユ敹鏃堕棿</template>
- {{item.createTime}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
- <template slot="label"><i class="el-icon-date"></i>澶勭悊鏃堕棿</template>
- {{item.finishTime}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.duration" label-class-name="my-label">
- <template slot="label"><i class="el-icon-time"></i>鑰楁椂</template>
- {{item.duration}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
- <template slot="label"><i class="el-icon-tickets"></i>澶勭悊鎰忚</template>
- {{item.comment.comment}}
- </el-descriptions-item>
- </el-descriptions>
- </el-card>
- </el-timeline-item>
- </el-timeline>
- </div>
- </div>
- </el-dialog>
+ direction="ltr"
+ :modal="false"
+ size="800px"
+ >
+ <log-view style="padding: 10px 20px" :log-list="logList"/>
+ </el-drawer>
+
+<!-- <el-dialog-->
+<!-- :title="`${this.queryParams.processName}锛氭祦杞褰昤"-->
+<!-- :visible.sync="processRecordShow"-->
+<!-- :fullscreen="true"-->
+<!-- :close-on-click-modal="false"-->
+<!-- :destroy-on-close="true"-->
+<!-- >-->
+<!-- <div>-->
+<!-- <log-view :log-list="logList"/>-->
+<!--<!– <div class="block">–>-->
+<!--<!– <el-timeline>–>-->
+<!--<!– <el-timeline-item–>-->
+<!--<!– v-for="(item,index ) in flowRecordList"–>-->
+<!--<!– :key="index"–>-->
+<!--<!– :icon="setIcon(item.finishTime)"–>-->
+<!--<!– :color="setColor(item.finishTime)"–>-->
+<!--<!– >–>-->
+<!--<!– <p style="font-weight: 700">{{item.taskName}}–>-->
+<!--<!– <span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>–>-->
+<!--<!– <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>–>-->
+<!--<!– <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>–>-->
+<!--<!– </p>–>-->
+<!--<!– <el-card :body-style="{ padding: '10px' }">–>-->
+<!--<!– <el-descriptions class="margin-top" :column="1" size="small" border>–>-->
+<!--<!– <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-user"></i>鍔炵悊浜�</template>–>-->
+<!--<!– {{item.assigneeName}}–>-->
+<!--<!– <el-tag type="info" size="mini">{{item.deptName}}</el-tag>–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.candidate" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-user"></i>鍊欓�夊姙鐞�</template>–>-->
+<!--<!– {{item.candidate}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-date"></i>鎺ユ敹鏃堕棿</template>–>-->
+<!--<!– {{item.createTime}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-date"></i>澶勭悊鏃堕棿</template>–>-->
+<!--<!– {{item.finishTime}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.duration" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-time"></i>鑰楁椂</template>–>-->
+<!--<!– {{item.duration}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.comment" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-tickets"></i>澶勭悊鎰忚</template>–>-->
+<!--<!– {{item.comment.comment}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– </el-descriptions>–>-->
+<!--<!– </el-card>–>-->
+<!--<!– </el-timeline-item>–>-->
+<!--<!– </el-timeline>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
<el-dialog :visible.sync="superviseShow" width="1000px" title="鐫ｅ姙" append-to-body>
<el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="80px">
<el-form-item label="鐫ｅ姙鍐呭" prop="content">
@@ -210,16 +244,20 @@
} from "@/api/projectProcess/projectProcess";
import {flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
+import LogView from "@/views/projectProcess/components/LogView";
import {flowRecord} from "@/api/flowable/finished";
import {editProject} from "@/api/projectEngineering/projectInfo";
+import {getProjectProcessLog} from "@/api/flowLog/flowLog";
export default {
name: "Detail",
components: {
- BpmnViewer
+ BpmnViewer,
+ LogView
},
data() {
return {
+ logList: [], // 娴佺▼鏃ュ織
processRecordShow: false, // 娴佽浆璁板綍鏄剧ず
flowRecordList: [], // 娴佺▼娴佽浆鏁版嵁
recordLoading: false, // 娴佽浆璁板綍鍔犺浇
@@ -318,7 +356,7 @@
}
},
openRecord() {
- this.getFlowRecordList(this.queryParams.processInsId);
+ this.getFlowLogList(this.queryParams.processInsId);
},
openProcessImg() {
this.imgLoading = true
@@ -336,6 +374,15 @@
this.recordLoading = true
flowRecord(params).then(res => {
this.flowRecordList = res.data.flowList;
+ this.recordLoading = false
+ this.processRecordShow = true
+ })
+ },
+ getFlowLogList(procInsId) {
+ const params = {processInsId: procInsId, projectId: this.queryParams.projectId}
+ this.recordLoading = true
+ getProjectProcessLog(params).then(res => {
+ this.logList = res.data;
this.recordLoading = false
this.processRecordShow = true
})
@@ -367,7 +414,7 @@
}
},
showHandle(row) {
- if (row.taskStatus === '寰呭姙') {
+ 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
@@ -401,6 +448,7 @@
projectName: this.detailData.projectName,
taskId: row.taskId,
showAuditing: res.data,
+ projectId: this.queryParams.projectId,
goBackParams: this.queryParams
}
})
@@ -414,6 +462,7 @@
procInsId: row.processInsId,
deployId: row.deployId,
taskId: row.taskId,
+ projectId: this.queryParams.projectId,
goBackParams: this.queryParams
}})
},
--
Gitblit v1.8.0