From f67241a72e48a90cbcca28acbc2ce9aaffdfa43d Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/components/RunProcess.vue | 110 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 24 deletions(-)
diff --git a/src/views/projectProcess/components/RunProcess.vue b/src/views/projectProcess/components/RunProcess.vue
index 6bfaa28..94d5327 100644
--- a/src/views/projectProcess/components/RunProcess.vue
+++ b/src/views/projectProcess/components/RunProcess.vue
@@ -1,14 +1,16 @@
<template>
<div>
<el-dialog
- title="娴佺▼鍚姩"
+ :title="`娴佺▼鍚姩锛歚 + projectInfo.projectName"
:visible.sync="show"
- width="750px"
+ width="950px"
+ :destroy-on-close="true"
+ :close-on-click-modal="false"
:before-close="handleClose">
<div>
<div style="display: flex; flex-direction: row; justify-content: center; align-items: center;font-size: 24px">
<div>褰撳墠娴佺▼锛�</div>
- <div v-if="nowProcessId">{{nowProcessName}}</div>
+ <div v-if="nowProcessId">{{selectProcessName}}</div>
<div v-else>鏈粦瀹氭祦绋�</div>
</div>
</div>
@@ -33,10 +35,46 @@
label="娴佺▼绫诲瀷"
>
</el-table-column>
+ <el-table-column label="椤圭洰绫诲瀷" >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_project_type"
+ :value="scope.row.projectType"
+ >
+ </dict-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="璧勯噾绫诲瀷" >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_funding_type"
+ :value="scope.row.fundType"
+ >
+ </dict-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫绫诲埆" >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_investment_type"
+ :value="scope.row.investType"
+ >
+ </dict-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="閲嶇偣鍒嗙被" >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_key_categories"
+ :value="scope.row.importanceType"
+ >
+ </dict-tag>
+ </template>
+ </el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="startProcess">鍚姩</el-button>
+ <el-button type="danger" @click="startProcess">鍚姩</el-button>
<el-button type="primary" @click="changeProcess">鍙樻洿</el-button>
</span>
</el-dialog>
@@ -44,57 +82,68 @@
</template>
<script>
+import {projectSetProcess} from "@/api/projectProcess/projectProcess";
+
export default {
+ dicts: ['sys_project_type', 'sys_funding_type', 'sys_investment_type', 'sys_key_categories'],
name: "RunProcess",
props: {
show: {
- require: true,
+ required: true,
type: Boolean
},
- projectId: {
- require: true, // 椤圭洰id
- type: Number
+ projectInfo: {
+ required: true, // 椤圭洰id銆佸悕绉�
+ type: Object
},
processList: { // 娴佺▼鍒楄〃
- require: true,
+ required: true,
type: Array
},
nowProcessId: { // 褰撳墠椤圭洰缁戝畾鐨勬祦绋媔d
- require: true,
- type: String
- },
- nowProcessName: {
- require: true,
+ required: true,
type: String
}
},
watch: {
// 鐩戝惉鍥炴樉鍊�
- nowProcessId(newVal, oldVal) {
- this.processList.forEach((item,index) => {
- if(item.id == newVal){
- this.$nextTick(() => {
- this.$refs.myTable.toggleRowSelection(item);
- })
- }
- })
+ projectInfo: {
+ handler(newVal, oldVal) {
+ console.log("浼犲叆鍊硷細", newVal, this.processList)
+ this.setSelect(this.nowProcessId)
+ },
+ deep: true
}
},
data() {
return {
selectProcessId: '', // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
+ selectProcessName: '', // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
}
},
methods: {
+ setSelect(value) {
+ console.log("璋冪敤鍊硷細", value)
+ this.processList.forEach((item,index) => {
+ console.log(item.id, value, item.id === value)
+ if(item.id === value){
+ this.selectProcessName = item.name
+ this.$nextTick(() => {
+ this.$refs.myTable.toggleRowSelection(item);
+ })
+ }
+ })
+ },
// 瀹炵幇el-table鍗曢��
handleSelectionChange(val) {
console.log(val, "閫変腑")
if (val.length > 1) {
this.$refs.myTable.clearSelection();
- this.$refs.myTable.toggleRowSelection(val.pop());
+ this.$refs.myTable.toggleRowSelection(val[val.length - 1]);
}
if(val.length != 0){
this.selectProcessId = val[val.length - 1].id;
+ console.log("閫変腑id锛�", this.selectProcessId)
}
},
// 鍚姩娴佺▼
@@ -103,9 +152,22 @@
},
// 鍙樻洿娴佺▼
changeProcess() {
-
+ if (!this.selectProcessId) {
+ this.$message.error("閫夊垯涓�涓祦绋嬪悗鎵嶈兘鍙樻洿")
+ return
+ }
+ const data = {
+ projectId: this.projectInfo.projectId,
+ flowableProcessId: this.selectProcessId
+ }
+ projectSetProcess(data).then(res => {
+ this.$message.success("鍙樻洿鎴愬姛")
+ this.handleClose()
+ })
},
handleClose() {
+ this.selectProcessId = ""
+ this.selectProcessName = ""
this.$emit("close")
}
}
--
Gitblit v1.8.0