Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/layouts/tabs/TabsView.vue

-<!-- <template>
+ <template>
   <admin-layout>
     <contextmenu
       :itemList="menuItemList"
@@ -395,4 +395,4 @@ export default {
     margin: 0 auto;
   }
 }
-</style> -->
+</style> 

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("加入失败");

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);
           }
         }
       });

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);
       }
     },
   },