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/index.vue | 56 ++++++++++++++++++++++----------------------------------
1 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 5a24dde..6383405 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -179,48 +179,27 @@
</el-form>
<el-table
- :key="tableKey"
ref="elTable"
style="margin-top: 20px"
v-loading="loading"
:data="projectInfoList"
- @selection-change="handleSelectionChange"
height="100%"
sortable="custom"
+ row-key="id"
+ border
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:show-overflow-tooltip="true">
- <el-table-column type="selection" width="55" align="center"/>
- <!-- 鍔ㄦ�佸垪 -->
- <el-table-column
- v-for="item in columns"
- :key="item.id"
- v-if="item.visible"
- :prop="item.id"
- :label="item.label"
- :min-width="item.minWidth"
- :show-overflow-tooltip="item.showOverflowTooltip"
- >
+ <el-table-column label="椤圭洰鍚嶇О" prop="projectName" />
+ <el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType">
<template slot-scope="scope">
- <!-- 浣跨敤鍏峰悕鎻掓Ы -->
- <template v-if="item.slotName">
- <!-- projectStatus鎻掓Ы -->
- <template v-if="item.slotName === 'projectStatus'">
- <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
- </template>
- <!-- coding鎻掓Ы -->
- <template v-if="item.slotName === 'coding' || item.slotName === 'coding'">
- <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
- </template>
- <!-- projectType鎻掓Ы -->
- <template v-if="item.slotName === 'projectType'">
- <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
- </template>
- <!-- investType鎻掓Ы -->
- <template v-if="item.slotName === 'investType'">
- <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
- </template>
- </template>
- <!-- 榛樿鏄剧ず -->
- <span v-else>{{ scope.row[item.id] }}</span>
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫棰�(涓�)" align="center" prop="investmentAmount" />
+ <el-table-column label="寮�宸ョ姸鎬�" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.status"/>
</template>
</el-table-column>
@@ -277,6 +256,7 @@
:now-process-ins-id="nowProcessInsId"
:project-info="projectRunFrom"
:process-list="processList"
+ :project-type="projectType"
@close="closeRunProcess">
</RunProcess>
</div>
@@ -301,6 +281,7 @@
},
data() {
return {
+ projectType: '',
projectRunFrom: {
projectId: null,
projectName: ''
@@ -412,6 +393,7 @@
}
this.nowProcessDefId = "";
this.nowProcessInsId = "";
+ this.projectType = ""
this.showRunProcess = false
this.getList()
},
@@ -419,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;
@@ -488,6 +475,7 @@
this.loading = true;
getProjectProcess(this.queryParams).then(response => {
this.projectInfoList = response.data;
+ console.log(this.projectInfoList)
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.8.0