修改了bug

feige

2024-10-24 078ed511426cc99f030bb14004a657bd28c0d899

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

@@ -155,7 +155,7 @@
<!--              <el-table-column label="备注" prop="remark" sortable width="100" />-->


              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
              <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                  <el-button
                    size="mini"
@@ -204,7 +204,7 @@



      <el-table-column  label="操作" align="center" sortable width="250" v-if="userId != 2">
      <el-table-column  fixed="right" label="操作" align="center" sortable width="250" v-if="userId != 2">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
@@ -264,7 +264,7 @@
            <el-table-column label="门票" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="购物" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />

            <el-table-column label="操作" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
            <el-table-column fixed="right" label="操作" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
              <template slot-scope="scope" v-if="scope.row.roleId !== 1">

                <el-button
@@ -546,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>

@@ -735,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 {
@@ -1155,26 +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]
             this.queryParams.clanId = this.$store.state.user.clanId
          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) {
@@ -1187,6 +1203,7 @@
      }).then(() => {

        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -1256,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;
          });
@@ -1424,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);
    },
    /** 修改按钮操作 */