修改了对应的bug

feige

2024-11-16 2697e109da871cb81936965c16c47c97635ecfb6

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

@@ -1,22 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
        <el-input
          v-model:phone="queryParams.phone"
          v-model:wx="queryParams.wx"
          v-model:qq="queryParams.qq"
          v-model:twitter="queryParams.twitter"
          v-model:isAlways="queryParams.isAlways"
          v-model:remark="queryParams.remark"
          placeholder="在“张氏一览表”中搜索"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
        <!--        v-model="queryParams.id"-->
      </el-form-item>

      <el-form-item label="身份" prop="identity" >
        <el-select
@@ -48,26 +32,32 @@
      </el-form-item>

      <el-form-item label="性别" prop="sex">
        <el-input
          v-model="queryParams.sex"
          placeholder="请输入性别"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable
                   style="width: 240px" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOption"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>
      <el-form-item label="生日" prop="birth">
        <el-input
          v-model="queryParams.birth"
          placeholder="请输入生日"
          clearable
          style="width: 240px"

      <el-form-item label="生日" prop="birth deadDay">
        <el-date-picker
          v-model="dateRange"
          style="width:  240px;
          height: 30px;
          background: #FFFFFF;
          border-radius: 14px 14px 14px 14px;
          opacity: 0.5;
          border: 1px solid rgba(0,0,0,0.25);"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @keyup.enter.native="handleQuery"
        >
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
        ></el-date-picker>

      </el-form-item>

      <el-form-item>
        <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
@@ -77,48 +67,7 @@
      </el-form-item>
    </el-form>
    <div>
<!--      <div style="width: 149px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">张氏一览表</div>-->

      <el-row :gutter="10" class="mb8">
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="primary"-->
<!--            plain-->
<!--            icon="el-icon-plus"-->
<!--            size="mini"-->
<!--            @click="handleAdd"-->
<!--            v-hasPermi="['system:role:add']"-->
<!--          >新增</el-button>-->
<!--        </el-col>-->

<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="danger"-->
<!--            plain-->
<!--            icon="el-icon-delete"-->
<!--            size="mini"-->
<!--            :disabled="multiple"-->
<!--            @click="handleDelete"-->
<!--            v-hasPermi="['system:role:remove']"-->
<!--          >删除</el-button>-->
<!--        </el-col>-->
        <el-col :span="1.5">
          <el-button
            type="warning"
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExport"
            v-hasPermi="['family:note:export']"
          >导出</el-button>
        </el-col>
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="warning"-->
@@ -127,41 +76,33 @@
<!--            size="mini"-->
<!--            @click="handleExport"-->
<!--            v-hasPermi="['family:note:export']"-->
<!--          >导入模板下载</el-button>-->
<!--        </el-col>-->
<!--        <el-col :span="1.2">-->

<!--          <el-upload-->
<!--            action=""-->
<!--            class="upload-demo"-->
<!--            :show-file-list="false"-->
<!--            :http-request="handleEnport"-->
<!--          >-->
<!--            <el-button size="mini"   type="primary"-->
<!--                       plain-->
<!--                       icon="el-icon-plus" >导入</el-button>-->
<!--          </el-upload>-->
<!--          >导出</el-button>-->
<!--        </el-col>-->

        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>

    <el-table v-loading="loading" :data="listRoot"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" width="25"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

    <el-table v-loading="loading" border :data="listRoot" :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :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="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
      <el-table-column label="身份" prop="identity" sortable width="100" >
        <template slot-scope="scope">
          <span>第{{scope.row.identity}}代</span>
        <template slot-scope="scope" >
          <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
          <span v-else>——</span>
        </template>
<!--        <template slot-scope="scope">{{ getSrc(scope.row.identity) }}</template>-->
      </el-table-column>
      <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
      <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center">
          <template slot-scope="scope" >
				
         <el-button @click="handleCheck(scope.row)">{{scope.row.nickName}}</el-button>
               </template>
            </el-table-column> 
		  
      <el-table-column label="性别" prop="sex" sortable width="100" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.sex===1">男</span>
          <span v-if="scope.row.sex===0">女</span>
          <span v-if="scope.row.sex===0">男</span>
          <span v-if="scope.row.sex===1">女</span>
          <span v-if="scope.row.sex== null">——</span>
        </template>
      </el-table-column>
@@ -184,22 +125,23 @@
        <template slot-scope="scope">{{scope.row.spouseName? scope.row.spouseName: '————'}}</template>
      </el-table-column>

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


<el-button
        <el-button
             size="mini"
              type="text"
             icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)">
查看详情</el-button>
          查看详情
        </el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total"
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
@@ -207,115 +149,9 @@
      @pagination="getList"
    />

  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>

  <!--  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="成员姓名" prop="myName">
          <el-input v-model="formDat.myName" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="称呼" prop="nickName">
          <el-input v-model="formDat.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="姓名" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="工作单位" prop="work">
          <el-input v-model="formDat.work" placeholder="请输入工作单位" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="手机" prop="phone">
          <el-input v-model="formDat.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="微信" prop="wx">
          <el-input v-model="formDat.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="QQ" prop="qq">
          <el-input v-model="formDat.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="twitter" prop="twitter">
          <el-input v-model="formDat.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="是否常联系" prop="isAlways">
          <el-input v-model="formDat.isAlways" placeholder="是否常联系" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="备注（是否存在金钱关系）" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <h4 class="form-header">电子名片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 126px; height: 126px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
        <span
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>

        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


          </div>
        </el-upload>
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>

      </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>  -->
    </el-dialog>

    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>

@@ -333,6 +169,8 @@
//导入接口函数
import {enload, uploadPic} from "@/api/contacts/index";
import {getRoot,listUserAll} from "@/api/root/index";


export default {
  name: "index",
  dicts: ['sys_normal_disable'],
@@ -351,7 +189,8 @@
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      pageSize: 10, // 每页显示数据条数
      pageNum: 1, // 当前页码      // 总条数
      total: 0,
      // 家谱表格数据
      listRoot: [],
@@ -369,15 +208,12 @@
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],

      uploading: false,
      formDat: {
        //张氏一览表
        userid:undefined,
@@ -409,6 +245,7 @@
        secondFamilyId:undefined,
        childList:undefined,
        identity:undefined,
        isMyFamily:undefined,
        url: undefined,

      },
@@ -424,6 +261,7 @@
        nickName:undefined,
        sex:undefined,
        birth:undefined,
      clanId: undefined
      },
      // searchVal:"",

@@ -463,6 +301,14 @@
        }],

      },
      typeOption: [{
        value: '0',
        label: '男',
      },
        {
          value: '1',
          label: '女',
        }],
      typeOptions: [{
        value:'1',
        label:'第1代'
@@ -480,10 +326,6 @@
  },
  created() {
    this.getList();
    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
  },
  methods: {
    // 取消按钮
@@ -492,30 +334,30 @@
      this.reset();
    },
     //拿到配偶的姓名
   //   getPerson(id)
   //   {
   //   //  alert(id)
   // //    alert(typeof(id))
   //     // this.listRoot.forEach(function(item, index) {
   //     //             //item 就是当日按循环到的对象
   //     //             //index是循环的索引，从0开始
   //     //              //alert(typeof(item.userId))
   //     //             if(item.userId==id){
   //     //            //   alert(89)
   //     //            alert(item.nickName)
   //     //               return item.nickName
   //     //             }
   //
   //     // })
   //     let username = ""
   //     for(let i = 0; i < this.listRoot.length;i++)
   //     {
   //       if(this.listRoot[i].userId==id)
   //        username = this.listRoot[i].nickName
   //     }
   //     return username;
   //    // return "12ddd"
   //   },
     getPerson(id)
     {
     //  alert(id)
   //    alert(typeof(id))
       // this.listRoot.forEach(function(item, index) {
       //             //item 就是当日按循环到的对象
       //             //index是循环的索引，从0开始
       //              //alert(typeof(item.userId))
       //             if(item.userId==id){
       //            //   alert(89)
       //            alert(item.nickName)
       //               return item.nickName
       //             }

       // })
       let username = ""
       for(let i = 0; i < this.listRoot.length;i++)
       {
         if(this.listRoot[i].userId==id)
          username = this.listRoot[i].nickName
       }
       return username;
      // return "12ddd"
     },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -524,36 +366,30 @@
        return "statistics-warning-row";
      }
    },

    /** 查询通讯录列表 */
    /** 查询家谱列表 */
    getList() {
      this.loading = true;
     //  console.log(this.queryParams)
      //alert(23)

      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
     this.queryParams.clanId = this.$store.state.user.clanId
      this.listRoot = []
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listUserAll(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
       //   alert(76)
          this.listRoot = response.data.data;
        //  alert(this.listRoot)
          this.total = response.data.length;
       //   alert(this.total)
          this.total = response.data.total;
          // this.pageNum=1;
          // this.pageSize=10;
        // this.pageNum = response.data.pageNum;
          this.loading = false;
        }
      );
    },
    /** 查询类别信息 */
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    handlePageChange(currentPage) {
      this.pageNum = currentPage; // 根据 currentPage 计算出 pageNum 值
      this.getList();
    },
    //身份选择
    getSrc(identity) {
@@ -569,10 +405,11 @@
        return '其它'
      }
    },

    handleRemove(file) {
      alert(323)
    getRowId(row)
    {
      return row.id
    },

    // 取消按钮
    cancel() {
      this.open = false;
@@ -581,7 +418,6 @@
    // 取消按钮（数据权限）
    cancelDataScope() {
      this.openDataScope = false;
      this.reset();
    },
    // 表单重置
    reset() {
@@ -604,7 +440,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -641,65 +477,12 @@
     this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
    },


    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addContact(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      });
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })

    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
        return delContact(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    // handleExport() {
    //   this.download('/self/user/export/genealogy', {
@@ -716,33 +499,17 @@
          ...this.queryParams
        }, `zGenealogy_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/self/user/export/genealogy/'+Ids, {
        this.download('/self/user/export/genealogy1/'+Ids, {

        }, `zGenealogy_${new Date().getTime()}.xlsx`)
      }
    },

    /** 导入操作*/
    // handleEnport(params){
    //   var file = params.file;
    //   var formData = new FormData();
    //   formData.append('excelImport', file);
    //   let _this = this
    //   enload(formData).then(response => {
    //     _this.getList();
    //     Message({ message: "导入成功", type: 'warning' })
    //
    //   }).catch(err)
    //   {
    //     Message({ message: "导入失败", type: 'error' })
    //   }
    //
    // }
  }
};
</script>

<style >
<style scoped>
.app-container{
  background-color: #FEF7FC;
}