From ef23237ddabf5ea44856ff369a7c8973758db3d0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 17:52:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 69dadec..0b8e3cd 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'
@@ -442,7 +443,8 @@
                 this.userName = localStorage.getItem("username");
                 this.parameter.template = 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 {
@@ -493,6 +495,7 @@
                 this.parameter.template = 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 {
@@ -544,6 +547,7 @@
                 this.parameter.template = 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 {
@@ -601,6 +605,7 @@
                 this.parameter.template = 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