From 89428d6f5f78ef9f0a3dcb7f51d1aaea11d556fa Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 02 八月 2023 10:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c7299bf..1bec8e9 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -384,7 +384,7 @@
showMessage = false;
} else if (showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
- if (res.data.records != []) {
+ if (res.data.data.records && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
this.parameter.type = 'PUBLIC';
@@ -434,10 +434,11 @@
showMessage = false;
} else if (this.selectRow.length > 1 && hasEditing && showMessage) {
processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
- if (res.data.records != [] && res.data.code != 200) {
+ if (res.data.records != [] && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
this.parameter.template = this.userName + "鍋滅敤" + "[鐗╁搧]";
- this.parameter.type = 'DISABLE'
+ this.parameter.type = 'DISABLE';
+ this.parameter.code=this.templateOid
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -485,10 +486,12 @@
showMessage = false;
} else if (this.selectRow.length >=1 && hasEditing && showMessage) {
processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
- if (res.data.records != [] && res.data.code != 200) {
+ 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.parameter.type = 'Released'
+ this.parameter.type = 'Released';
+ this.parameter.code=this.templateOid
this.title = '鍚敤缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -543,10 +546,11 @@
} else if (this.selectRow.length >=1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
//disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true
processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
- if (res.data.records != [] && res.data.code != 200) {
+ if (res.data.records != [] && res.data.data.records.length!=0) {
this.userName = localStorage.getItem("username");
this.parameter.template = this.userName + "鍥炴敹" + "[鐗╁搧]";
- this.parameter.type = 'TakeBack'
+ this.parameter.type = 'TakeBack';
+ this.parameter.code=this.templateOid
this.title = '鍥炴敹缂栫爜鏁版嵁'
this.visibleDeactivate = true;
} else {
@@ -618,7 +622,6 @@
}).then(() => {
const list=[];
this.selectRow.forEach((item)=>{list.push(item.oid)})
- console.log(list)
deleteCode({codeClassifyOid:this.codeClassifyOid,oidList:list}).then(res=>{
console.log(res)
if(res.data.code === 200){
--
Gitblit v1.10.0