From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/travel/index.vue | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 459890d..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 >
@@ -110,7 +111,7 @@
<el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
<el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
<el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
-
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
<img
@@ -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"
@@ -180,10 +181,10 @@
<el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
<el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
-
- <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>
@@ -410,7 +411,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -422,8 +423,8 @@
:on-remove="handleRemove"
:show-file-list="true"
-
-
+
+
ref="upload1"
:on-change="handleChange1"
:auto-upload="false"
@@ -431,7 +432,7 @@
:http-request="requestUpload1"
>
-
+
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -444,11 +445,11 @@
></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>
-
+
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-name">{{ file.name }}</span>
<span
@@ -457,18 +458,18 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
-
+
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
<i class="el-icon-delete"></i>
</span>
</span>
-
+
</div>
-
+
</el-upload>
<el-button
style="margin-left: 10px"
@@ -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() {
@@ -967,9 +977,9 @@
for(let i = 0; i < this.fileListOther.length; i++){
this.handleRemoveFile(this.fileListOther[0]);
}
-
-
this.getList();
+
+
});
}
});
@@ -978,6 +988,17 @@
// });
// this.handleRemove(this.fileList[0]);
// this.handleRemoveFile(this.fileListOther[0]);
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
},
// 寮圭獥
handleShow(row){
@@ -1038,7 +1059,7 @@
if(this.fileList[i].url==file.url)
{
this.$delete(this.fileList,i);
- this.$delete(this.uploadFileList,i);
+ this.$delete(this.uploadFileList,i);
}
}
// let ul = this.fileList.map(function (elem){
@@ -1054,9 +1075,9 @@
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
- {
+ {
this.$delete(this.fileListOther,i);
- this.$delete(this.uploadFileList1,i);
+ this.$delete(this.uploadFileList1,i);
}
}
},
@@ -1090,7 +1111,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -1113,7 +1134,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -1123,11 +1144,11 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
-
+
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -1135,7 +1156,7 @@
alert(_this.formDat.url)
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
@@ -1150,7 +1171,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -1161,7 +1182,7 @@
// alert(_this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
--
Gitblit v1.9.1