From be935300089c97ea7477edd6e888a43ab244c44f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/components/RunProcess.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/views/projectProcess/components/RunProcess.vue b/src/views/projectProcess/components/RunProcess.vue
index 24e17a8..4331c69 100644
--- a/src/views/projectProcess/components/RunProcess.vue
+++ b/src/views/projectProcess/components/RunProcess.vue
@@ -10,7 +10,7 @@
<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="nowProcessDefId">{{selectProcessName}}<span v-if="nowProcessInsId" style="color: red">锛堣繍琛屼腑锛�</span></div>
<div v-else>鏈粦瀹氭祦绋�</div>
</div>
</div>
@@ -28,6 +28,11 @@
<el-table-column
prop="name"
label="娴佺▼鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="version"
+ label="娴佺▼鐗堟湰"
>
</el-table-column>
<el-table-column
@@ -74,15 +79,15 @@
</el-table>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="danger" @click="startProcess">鍚姩</el-button>
- <el-button type="primary" @click="changeProcess">鍙樻洿</el-button>
+ <el-button type="danger" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">鍚姩娴佺▼</el-button>
+ <el-button type="primary" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">娴佺▼鍙樻洿</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
-import {projectSetProcess} from "@/api/projectProcess/projectProcess";
+import {projectSetProcess, startProcess} from "@/api/projectProcess/projectProcess";
export default {
dicts: ['sys_project_type', 'sys_funding_type', 'sys_investment_type', 'sys_key_categories'],
@@ -100,61 +105,75 @@
required: true,
type: Array
},
- nowProcessId: { // 褰撳墠椤圭洰缁戝畾鐨勬祦绋媔d
+ nowProcessDefId: { // 褰撳墠椤圭洰缁戝畾鐨勫畾涔塱d
required: true,
type: String
},
- nowProcessName: {
+ nowProcessInsId: { // 褰撳墠椤圭洰缁戝畾鐨勫疄渚媔d
required: true,
type: String
- }
+ },
},
watch: {
// 鐩戝惉鍥炴樉鍊�
- nowProcessId(newVal, oldVal) {
- console.log("浼犲叆鍊硷細", newVal, this.processList)
+ projectInfo: {
+ handler(newVal, oldVal) {
+ console.log("浼犲叆鍊硷細", newVal, this.processList)
+ this.setSelect(this.nowProcessDefId)
+ },
+ deep: true
+ }
+ },
+ data() {
+ return {
+ selectProcessDefId: '', // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
+ selectProcessName: '', // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
+ }
+ },
+ created() {
+ console.log(this.nowProcessInsId, typeof this.nowProcessInsId, "wwwww")
+ },
+ methods: {
+ setSelect(value) {
+ console.log("璋冪敤鍊硷細", value)
this.processList.forEach((item,index) => {
- console.log(item.id, newVal, item.id === newVal)
- if(item.id === newVal){
- console.log("wwwwwww")
- this.selectProcessId = newVal
+ console.log(item.id, value, item.id === value)
+ if(item.id === value){
+ this.selectProcessName = item.name
this.$nextTick(() => {
this.$refs.myTable.toggleRowSelection(item);
})
}
})
- }
- },
- data() {
- return {
- selectProcessId: '', // 缁勪欢鍐呴儴閫変腑鐨勬祦绋媔d
- }
- },
- methods: {
+ },
// 瀹炵幇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;
+ this.selectProcessDefId = val[val.length - 1].id;
+ console.log("閫変腑id锛�", this.selectProcessDefId)
}
},
// 鍚姩娴佺▼
startProcess() {
-
+ startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => {
+ this.$message.success(res.msg);
+ this.handleClose()
+ })
},
// 鍙樻洿娴佺▼
changeProcess() {
- if (!this.selectProcessId) {
+ if (!this.selectProcessDefId) {
this.$message.error("閫夊垯涓�涓祦绋嬪悗鎵嶈兘鍙樻洿")
return
}
const data = {
projectId: this.projectInfo.projectId,
- flowableProcessId: this.selectProcessId
+ processDefId: this.selectProcessDefId
}
projectSetProcess(data).then(res => {
this.$message.success("鍙樻洿鎴愬姛")
@@ -162,6 +181,8 @@
})
},
handleClose() {
+ this.selectProcessDefId = ""
+ this.selectProcessName = ""
this.$emit("close")
}
}
--
Gitblit v1.8.0