From dd6e3927104fd3451749e811316ff5b0da687cc4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 03 八月 2023 16:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c839623..7771e5c 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -448,7 +448,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Released'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍙戝竷鎴愬姛')
this.onLoad()
@@ -479,10 +479,10 @@
if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) {
this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
showMessage = false;
- } else if (this.selectRow.length >= 1 && !hasEditing && showMessage) {
+ } else if (this.selectRow.length > 1 && !hasEditing && showMessage) {
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
showMessage = false;
- } else if (this.selectRow.length > 1 && hasEditing && showMessage) {
+ } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
@@ -500,7 +500,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Disabled'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Disabled'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍋滅敤鎴愬姛')
this.onLoad()
@@ -515,7 +515,7 @@
}
}
});
- } else {
+ } else if(this.selectRow.length == 1 && !hasEditing && showMessage ) {
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼')
}
});
@@ -551,7 +551,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Released'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍚敤鎴愬姛')
this.onLoad()
@@ -608,7 +608,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'TakeBack'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'TakeBack'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍥炴敹鎴愬姛')
this.onLoad()
@@ -774,6 +774,7 @@
//澶氶��
handleSelectionChange(list) {
this.selectRow = list;
+ console.log(this.selectRow)
this.parameter.ids = [];
list.forEach((item) => {
this.parameter.ids.push(item.oid);
--
Gitblit v1.9.3