修改了代码

feige

昨天 f43ef0c77c6f437bd0f7459d75168e6f77e334bb

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

@@ -8,7 +8,7 @@
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;" allow-create
        filterable clearable :style="{width: '100%'}"  >
        filterable  :style="{width: '100%'}"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
@@ -143,52 +143,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-dropdown placement="分享相关">
        <el-button size="mini"   type="primary"
                   plain
                   icon="el-icon-top">分享相关</el-button>
         <template #dropdown>

        >分享</el-button>
      </el-col>
           <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-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-top"
          size="mini"
          @click="handleWho"
        >分享给谁了什么数据</el-button>
      </el-col>
                    <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>

      <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>
           <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

    </el-row>

    <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
    <el-table v-loading="loading" border aria-autocomplete="":data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <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="100"/>
@@ -197,6 +174,8 @@
      <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存储地址" prop="location" sortable width="150" />
      <el-table-column label="持有人" prop="holder" sortable width="150" />
            <el-table-column label="价值区间" prop="valueRange" sortable width="150" />

      <el-table-column label="具体位置" prop="address" sortable width="150" />
      <el-table-column label="备注" prop="remark" sortable width="130" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
@@ -230,7 +209,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
@@ -273,7 +252,7 @@

    <!-- 添加或修改资产信息配置对话框 -->
    <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-form ref="elForm" border :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>-->
<!--        </el-form-item>-->
@@ -303,6 +282,11 @@
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="价值范围" prop="valueRange">
          <el-radio-group v-model="formDat.valueRange" :style="{width: '100%'}">
            <el-radio v-for="(item, index) in valueRangeOptions" :key="index" :label="item.value">{{ item.label }}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
@@ -436,12 +420,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>

@@ -554,7 +538,8 @@
<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";


//在system/note/index.js中导入接口函数
@@ -565,11 +550,12 @@
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 {
      // 分享给谁的list
     total1:0,
      listRoot: [],
      open1:false,
      open2:false,
@@ -628,12 +614,13 @@
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
     valueFromParent: '家庭资产',
      // 日期范围
      dateRange: [],
      // 数据范围选项
     // 数据范围选项
     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:[
      ],
@@ -652,7 +639,7 @@
        remark: undefined,
        happenTime:undefined,
        url: "",

        valueRange: undefined
      },
      // 菜单列表
      menuOptions: [],
@@ -704,14 +691,26 @@
          message: '请输入具体位置',
          trigger: 'blur'
        }],

        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'blur'
        }],
        valueRange: [{
          required: true,
          message: '请选择价值范围',
          trigger: 'change'
        }],
      },
      typeOptions: [],
      // 价值范围选项
      valueRangeOptions: [
        { label: '10000以下', value: '10000以下' },
        { label: '1w到10w', value: '1w到10w' },
        { label: '10w到100w', value: '10w到100w' },
        { label: '100w-1000w', value: '100w-1000w' },
        { label: '1000w以上', value: '1000w以上' }
      ],
    };
  },
  created() {
@@ -829,6 +828,7 @@
        this.id1 = [row.id]
      }
      this.open1 = true;
     console.log(this.listRoot)
      this.title1 = "分享";
    },
    // 多选框选中数据
@@ -855,36 +855,56 @@
    },
    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, 2002).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;
@@ -1044,6 +1064,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
      this.$router.push("/familymodel/property/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
@@ -1067,7 +1088,7 @@
    /** 提交按钮（数据权限） */
    submitDataScope: function() {


	
      this.$refs["elForm"].validate(valid => {
        if (valid) {