修改了bug和用户管理配偶显示问题

yz3456

2024-07-11 bf4cb195c34e79dae5576b21a215118b7ef1357f

修改了bug和用户管理配偶显示问题

 ruoyi-ui/src/components/comp-room.vue

@@ -77,8 +77,9 @@

      <!-- 本地流区域 -->
      <div v-if="localStream" class="local-stream-container">
        <!-- <div style="background-color: red; width: 20px;height: 20px">123123</div> -->
        <!-- 本地流播放区域 -->
        <div id="localStream" class="local-stream-content"></div>
        <!-- <div id="localStream" class="local-stream-content"></div> -->
        <!-- 本地流操作栏 -->
        <div v-if="isPlayingLocalStream" class="local-stream-control">
          <div class="video-control control">
@@ -103,6 +104,7 @@

    <!-- 远端流区域 -->
    <div class="remote-container">
      <!-- <div style="background-color: red; width: 20px;height: 20px">456456</div> -->
      <div
        v-for="(item) in remoteStreamList"
        :key="item.getUserId()"

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

@@ -208,9 +208,7 @@
      </el-table-column>

      <el-table-column label="状态" prop="statu" sortable align="center">
        <!-- <template slot-scope="scope">{{scope.row.statu===1? '同意': '拒绝'}}</template> -->
        <template slot-scope="scope">{{scope.row.statu ===3 ? '待审批' : (scope.row.statu===1? '同意': '拒绝')}}</template>
        <!-- scope.row.statu ==='待审批' ? '待审批' : (scope.row.statu===1? '同意': '拒绝') -->
        <template slot-scope="scope">{{scope.row.statu===1? '同意': (scope.row.statu ===0 ? '拒绝' : '待审批')}}</template>
      </el-table-column>

      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">

 ruoyi-ui/src/views/meeting/meetingInfo.vue

@@ -123,7 +123,7 @@
            <el-cow>
              <el-form-item label="状态" prop="statu" label-width="120px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.statu" placeholder="请选择 " clearable :style="{width: '100%'}"
                <el-select v-model="formData.statu" placeholder="" clearable :style="{width: '100%'}"
                  :disabled="true">
                  <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label"
                    :value="item.value"></el-option>
@@ -314,6 +314,10 @@
        getMeetingInfo(id).then((response) => {
          console.log(response.data,'123123123')
          this.formData = response.data;
          if(this.formData.statu == undefined){
            this.formData.statu = 3
            // alert(this.formData.statu)
          }
          // let paths = this.formData.url.split(",");
       //    for(let i = 0; i < paths.length; i++)
       //    {

 ruoyi-ui/src/views/meeting/webcast.vue

@@ -113,6 +113,11 @@
          </el-input>
        </el-form-item>

        <el-form-item label="最多人数" prop="maxPerson">
          <el-input v-model="formDat.maxPerson" placeholder="请输入最多人数" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>

        <el-form-item label="会议标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
          </el-input>
@@ -205,7 +210,8 @@
          contactPerson: undefined,
          contactPhone: undefined,
          createTime: undefined,
          roomId:undefined
          roomId:undefined,
          maxPerson:undefined
        },

      }

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

@@ -584,13 +584,18 @@
            label: '否',
          }],
        typeOptions1: [{
          value: '变更',
          label: '变更',
        },
            value: '变更',
            label: '变更',
          },
          {
            value: '注销',
            label: '注销',
          }],
          },
          {
            value: '购买',
            label: '购买',
          },
          ],
      };
    },
    created() {

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

@@ -346,10 +346,15 @@
        value: '变更',
        label: '变更',
      },
        {
          value: '注销',
          label: '注销',
        }],
      {
        value: '注销',
        label: '注销',
      },
      {
        value: '购买',
        label: '购买',
      },
      ],
    }
  },
  computed: {},

 ruoyi-ui/src/views/system/user/index.vue

@@ -297,8 +297,8 @@
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo2"
                  :key="item.userId"
                  v-for="(item, index) in allInfo2"
                  :key="index"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
@@ -548,14 +548,14 @@
      if(this.a == 1){
        addPO(this.sex).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
          }
          console.log(this.allInfo2,'新增a=1新增a=1新增a=1')
        })
      }else{
        updatePO(tpfid,this.sex).then(response =>{
          for(let i in response.data[0]){
            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
          }
          console.log(this.allInfo2,'修改a=2修改a=2修改a=2')
        })
@@ -823,10 +823,11 @@
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data,'formformformformform')
        console.log(this.form.spouseId,'伴侣id')
        // console.log(response.data)
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        console.log(this.roleOptions)
        // console.log(this.roleOptions)
        // this.$set(this.form, "postIds", response.postIds);
        // this.$set(this.form, "roleIds", response.roleIds);
       // alert(response.roleIds.length)
@@ -837,7 +838,7 @@
     getIndividual(userId).then(response => {
           //  alert(123)
           // console.log('++++++++-----0000((((((9999))))))')
     //          console.log(response.data)
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
            {

@@ -913,7 +914,7 @@
          fm.sysId = this.form.userId
          fm.userName = this.form.userName
      fm.remark = this.form.remark
      alert(fm.remark)
      // alert(fm.remark)

          console.log(fm)
          if (valid) {