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 | 155 +++++++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 74 deletions(-) diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue index e363e03..1a9030f 100644 --- a/ruoyi-ui/src/views/economy/index.vue +++ b/ruoyi-ui/src/views/economy/index.vue @@ -104,54 +104,29 @@ </el-upload> </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - :disabled="multiple" - @click="handleShare" - - >鍒嗕韩</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="handleWho" - >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="whoShare" - >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="showData" - >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button> - </el-col> - - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + <el-dropdown placement="鍒嗕韩鐩稿叧"> + <el-button size="mini" type="primary" + plain + icon="el-icon-top">鍒嗕韩鐩稿叧</el-button> + <template #dropdown> + <el-dropdown-menu> + <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item> + + <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item> + </el-dropdown-menu> + </template> + </el-dropdown> + + + + <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔--> <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 --> - <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> + <el-table v-loading="loading" border :data="economyList" @selection-change="handleSelectionChange" :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="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/> @@ -197,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 @@ -244,7 +219,7 @@ <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 --> <!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� --> - <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> + <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="鍙拌处" prop="type"> <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input> @@ -252,11 +227,13 @@ <el-form-item label="鍙戠敓鏃堕棿" prop="creatTime"> <el-date-picker v-model="formDat.createTime" 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> <el-form-item label="鏀跺叆/鏀嚭" prop="price"> - <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" > + <el-select ref="multiSelect" v-model="formDat.price" 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> @@ -534,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涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� @@ -542,13 +520,14 @@ } from "@/api/economy/index"; import { Notification, MessageBox, Message, Loading } from 'element-ui' import {listUserAll} from "@/api/root/index"; - +import {showShareUser} from "@/api/bignote/index"; export default { - name: "Role", + name: "ZfEconomy", dicts: ['sys_normal_disable'], data() { return { // 鍒嗕韩缁欒皝鐨刲ist + total1:0, listRoot: [], open1:false, open2:false, @@ -608,10 +587,11 @@ deptNodeAll: false, // 鏃ユ湡鑼冨洿 dateRange: [], + valueFromParent: '瀹跺涵鏀舵敮鍙拌处', // 鏁版嵁鑼冨洿閫夐」 // 鏁版嵁鑼冨洿閫夐」 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', - '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'], fileList:[ ], @@ -722,6 +702,13 @@ }, methods: { + handleDialogClick() + { + // 鍏抽棴鏃ユ湡閫夋嫨鍣� + this.$refs.multiSelect.blur() + + this.$refs.datePicker.handleClose(); + }, // 鍒嗛〉 fenYe(){ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)' @@ -853,36 +840,55 @@ }, 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; - } - ); + let userId = this.$store.state.user.userId + + this.userOptions = [] + showShareUser(userId, 2023).then(response=>{ + console.log("===========ddddddddddddd") + console.log(response.data) + console.log("--------------------") + response.data.forEach(element =>{ + 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; @@ -976,12 +982,12 @@ getCateInfor() { let _this = this - getCategory().then(response=>{ + // getCategory().then(response=>{ - response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ - _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) - }) - }) + // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ + // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) + // }) + // }) }, // 鍙栨秷鎸夐挳 cancel() { @@ -1047,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