From d03c0c366862d917bdac6ba9cab8d338e722da10 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 11 六月 2024 14:12:38 +0800
Subject: [PATCH] 修改
---
ruoyi-ui/src/views/travel/index.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index b6a91de..7e0221e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -59,7 +59,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"
@@ -78,7 +78,7 @@
icon="el-icon-delete"
size="mini"
:disabled="multiple"
- @click="handleDelete1"
+ @click="handleDelete"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
@@ -88,6 +88,7 @@
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column type="expand" :cell-class-name="expandRowClassName">
<template slot-scope="props">
<div >
@@ -119,22 +120,22 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
>
<img
+ v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceA.png"
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="!scope.row.url"
>
</template>
</el-table-column>
<!-- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@@ -183,7 +184,7 @@
- <el-table-column label="鎿嶄綔" align="center" sortable width="180" >
+ <el-table-column label="鎿嶄綔" align="center" sortable width="180" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@@ -235,7 +236,7 @@
<el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
<el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />
- <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -356,7 +357,7 @@
<el-input v-model="formDat.flight" placeholder="璇疯緭鍏ヨ溅娆�/鑸彮" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鍏跺畠璐圭敤" prop="otherCost">
- <el-input v-model="formDat.otherCost" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model="formDat.otherCost" type="number" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="backInfo">
<el-input v-model="formDat.backInfo" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -444,7 +445,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- :src="file.url"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 100%; height: 100%"
fit="cover"></img>
@@ -517,7 +518,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涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -540,6 +541,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
loading: true,
@@ -782,8 +784,16 @@
},
created() {
this.getList();
+ this.getInfo()
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
//灞曞紑琛�
expandRowClassName({ row, rowIndex }) {
// 杩斿洖瀵瑰簲琛岀殑鏍峰紡閰嶇疆瀵硅薄
@@ -829,7 +839,7 @@
this.travelpriceList = response.data.data;
//alert(this.travelpriceList.url)
console.log("0000")
- console.log(this.travelpriceList)
+ console.log(this.travelpriceList,'1111111111111111111111111')
this.total = response.data.total;
this.loading = false;
@@ -898,7 +908,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
--
Gitblit v1.9.1