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 | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index 5ee7730..ca3c45f 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="6">
<el-select v-model="search.nodeType" placeholder="璇疯緭鍏ヨ妭鐐圭被鍨�" clearable>
- <el-option v-for="item in nodeTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictKey"/>
+ <el-option v-for="item in nodeTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictKey"/>formApprove.
</el-select>
</el-col>
<el-col :span="6">
@@ -46,7 +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-icon><Switch /></el-icon> -->
+ <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>
<!-- 鏂板鑺傜偣 -->
@@ -629,13 +630,34 @@
},
methods: {
+ locked(row, isLock) {
+ row.isLocked == isLock
+ this.$confirm(`鏄惁${isLock ? '瑙ｉ攣' : '閿佸畾'}`, {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ axios({
+ url: isLock ? '/blade-mdm/flow/lock/start-unlock' : '/blade-mdm/program/node/lock',
+ method: 'post',
+ 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});
+ }
+ });
+ });
+ },
handleSubmit(form, done) {
//鍙戣捣绋嬪簭鏇挎崲娴佺▼
var obj = {
title: this.formApprove.title,
nodeId: this.id,
tempInstanceId: this.replaceDataId,
- comment: this.formApprove.comment,
+ comment: this.formApprove.comment,
assignee: this.formApprove.assignee
}
axios({
@@ -643,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();
@@ -697,11 +722,26 @@
this.replaceDataId = resp.data.data.processInstanceId;
this.processNo = resp.data.data.processNo;
this.processEdition = resp.data.data.processEdition;
- this.drawingNo = resp.data.data.drawingNo;
+ this.drawingNo = resp.data.data.drawingNo;
this.formApprove.title = resp.data.data.name + "鏇挎崲";
+ this.getHandler(); //鑾峰彇澶勭悊浜�
this.todolistModel = true;
});
},
+ getHandler() { //鑾峰彇澶勭悊浜�
+ axios({
+ url: '/blade-mdm/flow/replace/default-assignees',
+ method: 'get',
+ params: {drawingNo: this.drawingNo}
+ }).then(
+ resp => {
+ if(resp.data.code == 200) {
+ this.formApprove.assignee = resp.data.data.checkerId;
+ }else {
+ this.$message.success(resp.msg);
+ }
+ });
+ },
convertToHtml(text) {
return text.replace(/\n/g, '<br>');
},
--
Gitblit v1.9.3