ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -15,7 +15,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
         

          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -44,7 +44,7 @@
              v-hasPermi="['system:user:edit']"
            >修改</el-button>
          </el-col>
        

     <!--     <el-col :span="1.5">
            <el-button
              type="info"
@@ -77,9 +77,9 @@
          <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" width="120" />
      <el-table-column label="" align="center" key="sex" prop="sex"  width="120" >
            <template slot-scope="scope">{{scope.row.sex==1? '女': '男'}}</template>
            

          </el-table-column>
      

          <el-table-column
           fixed="right" label="操作"
            align="center"
@@ -94,13 +94,13 @@
                @click="handleUpdate(scope.row)"
                v-hasPermi="['system:user:edit']"
              >修改</el-button>
              

              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
          

                </el-dropdown-menu>
              </el-dropdown>
            </template>
@@ -121,27 +121,27 @@
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body @close="handleClose">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
			

            <el-col :span="12" >
              <el-form-item label="选家族号" prop="clanId">
                <el-select v-model="form.clanId"   placeholder="请输入家族名称">
			

            <el-option
              v-for="item in famOptions"
              :key="item.clanId"
              :label="item.clanName"
              :value="item.clanId"
			

            ></el-option>
			

                </el-select>
			

              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="角色" prop="role"  >
                <el-select v-model="form.roleId" placeholder="请选择角色" @change="changeRole">
			

                  <el-option
                    v-for="item in roleOptions"
                    :key="item.roleId"
@@ -152,7 +152,7 @@
                </el-select>
              </el-form-item>
            </el-col>
			

        </el-row>
        <el-row v-if="!isShowAn">
          <el-col :span="12">
@@ -181,7 +181,7 @@
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="祖先">
      <el-form-item label="性别">
        <el-select v-model="form.sex" placeholder="请选择">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
@@ -203,7 +203,7 @@
          </el-form-item>
        </el-col>
  <el-col :span="12">
    <el-form-item label="祖先">
    <el-form-item label="性别">
      <el-select v-model="form.fsex" placeholder="请选择">
        <el-option
          v-for="dict in dict.type.sys_user_sex"
@@ -214,10 +214,10 @@
      </el-select>
    </el-form-item>
  </el-col>
  


        </el-row>
  

      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -328,10 +328,10 @@
        name: undefined,
        role: undefined,
        sex: undefined,
  

      },
      // 列信息
   

      // 表单校验
      rules: {
        userName: [
@@ -400,7 +400,7 @@
        }
        else
        {
            this.isShowAn = true; 
            this.isShowAn = true;
        }
        return;
    },
@@ -411,7 +411,7 @@
            this.famOptions = response.data
        })
    },
    

    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
@@ -465,13 +465,13 @@
    // 取消按钮
    cancel() {
      this.open = false;
  

      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
  

        name: undefined,
        fname: undefined,
        fsex: undefined,
@@ -484,7 +484,7 @@
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
	 

      this.getList();
    },
    /** 重置按钮操作 */
@@ -497,9 +497,9 @@
        name: undefined,
        role: undefined,
        sex: undefined,
	    

      },
      

     // this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
@@ -531,7 +531,7 @@
    //   getUser().then(response => {
    //     this.postOptions = response.posts;
    //     // this.roleOptions = response.roles;
        

          // console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
          // console.log("0-009888")
    //     this.open = true;
@@ -558,9 +558,9 @@
        console.log(response.data,'formformformformform')
     //   console.log(this.form.spouseId,'伴侣id')
        this.postOptions = response.posts;
        this.roleOptions= []
        this.roleOptions.push(response.roles[1])
        this.roleOptions.push(response.roles[3])
        // this.roleOptions= []
        // this.roleOptions.push(response.roles[1])
        // this.roleOptions.push(response.roles[3])
        // this.roleOptions = response.roles;
        console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
        // this.$set(this.form, "postIds", response.postIds);
@@ -626,7 +626,7 @@
    submitForm: function() {
      this.$refs["form"].validate(valid => {

      


        let _this = this
          let fm = {}
@@ -679,8 +679,8 @@
              });
            }
            }
        
       


      });
    },
    /** 删除按钮操作 */

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

@@ -81,9 +81,9 @@
          multiple



          :limit="100"
          ref="upload"
                          :show-file-list="true"
          :show-file-list="true"
          :http-request="requestUpload"
                 :file-list="fileList"
               :on-change="handleChange"
@@ -586,17 +586,20 @@
    //自定义上传方法
        handleChange(file, fileList1) {
           //定义一个全局数组uploadFileList来做存储

console.log(file)
         // this.uploadFileList.push(file.raw);
          console.log("=========5555=========")
          console.log(file.raw)
          this.uploadFileList.push(file.raw);
           this.fileList.push({name:file.name,url:file.url,res:true})
       //  alert(23)
        },
        //自定义上传方法
        handleChange1(file, fileListOther12) {
               //定义一个全局数组uploadFileList来做存储

             // this.uploadFileList.push(file.raw);

             this.uploadFileList1.push(file.raw);
              this.fileListOther.push({name:file.name,url:file.url,res:true})
              console.log("=========5555=========")
@@ -626,6 +629,7 @@
            uploadPic(formData).then(response => {
            _this.uploadFileList1 = []
              _this.formData.url = _this.formData.url+","+response.fileNames

                updateTravelBase(_this.formData).then(response => {
                  this.$modal.msgSuccess("文档上传成功");
                  // this.open = false;
@@ -674,6 +678,9 @@
        //    alert(response.fileNames)
              _this.formData.url = _this.formData.url+","+response.fileNames
            _this.uploadFileList = []
        alert(response.urls)
              alert(_this.formData.url)
              alert(response.fileNames)
             // alert(87)
              updateTravelBase(_this.formData).then(response => {
                _this.$modal.msgSuccess("图片上传成功");
@@ -720,11 +727,11 @@
<style scoped>
    .el-table__row.statistics-warning-row {
      background: #E0EEFE;
	

    }
    .el-table__row.statistics-warning-row1 {
      background: #FFEFF2;
	

    }
.app-container{
  background-color: #FEF7FC;