From 0bed59a7c83975e466e31aa2fa14d8ee15473813 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 16 一月 2025 11:20:35 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/selfeconomy/index.vue | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index c75c4d4..aad13e9 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -172,7 +172,7 @@
<el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -211,7 +211,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="220" 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
@@ -262,13 +262,15 @@
/>
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+ <el-dialog :title="title" :visible.sync="open" width="840px" append-to-body @click.native="handleDialogClick">
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="120px">
<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker v-model="formDat.happenTime" 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>
@@ -292,8 +294,8 @@
<el-input v-model="formDat.propertyRight" placeholder="璇疯緭鍏ヤ骇鏉�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
- <el-select v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange">
+ <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢/璐拱" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -303,7 +305,7 @@
</el-input>
</el-form-item>
<el-form-item label="鏄惁娉ㄩ攢" prop="status">
- <el-select v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" >
+ <el-select ref="multiSelect1" v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -496,7 +498,7 @@
<el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -580,7 +582,8 @@
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"
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
@@ -591,10 +594,12 @@
export default {
- name: "index",
+ name: "ZProperty",
dicts: ['sys_normal_disable'],
data() {
return {
+ selfeconomyList:[],
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -662,7 +667,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:[
],
@@ -732,7 +737,7 @@
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
@@ -793,13 +798,22 @@
created() {
this.getList1();
this.getList();
+
//this.getCateInfor();
this.getInfo();
+
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.multiSelect.blur()
+ this.$refs.multiSelect1.blur()
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -922,25 +936,42 @@
// this.multiple1 = !selection.length
},
getList1() {
- this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- listUserAll(this.queryParams1).then(response => {
- this.listRoot = response.data.data;
- const kon = {}
- 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,'userListuserListuserList')
- this.loading1 = false;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2026).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
+ 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) {
@@ -953,6 +984,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1102,13 +1134,14 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
+ // this.reset();
this.open = true;
this.title = "鏂板涓汉璐骇璇︾粏淇℃伅";
},
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1