Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2025-03-03 90b6b8c9e342d07e8a7121d732900287d997a8b6

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

@@ -74,7 +74,7 @@

      <div>

        <el-row :gutter="10" class="mb8">
        <el-row :gutter="10" class="mb8" v-if="userId != 2">
          <el-col :span="1.5">
            <el-button
              type="primary"
@@ -131,12 +131,31 @@
                         icon="el-icon-top" >导入</el-button>
            </el-upload>
          </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-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>
@@ -153,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">
@@ -189,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">
        <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
@@ -222,6 +241,12 @@
              >查看详情</el-button>

            </el-dropdown>
            <el-button
               size="mini"
                type="text"
               icon="el-icon-d-arrow-right"
                @click="handleShare(scope.row)">
              <span style="font-size: 1em;">分享</span></el-button>
            </div>
          </template>
        </el-table-column>
@@ -237,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>
@@ -267,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>
@@ -278,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>
@@ -310,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>

@@ -418,25 +444,195 @@

      </el-dialog>

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

      <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" >
              <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 label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
          </el-table>

                  <div slot="footer" class="dialog-footer">
                    <el-button type="primary" @click="subShare">分 享</el-button>
                  </div>

      </el-dialog>

      <!-- 分享对话框2 -->
      <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
        <div>
        <el-select v-if="ifNum == 1"
                  v-model="user" id="userSelect"
                  placeholder="请选择分享的对象" clearable
                   style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   margin-bottom: 5px;
                   opacity: 0.5;" filterable allow-create
                   @change="selectValue">
          <el-option v-for="item in userOptions"
            :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
              </div>

        <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>
                <el-table-column label="财产类别" prop="type" sortable width="120" align="center">
                  <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
                </el-table-column>
                <el-table-column label="财产名称" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
                  <template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '————'}}</template>
                </el-table-column>
                <el-table-column label="价值（金额）" prop="price" sortable width="140" align="center" >
                  <template slot-scope="scope">{{scope.row.price? scope.row.price: '————'}}</template>
                </el-table-column>
                <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">
                  <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">
                  <template slot-scope="scope">{{scope.row.propertyRight? scope.row.propertyRight: '————'}}</template>
                </el-table-column>
                <el-table-column label="存放位置" prop="location" sortable width="110" align="center">
                  <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
                </el-table-column>
                <el-table-column label="是否注销" prop="status" sortable width="100" align="center">
                    <template slot-scope="scope">{{scope.row.status===1? '是': '否'}}</template>
                </el-table-column>
                <el-table-column label="电子文件" prop="url" width="160" align="center">
                     <template slot-scope="scope" >
                       <div>
                         <img
                           class="el-upload-list__item-thumbnail"
                           src="../../assets/images/deviceLis.png"
                           alt=""
                           style="width: 35px; height: 35px;"
                           fit="cover"
                           v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                         >
                         <img
                           v-else
                           class="el-upload-list__item-thumbnail"
                           src="../../assets/images/deviceA.png"
                           alt=""
                           style="width: 35px; height: 35px;"
                           fit="cover"

                         ></div>
                     </template>
                  </el-table-column>
                  <el-table-column label="备注" prop="remark" sortable width="90" align="center">
                    <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
                  </el-table-column>

              <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                  <div class="button-container">
                  <el-button
                    v-if="ifNum == 2"
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleDown(scope.row)">
                    <span style="font-size: 14px;">下载</span></el-button>
                    <el-button
                      v-if="ifNum == 1"
                      size="mini"
                      type="text"
                      icon="el-icon-d-arrow-right"
                      @click="handleBack(scope.row)">
                      <span style="font-size: 14px;">收回</span></el-button>
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleCheck(scope.row)">
                    <span style="font-size: 14px;">查看详情</span></el-button>
                  </div>
                </template>
              </el-table-column>
            </el-table>

            <pagination
              v-show="total1>0"
              :total="total1"
              :page.sync="queryParams2.pageNo"
              :limit.sync="queryParams2.pageSize"
              @pagination='fenYe'
              style="background: #FEF7FC;"
            />

      </el-dialog>

    </div>
  </template>

  <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 {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";

  //导入接口函数
  import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
  import {Message} from "element-ui";
  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'


  export default {
    name: "index",
    name: "ZProperty",
    dicts: ['sys_normal_disable'],
    data() {
      return {
        selfeconomyList:[],
        total1: 0,
        // 分享给谁的list
        listRoot: [],
        open1:false,
        open2:false,
        id1: undefined,
        shareList1: [],
        // shareList2: [],
        userOptions:[],
        user:undefined,
        userList:[],
        ifNum:undefined,
        selectWho:undefined,
        title1: "",
        title2: "",
        loading1: false,
        loading2: false,
        // 查询参数1
        queryParams1: {
          pageNum: 1,
          pageSize: 10,
        },
        queryParams2: {
          pageNo: 1,
          pageSize: 10,
        },
        ids1: [],
        single1: true,
        multiple1: true,
        dateRange1: [],

        selfeconomyList: [],

        userId: undefined,
        // 遮罩层
        disabled: false,

@@ -452,10 +648,12 @@
        showSearch: true,
        // 总条数
        total: 0,
        total1: 0,
        // 百年心愿表格数据
        wishList: [],
        // 弹出层标题
        title: "",
      valueFromParent: "财产",
        // 是否显示弹出层
        open: false,
        // 是否显示弹出层（数据权限）
@@ -469,7 +667,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','.M4A'],

        fileList:[
        ],
@@ -539,7 +737,7 @@
          }],
          isChange: [{
            required: true,
            message: '请输入变更/注销',
            message: '请输入变更/注销/购买',
            trigger: 'blur'
          }],
          price: [{
@@ -583,23 +781,224 @@
            label: '否',
          }],
        typeOptions1: [{
          value: '变更',
          label: '变更',
        },
            value: '变更',
            label: '变更',
          },
          {
            value: '注销',
            label: '注销',
          }],
          },
          {
            value: '购买',
            label: '购买',
          },
          ],
      };
    },
    created() {
      this.getList1();
      this.getList();
      this.getCateInfor()

      //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)'
        if(this.ifNum === 1){
          this.selectValue(this.selectWho)
        }else if(this.ifNum === 2){
          this.whoShare()
        }else{
          this.showData()
        }
      },
      // 关闭弹窗后
      handleClose(){
        this.user = ''
        this.queryParams2.pageNo = 1
              this.total1 = 0
      },
      handleClose2(){
        this.$refs.table1.clearSelection()
      },

      // 下载他人给我分享的数据
      handleDown(row){
        const a = {"downloadContent" : row.id}
        downShareData(a).then(() => {
          Message({ message: "下载成功", type: 'success' })
        })
      },

      // 收回分享给别人的数据
      handleBack(row){
        // 分享给谁的：this.selectWho
        const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
        deleteShareData(list).then(()=>{
          Message({ message: "收回成功", type: 'success' })

          const list2 = {"shareIds": [this.selectWho]}
          shareToWho(list2,this.queryParams2).then(response => {
            this.shareList1 = response.data.data
            this.total1 = response.data.total;
          })
        })
      },
      // 展示下载的分享数据
      showData(){
        this.shareList1 = []
        this.ifNum = 3
        this.open2 = true
        this.title2 = "下载的分享数据";
        showShareData(this.queryParams2).then(response => {
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
          // console.log(response,'展示下载的分享数据展示下载的分享数据')
        })
      },
      // 展示分享给我的数据
      whoShare(){
        this.shareList1 = []
        this.ifNum = 2
        this.open2 = true
        this.title2 = "分享给我的数据";
        // const list = {"shareId": this.userList}
        // const list = {"shareId": 111}
        getWhoShare(this.queryParams2).then(response => {
          const data = response.data.data
          this.total1 = response.data.total
          console.log(response,'展示分享给我的数据展示分享给我的数据s')
          for(let i in data){
            console.log(i,'展示分享给我的数据展示分享给我的数据')
            this.shareList1.push(data[i])
          }
        })
      },

      // 分享给谁了什么数据
      selectValue(value){
        this.selectWho = value
        this.shareList1 = []
        const list = {"shareIds": [this.selectWho]}
        shareToWho(list,this.queryParams2).then(response => {
          // this.loading2 = true;
          response.data.data.forEach(res=>{
            if(res){
              this.shareList1.push(res)
            }
          })
          // this.shareList1 = response.data.data
          this.total1 = response.data.total;
          // this.loading2 = false;
          console.log(response.data,'分享给谁了什么数据分享给谁了什么数据')
        })
      },
      handleWho(){
        this.ifNum = 1
        this.open2 = true
        this.title2 = "分享给谁了什么数据";
        this.shareList1 = []
      },

      /** 分享操作 */
      handleShare(row) {
        if(row.id){
          this.id1 = [row.id]
        }
        this.open1 = true;
        this.title1 = "分享";
      },
      // 多选框选中数据
      handleSelectionChange1(selection) {
        this.ids1 = selection.map(item => item.userId)
        this.single1 = selection.length!=1
        this.multiple1 = !selection.length
      },
      // 多选框选中数据
      handleSelectionChange2(selection) {
        // this.ids1 = selection.map(item => item.userId)
        // // console.log(selection)
        // console.log(this.ids1,'ids1ids1ids1ids1')
        // this.single1 = selection.length!=1
        // this.multiple1 = !selection.length
      },
      getList1() {
         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) {
        const shareList = {}
        shareList.shareContents = this.id1 || this.ids;
        shareList.shareIds = this.ids1
        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;
        }).catch(() => {});
      },
      // ------------------------------------------------------------------

      getInfo(){
            console.log('-----------------')
            getInfo().then(response=>{
              console.log(response.user.roles[0].roleId,'roleID')
              this.userId = response.user.roles[0].roleId
            })
          },

    //   getSrc1(status) {
    //     if (status === 1) {
@@ -614,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
      },
@@ -696,7 +1103,7 @@
            deptCheckStrictly: true,
            remark: undefined
          };
        this.resetForm("form");
        this.resetForm("elForm");
      },
      /** 搜索按钮操作 */
      handleQuery() {
@@ -727,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);
      },
      /** 修改按钮操作 */
@@ -769,7 +1177,7 @@

            addSelfEconomy(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
             // this.open = false;
              this.getList();
            });
          }