From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容
---
ruoyi-ui/src/views/economy/index.vue | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 6079dc1..1a9030f 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -172,7 +172,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="100" >
<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" v-if="userId != 2">
+ <el-table-column fixed="right" 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
@@ -511,6 +511,7 @@
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";
+import {getAllInfo} from "@/api/system/user"
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -521,7 +522,7 @@
import {listUserAll} from "@/api/root/index";
import {showShareUser} from "@/api/bignote/index";
export default {
- name: "Role",
+ name: "ZfEconomy",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -590,7 +591,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
@@ -840,6 +841,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2023).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -848,18 +851,44 @@
this.userOptions.push({label: element.oldName,value: element.userId})
})
})
+
+ let clanId = this.$store.state.user.clanId
+
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ // for(let i in kon){
+ // this.userOptions.push({label: i,value: kon[i]})
+ // }
+ // for(let i in this.userOptions){
+ // this.userList.push(this.userOptions[i].value)
+ // }
+ // console.log(this.userList,'userListuserListuserList99999999999999')
+ this.loading1 = false;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
const shareList = {}
shareList.shareContents = this.id1 || this.ids;
shareList.shareIds = this.ids1
+ if(shareList.shareIds.length==0)
+ {
+ this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+ return;
+ }
console.log(shareList,'sharelistsharelist')
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1024,6 +1053,7 @@
handleCheck(row){
// alert(123)
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/economy/economyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1