From 74cac758319c66a5544a022362c0c61165138407 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 七月 2023 15:03:30 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 87b0057..d04c8ff 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -261,9 +261,13 @@
created() {
},
mounted() {
+
},
activated() {
// this.doLayout();
+ this.$nextTick(() => {
+ this.$refs.dataTable.doLayout()
+ })
},
watch: {
tableHeadDataFateher: {
@@ -302,8 +306,6 @@
}
})
this.tableHeadFindDatas = newval;
- console.log('newval',newval)
- console.log('newval',this.tableHeadFindData)
},
},
total: {
@@ -340,7 +342,6 @@
}
},
openVis(visible) {
- console.log(visible)
this[visible] = true
},
handelBtnClick(event) {
@@ -439,16 +440,16 @@
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
- let hasEditing = this.selectRow.some(item => item.lcstatus == 'Released');
+ let hasEditing = this.selectRow.every(item => item.lcstatus == 'Released');
let showMessage = true;
this.selectRow.forEach(item => {
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.code != 200) {
this.userName = localStorage.getItem("username");
@@ -494,7 +495,53 @@
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
-
+ let hasEditing = this.selectRow.every(item => item.lcstatus == 'Disabled');
+ console.log('hasEditing',hasEditing)
+ let showMessage = true;
+ this.selectRow.forEach(item => {
+ if (this.selectRow.length === 1 && item.lcstatus !== "Disabled" && showMessage) {
+ this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
+ 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) {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "鍚敤" + "[鐗╁搧]";
+ this.parameter.type = 'Released'
+ this.title = '鍚敤缂栫爜鏁版嵁'
+ this.visibleDeactivate = true;
+ } else {
+ if (showMessage) {
+ showMessage = false; // 鏍囪宸叉墽琛岃繃鎿嶄綔
+ this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ const oid = this.selectRow.map(obj => obj.oid).join(",");
+ changeStatus({ oid: oid, btmname: result, lcStatus: 'Released' }).then(res => {
+ console.log(res);
+ if(res.data.code == 200 ){
+ this.$message.success('鍚敤鎴愬姛')
+ this.onLoad()
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑�'
+ });
+ });
+ }
+ }
+ });
+ } else if (this.selectRow.length >1 && !hasEditing && showMessage) {
+ this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬仠鐢ㄧ姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
+ showMessage = false;
+ }
+ });
}
},
//鍥炴敹
@@ -502,7 +549,59 @@
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
-
+ // 缂栬緫涓�-鍙兘鍙戝竷锛屼笉鑳藉洖鏀�
+ // 瀹℃牳涓�-浠�涔堥兘涓嶈兘鍋�
+ // 宸插彂甯�-鍋滅敤銆佸洖鏀�
+ // 鍋滅敤-鍙兘鍚敤銆佸洖鏀�
+ const disabledCount = this.selectRow.filter(item => item.lcstatus === 'Disabled').length;
+ const releasedCount = this.selectRow.filter(item => item.lcstatus === 'Released').length;
+ console.log('hasEditing',disabledCount,releasedCount)
+ let showMessage = true;
+ this.selectRow.forEach(item => {
+ if (this.selectRow.length === 1 && item.lcstatus == "TakeBack" && showMessage) {
+ this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
+ showMessage = false;
+ } 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) {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "鍥炴敹" + "[鐗╁搧]";
+ this.parameter.type = 'TakeBack'
+ this.title = '鍥炴敹缂栫爜鏁版嵁'
+ this.visibleDeactivate = true;
+ } else {
+ if (showMessage) {
+ showMessage = false; // 鏍囪宸叉墽琛岃繃鎿嶄綔
+ this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ const oid = this.selectRow.map(obj => obj.oid).join(",");
+ changeStatus({ oid: oid, btmname: result, lcStatus: 'TakeBack' }).then(res => {
+ console.log(res);
+ if(res.data.code == 200 ){
+ this.$message.success('鍥炴敹鎴愬姛')
+ this.onLoad()
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑�'
+ });
+ });
+ }
+ }
+ });
+ } else if (this.selectRow.length >=1 && !(disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
+ this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬仠鐢ㄧ姸鎬佹垨鍙戝竷鐘舵�併�戞墠鍙互鍙戣捣娴佺▼');
+ showMessage = false;
+ }
+ });
}
},
handleSizeChange(val) {
--
Gitblit v1.9.3