From 2f83b115973e12107266c920e42cfba31652e62d Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 26 十月 2024 21:03:58 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/healthy/index.vue | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 0ac6700..ef253a2 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -52,7 +52,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -126,9 +126,9 @@
</el-col>
</el-row>
- <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="鐪嬬梾鏃堕棿" prop="checkTime" sortable width="200" align="center">
<template slot-scope="scope">{{scope.row.checkTime? scope.row.checkTime: '鈥斺�斺�斺��'}}</template>
@@ -166,7 +166,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="120" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -201,12 +201,14 @@
style="background: #FEF7FC;"
/>
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="鍙戠敓鏃堕棿" prop="checkTime">
<el-date-picker v-model="formDat.checkTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ @click.native.stop
+ ref="datePicker"
:editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@@ -364,7 +366,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -372,10 +374,11 @@
import {Message} from "element-ui";
export default {
- name: "Role",
+ name: "ZYearInfo",
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
loading: true,
@@ -490,11 +493,22 @@
},
created() {
this.getList();
-
+ this.getInfo()
},
methods: {
-
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
@@ -582,7 +596,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
--
Gitblit v1.9.1