修改了对应bug

feige

2025-03-18 63508b6027085a696298a1c26c74c704ef13b5a7

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

@@ -139,23 +139,23 @@
             <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-dropdown>



               <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
            

        </el-row>
      </div>

      <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 v-loading="loading" border :data="selfeconomyList" :row-key="getRowId1" 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">
          <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
@@ -172,7 +172,7 @@
        <el-table-column label="期限" prop="timeLimit" sortable width="110" align="center">
          <template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '————'}}</template>
        </el-table-column>
        <el-table-column label="变更/注销" prop="isChange" sortable width="140" align="center">
        <el-table-column label="变更/注销/购买" prop="isChange" sortable width="140" align="center">
          <template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '————'}}</template>
        </el-table-column>
        <el-table-column label="产权" prop="propertyRight" sortable width="110" align="center">
@@ -208,10 +208,10 @@
              ></div>
          </template>
        </el-table-column>
        <el-table-column label="备注" prop="remark" sortable width="90" align="center">
        <el-table-column label="备注" prop="remark" sortable 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="220" 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
@@ -262,13 +262,15 @@
      />

      <!-- 添加收藏与荣誉信息配置对话框 -->
      <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-dialog :title="title" :visible.sync="open" width="840px" append-to-body    @click.native="handleDialogClick">
        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="120px">
          <!--        <el-form-item label="获得时间" prop="happenTime">-->
          <!--          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>-->
          <!--        </el-form-item>-->
          <el-form-item label="时间" prop="happenTime">
            <el-date-picker v-model="formDat.happenTime" 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>
@@ -292,8 +294,8 @@
            <el-input v-model="formDat.propertyRight" placeholder="请输入产权" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="变更/注销" prop="isChange">
            <el-select v-model="formDat.isChange" placeholder="请选择变更/注销" clearable :style="{width: '100%'}"  >
          <el-form-item label="变更/注销/购买" prop="isChange">
            <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="请选择变更/注销/购买" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
@@ -303,7 +305,7 @@
            </el-input>
          </el-form-item>
          <el-form-item label="是否注销" prop="status">
            <el-select v-model="formDat.status" placeholder="请选择是否依旧有效" clearable :style="{width: '100%'}"  >
            <el-select ref="multiSelect1" v-model="formDat.status" 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>
@@ -335,10 +337,9 @@
                :preview-src-list="[file.url]"
              >
              <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
              <span
                class="el-upload-list__item-preview"
                @click="handlePictureCardPreview(file)">
            <i class="el-icon-zoom-in"></i>
          </span>

@@ -446,7 +447,7 @@
      <!-- 分享对话框1 -->
      <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

      <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 v-loading="loading1" :data="listRoot" :row-key="getRowId2" 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" >
@@ -481,7 +482,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" :data="shareList1" :row-key="getRowId3" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
                <el-table-column label="日期" prop="happenTime" sortable width="100" align="center">
                  <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
                </el-table-column>
@@ -497,7 +498,7 @@
                <el-table-column label="期限" prop="timeLimit" sortable width="110" align="center">
                  <template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '————'}}</template>
                </el-table-column>
                <el-table-column label="变更/注销" prop="isChange" sortable width="140" align="center">
                <el-table-column label="变更/注销/购买" prop="isChange" sortable width="140" align="center">
                  <template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '————'}}</template>
                </el-table-column>
                <el-table-column label="产权" prop="propertyRight" sortable width="110" align="center">
@@ -580,22 +581,25 @@
  <script>
  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 {getInfo} from "@/api/login";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";

  //导入接口函数
  import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
          share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
  } from "@/api/selfeconomy/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
  import {listUserAll} from "@/api/root/index";
  import { Notification, MessageBox, Message, Loading } from 'element-ui'


  export default {
    name: "index",
    name: "ZProperty",
    dicts: ['sys_normal_disable'],
    data() {
      return {
        selfeconomyList:[],
        total1: 0,
        // 分享给谁的list
        listRoot: [],
        open1:false,
@@ -626,6 +630,7 @@
        multiple1: true,
        dateRange1: [],

        selfeconomyList: [],

        userId: undefined,
        // 遮罩层
@@ -643,6 +648,7 @@
        showSearch: true,
        // 总条数
        total: 0,
        total1: 0,
        // 百年心愿表格数据
        wishList: [],
        // 弹出层标题
@@ -660,8 +666,8 @@
        dateRange: [],
        // 数据范围选项
    // 数据范围选项
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx','HEIC',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

        fileList:[
        ],
@@ -731,7 +737,7 @@
          }],
          isChange: [{
            required: true,
            message: '请输入变更/注销',
            message: '请输入变更/注销/购买',
            trigger: 'blur'
          }],
          price: [{
@@ -790,15 +796,24 @@
      };
    },
    created() {
      this.getList1()
      this.getList1();
      this.getList();
      this.getCateInfor()
      this.getInfo()

      //this.getCateInfor();
      this.getInfo();

      // for (let i = 0; i < this.contactList.length; i++) {
      //   this.formDat[i] = this.contactList[i];
      // }
    },
    methods: {
      handleDialogClick()
      {
         // 关闭日期选择器
         this.$refs.multiSelect.blur()
         this.$refs.multiSelect1.blur()
               this.$refs.datePicker.handleClose();
      },
      // 分页
      fenYe(){
        // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -920,34 +935,43 @@
        // this.single1 = selection.length!=1
        // this.multiple1 = !selection.length
      },
      getRowId1(row)
      {
        return row.id
      },
      getRowId2(row)
      {
        return row.id
      },
      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, 2026).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) {
@@ -960,6 +984,7 @@
        }).then(() => {

          this.getList();
        this.getList1();
          this.$modal.msgSuccess("分享成功");
          this.id1 = undefined
          this.open1 = false;
@@ -988,7 +1013,15 @@
        this.open = false;
        this.reset();
      },
      getRowId(row)
      getRowId1(row)
      {
        return row.id
      },
      getRowId2(row)
      {
        return row.id
      },
      getRowId3(row)
      {
        return row.id
      },
@@ -1101,13 +1134,14 @@

      /** 新增按钮操作 */
      handleAdd() {
        this.reset();
    //    this.reset();
        this.open = true;
        this.title = "新增个人财产详细信息";
      },
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
      this.open2 = false;
        this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
      },
      /** 修改按钮操作 */
@@ -1143,22 +1177,26 @@

            addSelfEconomy(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
             // this.open = false;
          // 清空formDat对象的数据
          Object.keys(this.formDat).forEach(key => {
            this.formDat[key] = '';
          });
          var fl = this.fileList.length
          for(let i = 0; i < fl; i++)
          {
            this.handleRemove(this.fileList[0]);
          }
          var gh = this.fileListOther.length
          for(let i = 0; i < gh; i++){
            this.handleRemoveFile(this.fileListOther[0]);
          }
         // alert(123)
              this.getList();
            });
          }
        });
        // 清空formDat对象的数据
        Object.keys(this.formDat).forEach(key => {
          this.formDat[key] = '';
        });
        for(let i = 0; i <= this.fileList.length; i++)
        {
          this.handleRemove(this.fileList[0]);
        }
        for(let i = 0; i < this.fileListOther.length; i++){
          this.handleRemoveFile(this.fileListOther[0]);
        }
      
      },
    handleChange(file, fileList1) {
          //定义一个全局数组uploadFileList来做存储