From d5f64a57677aa427372bde6322bdec0fd5cc105d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 22:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/shemi.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index ad9344b..ca3c45f 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -46,8 +46,8 @@
<!-- <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button> -->
<!-- 鏇挎崲 -->
<el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,')>-1" icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1" icon="el-icon-lock" type="primary" @click="locked(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
- <!-- <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1" icon="el-icon-unlock" type="primary" @click="locked(row)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button> -->
+ <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1 && row.isLocked == 1" icon="el-icon-lock" type="primary" @click="locked(row,true)" placeholder="閿佸畾" title="閿佸畾"></el-button>
+ <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1 && row.isLocked != 1" icon="el-icon-unlock" type="primary" @click="locked(row,false)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
</template>
</avue-crud>
<!-- 鏂板鑺傜偣 -->
@@ -630,19 +630,21 @@
},
methods: {
- locked(row) {
- this.$confirm('鏄惁閿佸畾鍚�?', {
+ locked(row, isLock) {
+ row.isLocked == isLock
+ this.$confirm(`鏄惁${isLock ? '瑙ｉ攣' : '閿佸畾'}`, {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
}).then(() => {
axios({
- url: '/blade-mdm/program/node/lock',
+ url: isLock ? '/blade-mdm/flow/lock/start-unlock' : '/blade-mdm/program/node/lock',
method: 'post',
- params: {id: row.id}
+ params: {id: row.id,nodeId: row.id}
}).then(res => {
if(res.data.code == 200) {
this.$message({type: 'success',message: '鎿嶄綔鎴愬姛!'});
+ this.addLocalTreeNode(row.parentId);
}else {
this.$message({type: 'success',message: res.data.msg});
}
@@ -655,7 +657,7 @@
title: this.formApprove.title,
nodeId: this.id,
tempInstanceId: this.replaceDataId,
- comment: this.formApprove.comment,
+ comment: this.formApprove.comment,
assignee: this.formApprove.assignee
}
axios({
@@ -663,14 +665,17 @@
method: 'post',
data: obj
}).then(
- resp => {
- this.$message({
- type: 'success',
- message: '鎿嶄綔鎴愬姛!',
+ resp => {
+ this.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+ done();
+ this.todolistModel = false;
+ }).catch(error =>{
+ window.console.log('haha',error);
+ done();
});
- done();
- this.todolistModel = false;
- });
// if(this.row.taskDefinitionKey === 'programmingTask') {
// // if(this.applist.length !== 1) {
// // done();
--
Gitblit v1.9.3