feige
2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab
ruoyi-ui/src/views/wish/index.vue
@@ -150,52 +150,28 @@
          </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>
    </div>
    <el-table v-loading="loading" :data="wishList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" border :data="wishList" :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-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="时间" prop="happenTime" sortable width="150" align="center">
@@ -248,7 +224,7 @@
      <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="90" 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="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
@@ -471,12 +447,12 @@
    <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-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" >
         <!-- <el-table-column label="身份" prop="identity" sortable width="130" >
            <template slot-scope="scope" >
              <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
              <span v-else>——</span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>
@@ -599,8 +575,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 {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel,enload,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -611,10 +587,11 @@
export default {
  name: "index",
  name: "Bainianxinyuan",
  dicts: ['sys_normal_disable'],
  data() {
    return {
     total1: 0,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -675,10 +652,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:[],
      fileList1:[],
@@ -918,24 +896,42 @@
    },
    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, 2027).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) {
@@ -946,8 +942,9 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
 this.userOptions = []
        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -1127,6 +1124,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
      this.$router.push("/self/wish/wishInfo/" + id);
    },