From 2c2e4083e42d405f65845c34928ba462de0c7943 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 04 八月 2023 14:56:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 69dadec..c3a3aff 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -192,6 +192,7 @@
//鍙戝竷
parameter: {
ids: [],
+ btmtype:'',
code: "",
type: '',
// this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
@@ -440,9 +441,10 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
- this.parameter.code = this.templateOid
+ this.parameter.code = this.templateOid;
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '娴佺▼瀹℃壒'
this.visibleFlow = true;
} else {
@@ -490,9 +492,10 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -541,9 +544,10 @@
if (res.data.data.records && res.data.data.records.length != 0) {
this.parameter = res.data.data.records[0]
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍚敤缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -598,9 +602,10 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
+ this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
this.title = '鍥炴敹缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
--
Gitblit v1.9.3