From d0f24d6ed53aec6f345d2fa9c7b7e397a83e32d4 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 03 三月 2025 00:53:03 +0800 Subject: [PATCH] 调整流程推进api --- src/views/projectProcess/components/RunProcess.vue | 14 ++++++++++++-- src/api/projectProcess/projectProcess.js | 14 ++++++++------ src/views/engineering/index.vue | 3 ++- src/views/projectProcess/index.vue | 8 ++++++++ 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/api/projectProcess/projectProcess.js b/src/api/projectProcess/projectProcess.js index 50af610..688615f 100644 --- a/src/api/projectProcess/projectProcess.js +++ b/src/api/projectProcess/projectProcess.js @@ -20,10 +20,11 @@ // 鑾峰彇椤圭洰娴佺▼璇︽儏鏁版嵁 -export const getProjectProcessDetail = (projectId, processId) => { +export const getProjectProcessDetail = (params) => { return request({ - url: "/project-process/detail/" + projectId + "/" + processId, - method: "GET" + url: "/project-process/detail/", + method: "GET", + params: params }) } @@ -37,10 +38,11 @@ } // 鍚姩娴佺▼ -export const startProcess = (projectId, processDefId) => { +export const startProcess = (data) => { return request({ - url: "/project-process/start/" + projectId + "/" + processDefId, - method: "POST" + url: "/project-process/start/", + method: "POST", + data: data }) } diff --git a/src/views/engineering/index.vue b/src/views/engineering/index.vue index de2f87c..48a2cf7 100644 --- a/src/views/engineering/index.vue +++ b/src/views/engineering/index.vue @@ -105,7 +105,7 @@ default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :show-overflow-tooltip="true"> - <el-table-column label="椤圭洰鍚嶇О" align="center" prop="projectName" /> + <el-table-column label="椤圭洰鍚嶇О" prop="projectName" /> <el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType"> <template slot-scope="scope"> <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/> @@ -133,6 +133,7 @@ size="mini" type="text" icon="el-icon-plus" + style="margin-right: 10px" @click="handleadd(scope.row)" >娣诲姞瀛愬伐绋�</el-button> <el-button diff --git a/src/views/projectProcess/components/RunProcess.vue b/src/views/projectProcess/components/RunProcess.vue index 49bf79b..fe229da 100644 --- a/src/views/projectProcess/components/RunProcess.vue +++ b/src/views/projectProcess/components/RunProcess.vue @@ -130,6 +130,10 @@ required: true, type: String }, + projectType: { + required: true, + type: String + } }, watch: { // 鐩戝惉鍥炴樉鍊� @@ -204,7 +208,12 @@ // 鍚姩娴佺▼ startProcess() { this.startLoading = true - startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => { + const data = { + projectId: this.projectInfo.projectId, + processDefId: this.selectProcessDefId, + projectType: this.projectType + } + startProcess(data).then(res => { this.$message.success(res.msg); this.startLoading = false this.handleClose() @@ -218,7 +227,8 @@ } const data = { projectId: this.projectInfo.projectId, - processDefId: this.selectProcessDefId + processDefId: this.selectProcessDefId, + projectType: this.projectType } this.setLoading = true projectSetProcess(data).then(res => { diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue index 355ffda..6383405 100644 --- a/src/views/projectProcess/index.vue +++ b/src/views/projectProcess/index.vue @@ -256,6 +256,7 @@ :now-process-ins-id="nowProcessInsId" :project-info="projectRunFrom" :process-list="processList" + :project-type="projectType" @close="closeRunProcess"> </RunProcess> </div> @@ -280,6 +281,7 @@ }, data() { return { + projectType: '', projectRunFrom: { projectId: null, projectName: '' @@ -391,6 +393,7 @@ } this.nowProcessDefId = ""; this.nowProcessInsId = ""; + this.projectType = "" this.showRunProcess = false this.getList() }, @@ -398,6 +401,11 @@ openOpProcess(row) { this.nowProcessDefId = row.processDefId ? row.processDefId : ''; this.nowProcessInsId = row.processInsId ? row.processInsId : ''; + if (isNaN(parseFloat(row.id))) { + this.projectType = "ENGINEERING" + } else { + this.projectType = "PROJECT" + } // // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚� // this.$refs.runProcess.setSelect(row.flowableProcessId); this.projectRunFrom.projectId = row.id; -- Gitblit v1.8.0