修改bug

feige

2024-10-13 3119fa3f7f7a1791d918d77d3e8315d762719ab7

 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">
@@ -571,12 +546,12 @@
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
          <el-table-column label="身份" prop="identity" sortable width="130" >
     <!--     <el-table-column label="身份" prop="identity" sortable width="130" >
            <template slot-scope="scope" >
              <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
              <span v-else>——</span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>

@@ -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">
@@ -760,13 +735,15 @@
  shareToWho2,getWhoShare2,showShareData2

} from "@/api/travel/index";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {getSelfEconomyInfo} from "@/api/selfeconomy";
import {delFamilyevent, listFamilyevent} from "@/api/bignote";

export default {
  name: "Role",
  name: "Ztravel",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -838,10 +815,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:[
      ],
@@ -1179,25 +1157,40 @@
      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, 2055).then(response=>{
              console.log("===========ddddddddddddd")
              console.log(response.data)
              console.log("--------------------")
              response.data.forEach(element =>{
                  this.userOptions.push({label: element.oldName,value: element.userId})
              })
           })
		   
		   
		   
         let clanId = this.$store.state.user.clanId
		   
          getAllInfo(clanId).then(response => {
              this.listRoot = response.data;
              const kon = {}
                           console.log(response.data,'userListuserListuserList99999999999999')
              this.listRoot.forEach(element => {
                kon[element['nickName']] = element['userId']
              })
              // for(let i in kon){
              //   this.userOptions.push({label: i,value: kon[i]})
              // }
              // for(let i in this.userOptions){
              //   this.userList.push(this.userOptions[i].value)
              // }
              // console.log(this.userList,'userListuserListuserList99999999999999')
              this.loading1 = false;
            }
          );
        },
    // 确认分享
    subShare(row) {
@@ -1210,6 +1203,7 @@
      }).then(() => {

        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -1279,7 +1273,7 @@
        // 将所有请求存储起来
        const promises = [];
        for (const item of this.travelpriceList) {
          const promise = listTravelBase({ cid: item.id }).then(result => {
          const promise = listTravelBase(item.id).then(result => {
           console.log(result.data)
            travelBaseMap[item.id] = result.data;
          });
@@ -1447,12 +1441,14 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false; 
      // alert(id)
      //  alert(row.fee_id)
      this.$router.push("/self/travel/Info/" + id);
    },
    handleCheck1(row){
      const id = row.id;
    // alert(id)
      this.$router.push("/self/travel/travelInfo/" + id);
    },
    /** 修改按钮操作 */