租户字典、修改bug

ruoyi-ui/src/views/system/tenant/dict/data.vue

@@ -280,8 +280,6 @@ export default {
     /** 查询字典类型详细 */
     getType(dictId) {
       getType(dictId).then(response => {
-        console.log("111111");
-        console.log(response);
         this.queryParams.dictType = response.data.dictType;
         this.defaultDictType = response.data.dictType;
         this.getList();
@@ -401,4 +399,4 @@ export default {
     }
   }
 };
-</script>
+</script>

ruoyi-ui/src/views/system/tenant/dict/index.vue

@@ -74,11 +74,11 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
+          v-hasPermi="['system:tenantDict:add']"
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -86,10 +86,10 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
+          v-hasPermi="['system:tenantDict:edit']"
           >修改</el-button
         >
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -98,7 +98,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
+          v-hasPermi="['system:tenantDict:remove']"
           >删除</el-button
         >
       </el-col>
@@ -109,7 +109,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:dict:export']"
+          v-hasPermi="['system:tenantDict:export']"
           >导出</el-button
         >
       </el-col>
@@ -120,7 +120,7 @@
           icon="el-icon-refresh"
           size="mini"
           @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
+          v-hasPermi="['system:tenantDict:remove']"
           >刷新缓存</el-button
         >
       </el-col>
@@ -198,7 +198,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:dict:edit']"
+                  v-hasPermi="['system:tenantDict:edit']"
                   >修改</el-button
                 ></el-dropdown-item
               >
@@ -208,7 +208,7 @@
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:dict:remove']"
+                  v-hasPermi="['system:tenantDict:remove']"
                   >删除</el-button
                 >
               </el-dropdown-item>

ruoyi-ui/src/views/system/tenant/index.vue

@@ -148,7 +148,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel1">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -236,6 +236,11 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 绑定数据源取消按钮
+    cancel1() {
+      this.dataSourceOpen = false;
+      this.reset1();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -299,7 +304,7 @@ export default {
     bindDatasource(row) {
       this.reset1();
       this.dataSourceOpen = true;
-      this.dataSourceTitle = "绑定数据源信息";
+      this.dataSourceTitle = "配置数据库";
       this.fromTenantId = row.tenantId;
 
       // const tenantId = row.tenantId || this.ids;