修改了多个bug

feige

2024-09-22 80e0b09695493b7f811f746dfb7158244088afe3

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

@@ -8,48 +8,14 @@
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="用户名称" prop="userName">
            <el-input
              v-model="queryParams.userName"
              v-model="queryParams.name"
              placeholder="请输入用户名称"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
            <el-input
              v-model="queryParams.phonenumber"
              placeholder="请输入手机号码"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="状态" prop="status">
            <el-select
              v-model="queryParams.status"
              placeholder="用户状态"
              clearable
              style="width: 240px"
            >
              <el-option
                v-for="dict in dict.type.sys_normal_disable"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="dateRange"
              style="width: 240px"
              value-format="yyyy-MM-dd"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            ></el-date-picker>
          </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>
@@ -79,7 +45,7 @@
            >修改</el-button>
          </el-col>
        
          <el-col :span="1.5">
     <!--     <el-col :span="1.5">
            <el-button
              type="info"
              plain
@@ -88,7 +54,7 @@
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          </el-col> -->
          <el-col :span="1.5">
            <el-button
              type="warning"
@@ -157,7 +123,7 @@
      <el-row>
         
         <el-col :span="12" >
           <el-form-item label="家族名称" prop="clanId">
           <el-form-item label="选家族号" prop="clanId">
             <el-select v-model="form.clanId"   placeholder="请输入家族名称">
         
         <el-option
@@ -459,6 +425,7 @@
    /** 查询用户列表 */
    getList() {
      this.loading = true;
     alert(this.queryParams.name)
     //alert(this.queryParams.pageNum)
      listAncestor(this.queryParams).then(response => {
          this.userList = response.data.data;
@@ -529,7 +496,8 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.userId);
      this.ids = selection.map(item => item.id);
     console.log(this.ids+"----------")
      this.single = selection.length != 1;
      this.multiple = !selection.length;
    },
@@ -715,9 +683,17 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('system/user/export', {
  const Ids = this.ids;
alert(Ids)
      if(Ids.length==0)
      {
        this.download('/ZfAncestor/export', {
        ...this.queryParams
      }, `user_${new Date().getTime()}.xlsx`)
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/ZfAncestor/export1/'+Ids, {
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }
    },
    /** 导入按钮操作 */
    handleImport() {