修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

 ruoyi-ui/src/views/note/index.vue

@@ -148,9 +148,7 @@
                   plain
                   icon="el-icon-top">分享相关</el-button>
         <template #dropdown>
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-top">分享相关</el-button>
		
           <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>
         
@@ -209,7 +207,7 @@
            ></div>
        </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
@@ -415,12 +413,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>

@@ -533,7 +531,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";


@@ -545,7 +543,7 @@
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  name: "ZfProperty",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -615,7 +613,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:[
      ],
@@ -811,6 +809,7 @@
        this.id1 = [row.id]
      }
      this.open1 = true;
     console.log(this.listRoot)
      this.title1 = "分享";
    },
    // 多选框选中数据
@@ -838,6 +837,8 @@
    getList1() {
          this.loading1 = true;
    let userId = this.$store.state.user.userId
	
   this.userOptions = []
     showShareUser(userId, 2002).then(response=>{
                console.log("===========ddddddddddddd")
                console.log(response.data)
@@ -846,18 +847,45 @@
                    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;
@@ -1017,6 +1045,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false; 
      this.$router.push("/familymodel/property/propertyInfo/" + id);
    },
    /** 修改按钮操作 */