feige
2024-08-23 52bbd96db03f32b8d750622116d2b7720eed3d51
修改了一些bug
30个文件已修改
1008 ■■■■■ 已修改文件
ruoyi-ui/src/components/RightToolbar/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/layout/components/TagsView/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clanManager/ancestor/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clanManager/clan/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/index.vue 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/memo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/genealogy/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/index.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/approve.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/memo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/index.vue 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petnote.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/memo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/show.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/memo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/family/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/Info.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/index.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/components/RightToolbar/index.vue
@@ -7,9 +7,13 @@
      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
      </el-tooltip>
      <el-tooltip class="item" effect="dark" content="演示视频" placement="top">
        <el-button size="mini" circle icon="el-icon-refresh" @click="showVideo()" />
      </el-tooltip>
      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
      </el-tooltip>
    </el-row>
    <el-dialog :title="title" :visible.sync="open" append-to-body>
      <el-transfer
@@ -46,6 +50,10 @@
      type: Boolean,
      default: true,
    },
     parentValue: {
        type: String,
        default: ""// 接收并展示来自父组件的值
      },
    gutter: {
      type: Number,
      default: 10,
@@ -69,6 +77,11 @@
    }
  },
  methods: {
    //演示视频
    showVideo()
    {
        alert(this.parentValue)
    },
    // 搜索
    toggleSearch() {
      this.$emit("update:showSearch", !this.showSearch);
ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -250,6 +250,8 @@
      position: relative;
      cursor: pointer;
      height: 26px;
      text-align: center;
      width: 175px;
      line-height: 26px;
      border: 1px solid #d8dce5;
      color: #495060;
@@ -312,6 +314,9 @@
    .el-icon-close {
      width: 16px;
      height: 16px;
      boerder: 3px solid red;
      float: right;
      line-height: 16px;
      vertical-align: 2px;
      border-radius: 50%;
      text-align: center;
@@ -320,7 +325,7 @@
      &:before {
        transform: scale(.6);
        display: inline-block;
        vertical-align: -3px;
        vertical-align: -2px;
      }
      &:hover {
        background-color: #b4bccc;
ruoyi-ui/src/views/bignote/index.vue
@@ -139,54 +139,27 @@
        </el-upload>
      </el-col>
 <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>
      <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>
      <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <!-- 序号、时间、人物、地点、大事标题、电子文件、备注 -->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading"  :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
    <el-table v-loading="loading" border  :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <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="80px"/>
@@ -587,7 +560,7 @@
      dateRange1: [],
valueFromParent: "家大事记",
      userId: undefined,
      // 遮罩层
      disabled: false,
@@ -622,7 +595,7 @@
      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'],
      fileList:[],
      fileList1:[],
            uploadFileList: [],
ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -102,7 +102,7 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
        </el-row>
        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
        <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="用户编号" align="center" key="id" prop="id"  />
          <el-table-column label="用户名称" align="center" key="name" prop="name"  :show-overflow-tooltip="true" />
ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -56,7 +56,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
    <el-table v-loading="loading" border :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
    <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"/>
@@ -223,7 +223,7 @@
  },
  created() {
    this.getList();
    this.getAllUser();
    //this.getAllUser();
  },
  methods: {
    chongf(){
ruoyi-ui/src/views/clean/index.vue
@@ -122,53 +122,27 @@
            </el-upload>
          </el-col>
 <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>
          <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>
        <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
      <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table v-loading="loading" border :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
        <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="80"/>
@@ -597,7 +571,7 @@
        dateRange1: [],
        total1:0,
valueFromParent: "保洁收纳",
        userId: undefined,
        // 遮罩层
        disabled: false,
@@ -630,7 +604,7 @@
        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'],
        fileList:[
        ],
ruoyi-ui/src/views/collection/index.vue
@@ -184,52 +184,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="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
    <el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
      <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="80px"/>
      <el-table-column label="获得时间" prop="happenTime" sortable width="120" align="center">
@@ -718,10 +694,11 @@
      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'],
      fileList:[],
 fileList1:[],
       uploadFileList: [],
ruoyi-ui/src/views/contacts/index.vue
@@ -139,55 +139,30 @@
           >导入</el-button>
         </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-col>
    <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="contactList"  :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" >
    <el-table v-loading="loading" border :data="contactList"  :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" >
      <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="100px"/>
@@ -658,6 +633,7 @@
      title2: "",
      loading1: false,
      loading2: false,
      valueFromParent: "通讯录",
      // 查询参数1
      queryParams1: {
        pageNum: 1,
ruoyi-ui/src/views/device/index.vue
@@ -134,53 +134,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>
    <!-- 序号、设备名称、时间、购买人、事项内容、存放地点、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="equipmentList"  :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="equipmentList"  :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="120"/>
      <el-table-column label="设备名称" prop="name" sortable width="150" />
@@ -477,7 +453,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" border :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-column type="selection" :reserve-selection="true" width="55"  align="center" /> -->
            <!-- <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
            <el-table-column label="设备名称" prop="name" sortable width="150" />
@@ -616,7 +592,7 @@
      single1: true,
      multiple1: true,
      dateRange1: [],
      valueFromParent: '家庭设备',
      userId: undefined,
      // 遮罩层
@@ -650,7 +626,7 @@
      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'],
      fileList:[
      ],
ruoyi-ui/src/views/device/memo.vue
@@ -4,7 +4,7 @@
    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
    <el-table v-loading="loading" border :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
ruoyi-ui/src/views/doctor/index.vue
@@ -132,54 +132,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>
    </div>
    <el-table v-loading="loading" :data="doctorList" :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="doctorList" :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" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="类别" prop="type" sortable :show-overflow-tooltip="true" width="80" align="center">
@@ -618,6 +593,7 @@
      title2: "",
      loading1: false,
      loading2: false,
      valueFromParent: '家庭小医生',
      // 查询参数1
      queryParams1: {
        pageNum: 1,
@@ -668,7 +644,8 @@
      // 数据范围选项
      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'],
      fileList:[],
      fileList1:[],
            uploadFileList: [],
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>
    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
    <!-- 这里有个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"/>
@@ -608,10 +583,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'],
      fileList:[
      ],
ruoyi-ui/src/views/genealogy/index.vue
@@ -83,7 +83,7 @@
      </el-row>
    </div>
    <el-table v-loading="loading" :data="listRoot" :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="listRoot" :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" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
      <el-table-column label="身份" prop="identity" sortable width="100" >
@@ -368,8 +368,6 @@
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      this.queryParams.clanId = this.$store.state.user.clanId
      // this.queryParams.pageSize = this.pageSize; // 添加 pageSize 参数
      // this.queryParams.pageNum = this.pageNum; // 添加 pageNum 参数
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listUserAll(this.queryParams).then(response => {
ruoyi-ui/src/views/healthy/index.vue
@@ -126,7 +126,7 @@
        </el-col>
    </el-row>
    <el-table v-loading="loading" :data="healthList"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" border :data="healthList"  @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  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
ruoyi-ui/src/views/honor/index.vue
@@ -113,52 +113,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>
    </div>
    <el-table v-loading="loading" :data="honorList" :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="honorList" :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" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="类别" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
@@ -674,7 +651,7 @@
        name:undefined,
      },
      // searchVal:"",
      valueFromParent: "荣誉证书奖项",
      // 表单参数
      form: {},
      defaultProps: {
ruoyi-ui/src/views/meeting/approve.vue
@@ -62,7 +62,7 @@
    </el-form>
    <el-table v-loading="loading"  :data="meetingList" :row-key="getRowId" ref="multipleTable"
    <el-table v-loading="loading"  border :data="meetingList" :row-key="getRowId" ref="multipleTable"
      @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <!-- <el-table-column type="selection"  :reserve-selection="true" width="55"  align="center" /> -->
ruoyi-ui/src/views/meeting/index.vue
@@ -148,7 +148,7 @@
    </el-row>
      <el-table v-loading="loading"  :data="meetingList" :row-key="getRowId" ref="multipleTable"
      <el-table v-loading="loading"  border :data="meetingList" :row-key="getRowId" ref="multipleTable"
      @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection"  :reserve-selection="true" width="55"  align="center" />
ruoyi-ui/src/views/note/index.vue
@@ -143,52 +143,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>
    <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"/>
@@ -273,7 +249,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>-->
@@ -628,12 +604,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'],
      fileList:[
      ],
ruoyi-ui/src/views/note/memo.vue
@@ -4,7 +4,7 @@
    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
    <el-table v-loading="loading" border :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
ruoyi-ui/src/views/pet/index.vue
@@ -87,54 +87,28 @@
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </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>
    <el-table v-loading="loading" :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
    <el-table v-loading="loading" border :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
@@ -575,7 +549,7 @@
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      valueFromParent: '家庭宠物',
      dialogImageUrl: '',
      dialogVisible: false,
      // 日期范围
ruoyi-ui/src/views/pet/petnote.vue
@@ -60,7 +60,7 @@
        </el-upload>
      </el-col>
    </el-row>
    <el-table v-loading="loading" :data="PetNoteList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 100%;">
    <el-table v-loading="loading" border :data="PetNoteList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 100%;">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="日期" prop="happenTime" sortable width="200px" align="center">
ruoyi-ui/src/views/secret/index.vue
@@ -124,53 +124,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>
      <el-table v-loading="loading" :data="secretList"  :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="secretList"  :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="80"/>
        <el-table-column label="发生时间" prop="happenTime" sortable width="150" align="center">
@@ -610,6 +586,7 @@
        title2: "",
        loading1: false,
        loading2: false,
        valueFromParent: '隐私',
        // 查询参数1
        queryParams1: {
          pageNum: 1,
ruoyi-ui/src/views/secret/memo.vue
@@ -4,7 +4,7 @@
    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
    <el-table v-loading="loading" border :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
ruoyi-ui/src/views/self/show.vue
@@ -220,7 +220,7 @@
      </el-row>
    </div>
    <el-table v-loading="loading" :data="noteList" :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="noteList" :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" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
@@ -503,7 +503,7 @@
            </div>
          </div>
        </template>
        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <el-table v-loading="loading" border :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="开始日期" prop="startDate" sortable width="250" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
@@ -557,7 +557,7 @@
            </div>
          </div>
        </template>
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
        <el-table v-loading="loading" border :data="relationList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="与本人关系"  prop="relation" sortable width="260" align="center" >
            <template slot-scope="scope">
@@ -610,7 +610,7 @@
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
        <el-table v-loading="loading" border :data="certificateList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="证件名称" prop="cerName" sortable width="230" align="center" >
            <template slot-scope="scope">
@@ -675,7 +675,7 @@
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
        <el-table v-loading="loading" border :data="AbroadList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="开始时间" prop="startTime"  sortable width="200" align="center">
            <template slot-scope="scope">
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -132,53 +132,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>
      </div>
      <el-table v-loading="loading" :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 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-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">
@@ -671,6 +647,7 @@
        wishList: [],
        // 弹出层标题
        title: "",
        valueFromParent: "财产",
        // 是否显示弹出层
        open: false,
        // 是否显示弹出层(数据权限)
@@ -684,7 +661,7 @@
        // 数据范围选项
    // 数据范围选项
    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'],
        fileList:[
        ],
ruoyi-ui/src/views/selfeconomy/memo.vue
@@ -4,7 +4,7 @@
    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
    <el-table v-loading="loading" border :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
ruoyi-ui/src/views/system/family/index.vue
@@ -268,6 +268,7 @@
    },
    getAllUser(){
      let clanId = this.$store.state.user.clanId
      getAllInfo(clanId).then(response=>{
        let fams = response.data
        let _this = this;
@@ -288,6 +289,7 @@
      this.loading = true;
      let clanId = this.$store.state.user.clanId
    //  alert(clanId)
    //alert(clanId)
      this.queryParams.clanId = clanId; 
      listFamily(this.queryParams).then(response => {
          console.log(response)
ruoyi-ui/src/views/travel/Info.vue
@@ -89,7 +89,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="travelBase"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" border :data="travelBase"  @selection-change="handleSelectionChange" @row-click="handleCheck" :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  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
ruoyi-ui/src/views/travel/index.vue
@@ -83,56 +83,31 @@
        >删除</el-button>
      </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>
    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" border :data="travelpriceList" @row-click="getRowId" @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 type="expand" :cell-class-name="expandRowClassName">
        <template slot-scope="props">
@@ -273,7 +248,7 @@
    <div style="background-color: #FEF7FC;">
      <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
      <el-dialog :title="title"  :visible.sync="openDataScope" width="1300px" append-to-body >
        <div style="background-color: #FEF7FC;">
          <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
            <el-table-column type="selection" width="50"  align="center" />
@@ -327,7 +302,7 @@
<!--     新增旅游经历-->
    <el-dialog :title="title" :visible.sync="dialog1Visible" width="800px" append-to-body>
    <el-dialog :title="title" border :visible.sync="dialog1Visible" width="800px" append-to-body>
      <el-form ref="elForm2" :model="formDat4" :rules="rules2" size="medium" label-width="100px">
        <el-form-item label="标题" prop="name">
@@ -603,7 +578,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" border :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-column type="expand" :cell-class-name="expandRowClassName">
                    <template slot-scope="props">
@@ -838,10 +813,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'],
      fileList:[
      ],
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">
@@ -675,10 +651,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'],
      fileList:[],
      fileList1:[],