diff --git a/base-manager-ui/admin/src/layouts/tabs/TabsView.vue b/base-manager-ui/admin/src/layouts/tabs/TabsView.vue index 102d35274965d54c66e45e4cb14dc45f7e7fc04f..767ab870884bedf3a4a0b703b626281f760e38c3 100644 --- a/base-manager-ui/admin/src/layouts/tabs/TabsView.vue +++ b/base-manager-ui/admin/src/layouts/tabs/TabsView.vue @@ -1,4 +1,4 @@ -<!-- <template> + <template> <admin-layout> <contextmenu :itemList="menuItemList" @@ -395,4 +395,4 @@ export default { margin: 0 auto; } } -</style> --> +</style> diff --git a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue index 036831f04dfd5f68a9dcd06528f4e5f9a5878cfe..ec7864ada5a63db1a7790a6162c6920b56e462c2 100644 --- a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue +++ b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue @@ -391,14 +391,13 @@ export default { } }, // 鑾峰彇鎵归噺鍔犲叆id - onRightSelectChange(key, data) { + onRightSelectChange(key) { this.selectedRowKeys = key; - this.matterIds = data.map((v) => v.id).join(","); }, // 鎵归噺鍔犲叆 handleAddAll() { - if (this.matterIds) { - this.handleIn(this.matterIds); + if (this.selectedRowKeys.length) { + this.handleIn(this.selectedRowKeys.join(",")); } else { this.$message.warning("璇峰厛鍕鹃€夋暟鎹�"); return; @@ -439,14 +438,14 @@ export default { return; } let res = await addMatterToSite({ - siteId: this.siteId, + siteId: Number(this.siteId), matterIds: String(matterId), }); - if (res.data.code === 1) { - this.$message.success("鍔犲叆鎴愬姛"); + let { code, msg } = res.data; + if (code === 1) { + this.$message.success(msg); this.getMatterSiteData(); this.selectedRowKeys = []; - this.matterIds = ""; this.$bus.$emit("addMatterSiteData"); } else { this.$message.error("鍔犲叆澶辫触"); diff --git a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue index 6f1dc87b7f0ec0df39043a158320918237fb78ef..f8be1c6ca6b07866f3e4a7eef9514abd24f43fc0 100644 --- a/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue +++ b/base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue @@ -663,15 +663,13 @@ export default { let res = await addBatchSave(this.allCorrelationData); let { code, msg } = res.data; if (code === 1) { - this.$message.success("淇濆瓨涓氬姟浜嬮」鍏宠仈鎴愬姛"); + this.$message.success(msg); this.isCorrelation = false; this.iscConfirmLoading = false; this.getBusinessMatterData(); this.$refs.formData.resetFields(); this.selectedRowKeys = []; this.allCorrelationData = []; - } else { - this.$message.error(msg); } } }); diff --git a/base-manager-ui/admin/src/pages/basicset/jump/jump.vue b/base-manager-ui/admin/src/pages/basicset/jump/jump.vue index 2b7ae005bd58b2fa62dd0ffe67937e83549c2ae8..854f733ca1af5e50f3f4de97373fe053c7ecb4cd 100644 --- a/base-manager-ui/admin/src/pages/basicset/jump/jump.vue +++ b/base-manager-ui/admin/src/pages/basicset/jump/jump.vue @@ -11,7 +11,6 @@ export default { return {}; }, created() { - console.log(process.env.VUE_APP_API_BASE_URL); this.getToken(); }, methods: { @@ -23,9 +22,9 @@ export default { this.$router.push("basicset/website"); } else { this.$message.warning("璺宠浆澶辫触,璇烽噸鏂扮櫥褰�"); - // setTimeout(() => { - // location.href = process.env.VUE_APP_API_portal_URL + "/#/"; - // }, 2000); + setTimeout(() => { + location.href = process.env.VUE_APP_API_portal_URL + "/#/"; + }, 2000); } }, },