From e3637bb4f69492e89521efd24fb4fdc0da6071de Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 11 六月 2024 14:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/note/index.vue | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 82de811..6400c0a 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -85,7 +85,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"
@@ -188,7 +188,7 @@
></div>
</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
@@ -305,7 +305,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -360,12 +360,14 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
import {listProperty,enload, getPropertyInfo, delProperty, getCategory,
addProperty, uploadPic} from "@/api/note/index";
+import {getInfo} from "@/api/login";
import {Message} from "element-ui";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -482,9 +484,16 @@
created() {
this.getList();
this.getCateInfor()
-
+ this.getInfo()
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -560,10 +569,10 @@
{
if(this.fileListOther[i].url==file.url)
{
-
+
this.$delete(this.fileListOther,i);
this.$delete(this.uploadFileList1,i);
-
+
}
}
},
@@ -598,7 +607,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -651,7 +660,7 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -676,7 +685,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -699,7 +708,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -709,18 +718,18 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
-
+
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
@@ -735,7 +744,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -745,7 +754,7 @@
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
--
Gitblit v1.9.1