Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-02 1a695159e3cd3010381b0dff8b3dcd6f73fa189a

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

@@ -118,7 +118,7 @@
      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
        <template slot-scope="scope">
          <router-link :to="'/dict/type/data/' + scope.row.dictId" class="link-type">
          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
            <span>{{ scope.row.dictType }}</span>
          </router-link>
        </template>
@@ -193,7 +193,7 @@
</template>

<script>
import { listType, getType, delType, addType, updateType, exportType, refreshCache } from "@/api/system/dict/type";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

export default {
  name: "Dict",
@@ -227,6 +227,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        dictName: undefined,
        dictType: undefined,
        status: undefined
@@ -346,18 +347,7 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有类型数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportType(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      this.downLoadExcel('/system/dict/type/export', this.queryParams);
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {