From f2bc9fde40010ddb6fdbc4c36ee9fc0e83af8f03 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 06 三月 2025 16:45:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/system/menu/index.vue | 270 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 202 insertions(+), 68 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 5a37d9d..50be8f2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ >
<el-form-item label="鑿滃崟鍚嶇О" prop="menuName">
<el-input
v-model="queryParams.menuName"
@@ -10,7 +16,11 @@
/>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable>
+ <el-select
+ v-model="queryParams.status"
+ placeholder="鑿滃崟鐘舵��"
+ clearable
+ >
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
@@ -20,8 +30,16 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鏌� 璇�</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-form-item>
</el-form>
@@ -34,7 +52,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:menu:add']"
- >鏂板</el-button>
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
<el-button
@@ -43,9 +62,13 @@
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
+ >灞曞紑/鎶樺彔</el-button
+ >
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
<el-table
@@ -54,20 +77,40 @@
:data="menuList"
row-key="menuId"
:default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
- <el-table-column prop="menuName" label="鑿滃崟鍚嶇О" :show-overflow-tooltip="true" width="160"></el-table-column>
+ <el-table-column
+ prop="menuName"
+ label="鑿滃崟鍚嶇О"
+ :show-overflow-tooltip="true"
+ width="160"
+ ></el-table-column>
<el-table-column prop="icon" label="鍥炬爣" align="center" width="100">
<template slot-scope="scope">
<svg-icon :icon-class="scope.row.icon" />
</template>
</el-table-column>
- <el-table-column prop="orderNum" label="鎺掑簭" width="60"></el-table-column>
- <el-table-column prop="perms" label="鏉冮檺鏍囪瘑" :show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="component" label="缁勪欢璺緞" :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column
+ prop="orderNum"
+ label="鎺掑簭"
+ width="60"
+ ></el-table-column>
+ <el-table-column
+ prop="perms"
+ label="鏉冮檺鏍囪瘑"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ prop="component"
+ label="缁勪欢璺緞"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
<el-table-column prop="status" label="鐘舵��" width="80">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ <dict-tag
+ :options="dict.type.sys_normal_disable"
+ :value="scope.row.status"
+ />
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
@@ -75,7 +118,11 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
<template slot-scope="scope">
<el-button
size="mini"
@@ -83,21 +130,24 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
- >淇敼</el-button>
+ >淇敼</el-button
+ >
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
- >鏂板</el-button>
+ >鏂板</el-button
+ >
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:menu:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -138,15 +188,28 @@
trigger="click"
@show="$refs['iconSelect'].reset()"
>
- <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
- <el-input slot="reference" v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" readonly>
+ <IconSelect
+ ref="iconSelect"
+ @selected="selected"
+ :active-icon="form.icon"
+ />
+ <el-input
+ slot="reference"
+ v-model="form.icon"
+ placeholder="鐐瑰嚮閫夋嫨鍥炬爣"
+ readonly
+ >
<svg-icon
v-if="form.icon"
slot="prefix"
:icon-class="form.icon"
- style="width: 25px;"
+ style="width: 25px"
/>
- <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+ <i
+ v-else
+ slot="prefix"
+ class="el-icon-search el-input__icon"
+ />
</el-input>
</el-popover>
</el-form-item>
@@ -160,7 +223,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏄剧ず鎺掑簭" prop="orderNum">
- <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+ <el-input-number
+ v-model="form.orderNum"
+ controls-position="right"
+ :min="0"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -168,8 +235,11 @@
<el-col :span="12" v-if="form.menuType != 'F'">
<el-form-item prop="isFrame">
<span slot="label">
- <el-tooltip content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
鏄惁澶栭摼
</span>
@@ -182,8 +252,11 @@
<el-col :span="12" v-if="form.menuType != 'F'">
<el-form-item prop="path">
<span slot="label">
- <el-tooltip content="璁块棶鐨勮矾鐢卞湴鍧�锛屽锛歚user`锛屽澶栫綉鍦板潃闇�鍐呴摼璁块棶鍒欎互`http(s)://`寮�澶�" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="璁块棶鐨勮矾鐢卞湴鍧�锛屽锛歚user`锛屽澶栫綉鍦板潃闇�鍐呴摼璁块棶鍒欎互`http(s)://`寮�澶�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
璺敱鍦板潃
</span>
@@ -195,8 +268,11 @@
<el-col :span="12" v-if="form.menuType == 'C'">
<el-form-item prop="component">
<span slot="label">
- <el-tooltip content="璁块棶鐨勭粍浠惰矾寰勶紝濡傦細`system/user/index`锛岄粯璁ゅ湪`views`鐩綍涓�" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="璁块棶鐨勭粍浠惰矾寰勶紝濡傦細`system/user/index`锛岄粯璁ゅ湪`views`鐩綍涓�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
缁勪欢璺緞
</span>
@@ -205,10 +281,17 @@
</el-col>
<el-col :span="12" v-if="form.menuType != 'M'">
<el-form-item prop="perms">
- <el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" />
+ <el-input
+ v-model="form.perms"
+ placeholder="璇疯緭鍏ユ潈闄愭爣璇�"
+ maxlength="100"
+ />
<span slot="label">
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
鏉冮檺瀛楃
</span>
@@ -218,10 +301,17 @@
<el-row>
<el-col :span="12" v-if="form.menuType == 'C'">
<el-form-item prop="query">
- <el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
+ <el-input
+ v-model="form.query"
+ placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�"
+ maxlength="255"
+ />
<span slot="label">
- <el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`'
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
璺敱鍙傛暟
</span>
@@ -230,8 +320,11 @@
<el-col :span="12" v-if="form.menuType == 'C'">
<el-form-item prop="isCache">
<span slot="label">
- <el-tooltip content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
鏄惁缂撳瓨
</span>
@@ -246,8 +339,11 @@
<el-col :span="12" v-if="form.menuType != 'F'">
<el-form-item prop="visible">
<span slot="label">
- <el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
鏄剧ず鐘舵��
</span>
@@ -256,15 +352,19 @@
v-for="dict in dict.type.sys_show_hide"
:key="dict.value"
:label="dict.value"
- >{{dict.label}}</el-radio>
+ >{{ dict.label }}</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="status">
<span slot="label">
- <el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
- <i class="el-icon-question"></i>
+ <el-tooltip
+ content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
</el-tooltip>
鑿滃崟鐘舵��
</span>
@@ -273,8 +373,30 @@
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
- >{{dict.label}}</el-radio>
+ >{{ dict.label }}</el-radio
+ >
</el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.menuType != 'M'">
+ <el-form-item prop="status">
+ <span slot="label">
+ <el-tooltip
+ content="閫夋嫨鍙湅鎴戞寜閽紝鍦ㄨ鑹茬鐞嗗鍙厤缃彧鐪嬫垜鐨勬暟鎹潈闄�"
+ placement="top"
+ >
+ <i class="el-icon-question"></i>
+ </el-tooltip>
+ 鍙湅鎴戞寜閽�
+ </span>
+ <el-switch
+ v-model="form.isRersonalButton"
+ inactive-text="涓嶆樉绀�"
+ active-text="鏄剧ず"
+ :inactive-value="0"
+ :active-value="1"
+ >
+ </el-switch>
</el-form-item>
</el-col>
</el-row>
@@ -288,14 +410,20 @@
</template>
<script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import {
+ listMenu,
+ getMenu,
+ delMenu,
+ addMenu,
+ updateMenu,
+} from "@/api/system/menu";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import IconSelect from "@/components/IconSelect";
export default {
name: "Menu",
- dicts: ['sys_show_hide', 'sys_normal_disable'],
+ dicts: ["sys_show_hide", "sys_normal_disable"],
components: { Treeselect, IconSelect },
data() {
return {
@@ -318,22 +446,22 @@
// 鏌ヨ鍙傛暟
queryParams: {
menuName: undefined,
- visible: undefined
+ visible: undefined,
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
menuName: [
- { required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
],
orderNum: [
- { required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" },
],
path: [
- { required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
- ]
- }
+ { required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ },
};
},
created() {
@@ -347,7 +475,7 @@
/** 鏌ヨ鑿滃崟鍒楄〃 */
getList() {
this.loading = true;
- listMenu(this.queryParams).then(response => {
+ listMenu(this.queryParams).then((response) => {
this.menuList = this.handleTree(response.data, "menuId");
this.loading = false;
});
@@ -360,14 +488,14 @@
return {
id: node.menuId,
label: node.menuName,
- children: node.children
+ children: node.children,
};
},
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
getTreeselect() {
- listMenu().then(response => {
+ listMenu().then((response) => {
this.menuOptions = [];
- const menu = { menuId: 0, menuName: '涓荤被鐩�', children: [] };
+ const menu = { menuId: 0, menuName: "涓荤被鐩�", children: [] };
menu.children = this.handleTree(response.data, "menuId");
this.menuOptions.push(menu);
});
@@ -389,7 +517,8 @@
isFrame: "1",
isCache: "0",
visible: "0",
- status: "0"
+ status: "0",
+ isRersonalButton: 0,
};
this.resetForm("form");
},
@@ -426,24 +555,25 @@
handleUpdate(row) {
this.reset();
this.getTreeselect();
- getMenu(row.menuId).then(response => {
+ getMenu(row.menuId).then((response) => {
this.form = response.data;
+ this.form.isRersonalButton = Number(this.form.isRersonalButton);
this.open = true;
this.title = "淇敼鑿滃崟";
});
},
/** 鎻愪氦鎸夐挳 */
- submitForm: function() {
- this.$refs["form"].validate(valid => {
+ submitForm: function () {
+ this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.menuId != undefined) {
- updateMenu(this.form).then(response => {
+ updateMenu(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
- addMenu(this.form).then(response => {
+ addMenu(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -454,13 +584,17 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」锛�').then(function() {
- return delMenu(row.menuId);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- }
- }
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」锛�')
+ .then(function () {
+ return delMenu(row.menuId);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => {});
+ },
+ },
};
</script>
--
Gitblit v1.9.3