From ee5102cc92b919623139e88819a945e02e611182 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:32 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
src/views/wel/shemi.vue | 100 +++++++------------------------------------------
src/views/flow/components/TodolistLeft.vue | 2 +
2 files changed, 17 insertions(+), 85 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 2be6c72..76c6764 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -13,6 +13,8 @@
</div>
<el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸查攣瀹氾紝璇疯皑鎱庝娇鐢ㄣ�傞攣瀹氬師鍥狅細{{ remark }}</el-text>
<el-text type="danger" v-if="row.processDefinitionKey === 'program-unlock'">绋嬪簭宸查攣瀹氾紝閿佸畾鍘熷洜锛歿{ remark }}</el-text>
+ <el-text type="primary" v-if="row.processDefinitionKey === 'program-unlock'"><br/>瑙ｉ攣鍘熷洜锛�</el-text>
+ <el-text type="warning">{{row.variables.unlockReason}}</el-text>
<el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">宸插浐鍖栫▼搴忓伐搴忕増娆′笉涓�鑷达紝娲惧伐鐗堟:{{row.variables.processEdition}},宸插浐鍖栫増娆★細{{row.variables.curedProcessEdition}}</el-text>
<el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
<!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index f5f0449..1a3f0b2 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -39,20 +39,10 @@
</el-col>
</el-row>
</template>
- <!-- <template #menu-left>
- <el-button :size="size" type="primary" @click="showAdd()">鏂板鏍硅妭鐐�</el-button>
- </template> -->
+
<template #name="{ row }">
<span>{{ row.name }}</span>
- <!-- <el-button :size="size" text v-if="row.nodeType != 70" icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
- <el-button :size="size" text v-if="row.nodeType != 10" icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
- <el-button :size="size" text v-if="row.nodeType != 60 && row.nodeType != 70" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 60 || row.nodeType == 50" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button> -->
- <!-- 娑夊瘑缃戞墠鏈� -->
- <!-- <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button> -->
- <!-- 宸ユ帶缃戞墠鏈� -->
- <!-- <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button> -->
-
+
<!-- 鏇挎崲 v-if="permission.auto_dispatch"-->
<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>
@@ -472,12 +462,18 @@
disabled:true,
labelWidth: "120",
},
-
{
label: '閿佸畾鍘熷洜',
prop: 'remark',
type: "textarea",
disabled:true,
+ labelWidth: "120",
+ span: 24,
+ },
+ {
+ label: '瑙ｉ攣鍘熷洜',
+ prop: 'unlockReason',
+ type: "textarea",
labelWidth: "120",
span: 24,
}
@@ -817,6 +813,7 @@
this.unlockForm.id = row.id;
this.unlockForm.name = row.name
this.unlockForm.remark = row.remark;
+ this.unlockForm.unlockReason='';
this.unlockForm.parentId = row.parentId;
this.unlockBox = true;
},
@@ -833,7 +830,7 @@
if (res.data.code == 200) {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛!' });
this.addLocalTreeNode(this.lockForm.parentId);
-
+ this.unlockBox = false;
} else {
this.$message({ type: 'error', message: res.data.msg });
}
@@ -856,13 +853,13 @@
axios({
url: '/blade-mdm/flow/lock/start-unlock',
method: 'post',
- params: {nodeId: row.id }
+ params: {nodeId: row.id,unlockReason:row.unlockReason }
}).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 });
+ this.$message({ type: 'error', message: res.data.msg });
}
});
done();
@@ -897,31 +894,7 @@
window.console.log('haha', error);
done();
});
- // if(this.row.taskDefinitionKey === 'programmingTask') {
- // // if(this.applist.length !== 1) {
- // // done();
- // // return this.$message.success('璇烽�夋嫨1涓▼搴�');
- // // }
- // }
- // approve({
- // ...this.formApprove,
- // taskId: this.row.taskId,
- // processInstanceId: this.row.processInstanceId,
- // // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
- // }).then(res => {
- // if(res.data.code !== 200) {
- // this.$message.error(res.data.msg);
- // done();
- // return;
- // }
- // this.$message.success('瀹℃壒鎴愬姛');
- // this.approveBox = false;
- // this.onLoad(this.page, this.query);
- // done();
- // }).catch(err => {
- // done();
- // console.error(err);
- // });
+
},
todoSelectionChange(applist) {
this.applist = applist;
@@ -1277,50 +1250,7 @@
this.modalBox = true;
this.modalForm = row;
},
- showDel(row) {
- this.$confirm('灏嗕細鍒犻櫎璇ヨ妭鐐瑰強鍏跺瓙鑺傜偣锛屾槸鍚︾‘璁ゅ垹闄�?', {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- }).then(() => {
- //璋冪敤鎺ュ彛
- this.loading = true;
- axios({
- url: '/blade-mdm/program/node/remove',
- method: 'post',
- params: { id: row.id },
- }).then(
- res => {
- this.loading = false;
- this.addLocalTreeNode(row.parentId);
- }
- );
- })
- },
- showAdd(row) { //鏂板瀛愯妭鐐�
- if (!row) {
- this.modalTitle = "鏂板鏍硅妭鐐�";
- this.modalForm.nodeType = this.nodeTypeList[0].dictKey;
- this.modalForm.parentId = 0;
- } else {
- if (row.nodeType == 60) { //绋嬪簭鍖�
- return;
- }
- var defalutNodeType = ""; //涓嬩竴绾ц妭鐐圭被鍨�
- for (var i = 0; i < this.nodeTypeList.length; i++) {
- if (row.nodeType == this.nodeTypeList[i].dictKey) {
- defalutNodeType = this.nodeTypeList[i + 1].dictKey;
- }
- }
- this.modalTitle = "鏂板瀛愯妭鐐�";
- this.selectedColumn.nodeType = defalutNodeType;
- this.selectedColumn.parentId = row.id;
- this.selectedColumn.name = "";
- this.selectedColumn.id = "";
- this.modalForm = this.selectedColumn;
- }
- this.modalBox = true;
- },
+
modalSubmit(row, done) { //鏂板瀛愯妭鐐逛繚瀛�/淇敼
if (this.modalTitle == "淇敼") {
var url = "/blade-mdm/program/node/update";
--
Gitblit v1.9.3