From 52e0f3c21a732d078d221a384b080bdcdceca2fc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 12 二月 2025 15:43:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 2
src/api/projectProcess/projectProcess.js | 10 +++++
src/views/projectProcess/detail/index.vue | 55 ++++++++++++++++++++++++++-
3 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/api/projectProcess/projectProcess.js b/src/api/projectProcess/projectProcess.js
index 13e0e42..2dd4f71 100644
--- a/src/api/projectProcess/projectProcess.js
+++ b/src/api/projectProcess/projectProcess.js
@@ -87,3 +87,13 @@
data: data
})
}
+
+// 鐫ｅ姙
+export function taskSupervise(data) {
+ return request({
+ url: '/project-process/detail/task/supervise',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index ee56e36..d3a81eb 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -251,7 +251,7 @@
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="瀹℃牳" placement="top">
<el-button
- v-if="scope.row.auditRole"
+ v-if="scope.row.auditRole && $route.query.projectCategory==='6'"
size="medium"
type="text"
icon="el-icon-circle-check"
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index f934da0..41e7ed3 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -103,6 +103,7 @@
<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>
+ <el-button @click="openSupervise(scope.row)" type="text" size="small">鐫ｅ姙</el-button>
</template>
</el-table-column>
</el-table>
@@ -187,7 +188,17 @@
</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">
+ <el-input type="textarea" v-model="superviseForm.content"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="superviseShow = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitSupervise">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -195,11 +206,12 @@
import {
getProjectProcessDetail,
getProjectProcessDetailTaskList,
- getTaskIsAuditing
+ getTaskIsAuditing, taskSupervise
} from "@/api/projectProcess/projectProcess";
import {flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
import {flowRecord} from "@/api/flowable/finished";
+import {editProject} from "@/api/projectEngineering/projectInfo";
export default {
name: "Detail",
@@ -216,11 +228,21 @@
processImgShow: false, // 娴佺▼鍥炬樉绀�
imgLoading: false, // 娴佺▼鍥惧姞杞�
loading: false,
+ superviseShow: false,
tableLoading: false,
detailData: {},
taskList: [],
total: 0,
selectTabId: 2,
+ superviseForm: {
+ taskId: null,
+ projectId: null,
+ processInsId: null,
+ receiverIds: null,
+ receiverType: null,
+ superviseType: null,
+ content: '',
+ },
queryParams: {
taskName: '',
taskType: 'todo',
@@ -231,6 +253,9 @@
processInsId: null,
deployId: null,
processName: '' // 娴佺▼鍚嶇О
+ },
+ superviseRules: {
+ content: [{required: true, message: '鐫ｅ姙鍐呭涓嶈兘涓虹┖', trigger: 'blur'}]
}
}
},
@@ -252,6 +277,32 @@
this.getProjectProcessInfo()
},
methods: {
+ submitSupervise() {
+ this.$refs["superviseForm"].validate(valid => {
+ if (valid) {
+ taskSupervise(this.superviseForm).then((res) => {
+ this.superviseShow = false;
+ this.$message.success("鎿嶄綔鎴愬姛");
+ })
+ }
+ });
+ },
+ openSupervise(row){
+ this.superviseForm.content ='';
+ this.superviseForm.taskId = row.taskId;
+ this.superviseForm.projectId = this.$route.query.projectId;
+ this.superviseForm.processInsId = row.taskId;
+ this.superviseForm.superviseType = "SUPERVISE";
+ this.superviseForm.receiverType = row.handlerType;
+ if (row.handlerType === 'USER') {
+ this.superviseForm.receiverIds = row.handlerId;
+ } else if (row.handlerType === 'DEPT') {
+ this.superviseForm.receiverIds = row.handlerUnitId;
+ } else if (row.handlerType === 'ROLE') {
+ this.superviseForm.receiverIds = row.handlerUnitId;
+ }
+ this.superviseShow = true
+ },
setIcon(val) {
if (val) {
return "el-icon-check";
--
Gitblit v1.8.0