From f5edbc080d696fbd55de84f6a906aeb2cde3b1b6 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 03 三月 2025 22:57:00 +0800 Subject: [PATCH] 修改了对应bug --- ruoyi-ui/src/views/selfeconomy/index.vue | 121 ++++++++++++++++++++++++---------------- 1 files changed, 72 insertions(+), 49 deletions(-) diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue index 282625b..88d13b9 100644 --- a/ruoyi-ui/src/views/selfeconomy/index.vue +++ b/ruoyi-ui/src/views/selfeconomy/index.vue @@ -145,7 +145,7 @@ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item> </el-dropdown-menu> </template> - </el-dropdown> + </el-dropdown> @@ -154,8 +154,8 @@ </el-row> </div> - <el-table v-loading="loading" border :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @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 v-loading="loading" border :data="selfeconomyList" :row-key="getRowId1" ref="multipleTable" @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 fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> <el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> @@ -208,10 +208,10 @@ ></div> </template> </el-table-column> - <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center"> + <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="250" 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 @@ -337,10 +337,9 @@ :preview-src-list="[file.url]" > <span class="el-upload-list__item-actions"> - <span - class="el-upload-list__item-preview" - @click="handlePictureCardPreview(file)" - > + <span + class="el-upload-list__item-preview" + @click="handlePictureCardPreview(file)"> <i class="el-icon-zoom-in"></i> </span> @@ -448,7 +447,7 @@ <!-- 鍒嗕韩瀵硅瘽妗�1 --> <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2"> - <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> + <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" width="55" align="center" /> <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/> <el-table-column label="韬唤" prop="identity" sortable width="130" > @@ -483,7 +482,7 @@ </el-select> </div> - <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> + <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> </el-table-column> @@ -582,19 +581,20 @@ <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"; - + 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, share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData } from "@/api/selfeconomy/index"; -import {listUserAll} from "@/api/root/index"; -import { Notification, MessageBox, Message, Loading } from 'element-ui' + import {listUserAll} from "@/api/root/index"; + import { Notification, MessageBox, Message, Loading } from 'element-ui' export default { - name: "index", + name: "ZProperty", dicts: ['sys_normal_disable'], data() { return { @@ -630,6 +630,7 @@ multiple1: true, dateRange1: [], + selfeconomyList: [], userId: undefined, // 閬僵灞� @@ -647,6 +648,7 @@ showSearch: true, // 鎬绘潯鏁� total: 0, + total1: 0, // 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁 wishList: [], // 寮瑰嚭灞傛爣棰� @@ -665,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:[ ], @@ -794,10 +796,12 @@ }; }, created() { - this.getList1() + this.getList1(); this.getList(); - // this.getCateInfor() - this.getInfo() + + //this.getCateInfor(); + this.getInfo(); + // for (let i = 0; i < this.contactList.length; i++) { // this.formDat[i] = this.contactList[i]; // } @@ -931,34 +935,43 @@ // this.single1 = selection.length!=1 // this.multiple1 = !selection.length }, - getRowId1(row) - { - return row.id - }, - getRowId2(row) - { - return row.id - }, 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) { @@ -971,6 +984,7 @@ }).then(() => { this.getList(); + this.getList1(); this.$modal.msgSuccess("鍒嗕韩鎴愬姛"); this.id1 = undefined this.open1 = false; @@ -999,7 +1013,15 @@ this.open = false; this.reset(); }, - getRowId(row) + getRowId1(row) + { + return row.id + }, + getRowId2(row) + { + return row.id + }, + getRowId3(row) { return row.id }, @@ -1119,6 +1141,7 @@ /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ const id = row.id; + this.open2 = false; this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id); }, /** 淇敼鎸夐挳鎿嶄綔 */ @@ -1154,7 +1177,7 @@ addSelfEconomy(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.open = false; + // this.open = false; this.getList(); }); } -- Gitblit v1.9.1