Tcsm
2023-04-07 d173892fe80f02f2779ab0f0fe26ef450bfd79c5
4.7日成长经历个人信息
3个文件已修改
2个文件已添加
949 ■■■■ 已修改文件
ruoyi-ui/src/api/contacts/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/self/index.js 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 571 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/show.vue 248 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/contacts/index.js
New file
@@ -0,0 +1 @@
import request from '@/utils/request'
ruoyi-ui/src/api/self/index.js
@@ -1,7 +1,7 @@
import request from '@/utils/request'
// 查询个人信息
export function getIndividualInfo(id) {
export function getIndividualList() {
  return request({
    url: '/self/user' ,
    method: 'get',
@@ -80,6 +80,113 @@
{
  return request({
    url: '/zExperience' +ids,
    method: 'del',
    method: 'delete',
  })
}
// 查询持有出入境证件情况
export function getCertificateList() {
  return request({
    url: '/zCertificate/all' ,
    method: 'get',
  })
}
//增加持有出入境证件情况
export function addCertificate(data)
{
  return request({
    url: '/zCertificate',
    method: 'post',
    data: data
  })
}
//修改持有出入境证件情况
export function updateCertificate(data) {
  return request({
    url: '/zCertificate',
    method: 'put',
    data: data
  })
}
//删除持有出入境证件情况
export function delCertificate(ids)
{
  return request({
    url: '/zCertificate' +ids,
    method: 'delete',
  })
}
// 查询出国情况
export function getAbroadList() {
  return request({
    url: '/zAbroad/all' ,
    method: 'get',
  })
}
//增加出国情况
export function addAbroad(data)
{
  return request({
    url: '/zAbroad',
    method: 'post',
    data: data
  })
}
//修改出国情况
export function updateAbroad(data) {
  return request({
    url: '/zAbroad',
    method: 'put',
    data: data
  })
}
//删除出国情况
export function delAbroad()
{
  return request({
    url: '/zAbroad/1' ,
    method: 'delete',
  })
}
//查询个人所有自传
export function getAutobiographyList() {
  return request({
    url: '/zAutobiography/all' ,
    method: 'get',
  })
}
//根据不同时期查询个人所有自传
export function getAutobiographyTermList() {
  return request({
    url: '/zAutobiography/byTerm' ,
    method: 'get',
  })
}
//修改个人自传
export function updateAutobiography(data) {
  return request({
    url: '/zAutobiography/',
    method: 'put',
    data: data
  })
}
//新增个人自传
export function addAutobiography(data)
{
  return request({
    url: '/zAutobiography/',
    method: 'post',
    data: data
  })
}
ruoyi-ui/src/router/index.js
@@ -143,6 +143,24 @@
      }
    ]
  },
  //编辑个人信息
  {
    path: '/self/user',
    component: Layout,
    permissions: ['self:self:list'],
    hidden: true,
    children: [
      {
        path: 'edit/:id(\\d+)',
        component: () => import('@/views/self/edit'),
        name: 'edit',
        meta: { title: '编辑'}
      }
    ]
  },
  {
    path: '/system/role-auth',
    component: Layout,
ruoyi-ui/src/views/contacts/index.vue
New file
@@ -0,0 +1,571 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-col  :span="6" >
        <el-input size="medium" v-model="input" placeholder="搜索" clearable>
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-col>
      <el-form-item label="时间" style="padding-left:80px">
          <el-date-picker
            v-model="dateRange"
            style="width: 240px"
            value-format="yyyy-MM-dd HH-MM"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          ></el-date-picker>
      </el-form-item>
      <el-form-item label="类别" prop="type">
          <el-select
            v-model="queryParams.type"
            placeholder="所有类别"
            clearable
            style="width: 240px"
          >
            <el-option
              v-for="dict in typeOptions"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input
          v-model="queryParams.title"
          placeholder="请输入标题"
          clearable
          style="width: 240px"title
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="持有人" prop="holder">
        <el-input
          v-model="queryParams.holder"
          placeholder="请输入持有人"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="存放地址" prop="address">
        <el-input
          v-model="queryParams.address"
          placeholder="请输入具体位置"
          clearable
          style="width: 240px"
          @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>
      </el-form-item>
    </el-form>
    <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>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column label="资产编号" prop="id" sortable width="120" />
      <el-table-column label="类型" prop="type" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存储地址" prop="location" sortable width="100" />
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注信息" prop="remark" sortable width="100" />
      <el-table-column label="创建时间" align="center" sortable prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown
            size="mini"
            @command="(command) => handleCommand(command, scope.row)"
            v-hasPermi="['system:role:edit']">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)"
            >查看详情</el-button>
          </el-dropdown>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <!-- 添加或修改资产信息配置对话框 -->
    <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="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="存储地址" prop="location">
          <el-input v-model="formDat.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input v-model="formDat.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="formDat.address" 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">Click to upload</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 :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
    </el-dialog>
  </div>
</template>
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
//在system/note/index.js中导入接口函数
import {listProperty, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 遮罩层
      disabled: false,
      loading: true,
      formData:[],
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 资产表格数据
      propertyList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示弹出层(数据权限)
      openDataScope: false,
      menuExpand: false,
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[
      ],
      dsb:true,
      btn:false,
      formDat: {
        type: undefined,
        title: undefined,
        location: undefined,
        holder: undefined,
        address: undefined,
        remark: undefined,
        url: undefined,
      },
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        type:undefined,
        title:undefined,
        location:undefined,
        holder:undefined,
        address:undefined,
        createTime:undefined
      },
      // 表单参数
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
      },
      // 表单校验
      rules: {
        type: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
        }],
        location: [{
          required: true,
          message: '请输入存储地址',
          trigger: 'blur'
        }],
        holder: [{
          required: true,
          message: '请输入持有人',
          trigger: 'blur'
        }],
        address: [{
          required: true,
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        remark: [{
          required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],
        createTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],
      },
      typeOptions: [],
    };
  },
  created() {
    this.getList();
    this.getCateInfor()
  },
  methods: {
    // 取消按钮
    cancelData() {
      this.open = false;
      this.reset();
    },
    /** 查询角色列表 */
    getList() {
      this.loading = true;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listProperty(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.propertyList = response.data.data;
          this.total = response.data.total;
          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]})
        })
      })
    },
    handleRemove(file) {
      alert(323)
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 取消按钮(数据权限)
    cancelDataScope() {
      this.openDataScope = false;
      this.reset();
    },
    // 表单重置
    reset() {
      if (this.$refs.menu != undefined) {
        this.$refs.menu.setCheckedKeys([]);
      }
      this.menuExpand = false,
        this.menuNodeAll = false,
        this.deptExpand = true,
        this.deptNodeAll = false,
        this.form = {
          roleId: undefined,
          roleName: undefined,
          roleKey: undefined,
          roleSort: 0,
          status: "0",
          menuIds: [],
          deptIds: [],
          menuCheckStrictly: true,
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      console.log(this.ids)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加资产详细信息";
    },
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/family/note1/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      this.$router.push({
        path:"/family/note1/propertyInfo/" + id,
        query:{
          detail:jd
        }
      });
    },
    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) {
          addProperty(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 delProperty(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('family/property/export', {
        ...this.queryParams
      }, `property_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>
ruoyi-ui/src/views/self/show.vue
@@ -1,11 +1,6 @@
<template>
  <div class="app-container">
    <el-col  :span="6" >
      <el-input size="medium" v-model="input" placeholder="搜索" clearable>
        <i slot="prefix" class="el-input__icon el-icon-search"></i>
      </el-input>
    </el-col>
    <br>
    <h1 style="font-size:21px;padding-top:30px">个人简历</h1>
    <el-divider />
<!--    基本信息-->
@@ -23,10 +18,21 @@
<!--            ></el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
<!--        <el-table-->
<!--           v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"-->
<!--        >-->
<!--          <el-table-column prop="nickName" label="姓名" min-width="5%">-->
<!--            <template slot-scope="scope">-->
<!--              {{ scope.row.nickName }}-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--        </el-table>-->
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
          <el-col >
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left"
                     v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
              <el-row :span="6">
                <el-form-item label="姓名" prop="nickName">
                  <el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -48,6 +54,32 @@
            </el-form>
          </el-col>
        </el-container>
<!--         -->
<!--        <el-container>-->
<!--        <el-table-->
<!--          v-loading="listLoading"-->
<!--          :data="individualList"-->
<!--          element-loading-text="数据加载中"-->
<!--          style="width: 100%"-->
<!--        />-->
<!--          <el-table-column >-->
<!--            <template slot-scope="props">-->
<!--              <el-form label-position="left"  >-->
<!--                <el-form-item label="用户昵称">-->
<!--                  <span>{{ props.row.nickName }}</span>-->
<!--                </el-form-item>-->
<!--                <el-form-item label="联系方式">-->
<!--                  <span>{{ props.row.oldName }}</span>-->
<!--                </el-form-item>-->
<!--                <el-form-item label="用户 ID">-->
<!--                  <span>{{ props.row.idNum }}</span>-->
<!--                </el-form-item>-->
<!--              </el-form>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--        </el-container>-->
      </div>
      <div style="padding-left:70px">
        <el-container>
@@ -75,6 +107,7 @@
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:70px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
@@ -130,6 +163,20 @@
            >编辑</el-button>
            <el-dropdown
              size="mini"
              @command="(command) => handleCommand(command, scope.row)"
              v-hasPermi="['system:role:edit']">
              <el-button
                size="mini"
                type="text"
                icon="el-icon-d-arrow-right"
                @click="handleCheck(scope.row)"
              >查看详情</el-button>
            </el-dropdown>
            <br>
            <el-button type="primary" @click="submitForm">导入</el-button>
          </el-row>
@@ -156,7 +203,10 @@
              </el-row>
              <el-row :span="15">
                <el-form-item label="单位及职务职称" prop="unit position ">
                  <el-input v-model="formData.unit,formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model:unit="formData.unit" v-model:position="formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                    <template slot-scope="scope">
                      {{scope.row.unit}}/{{scope.row.position}}
                    </template>
                  </el-input>
                </el-form-item>
              </el-row>
@@ -188,18 +238,13 @@
      </div>
    </el-container>
<!--    主要学习及工作经历-->
    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >主要学习及工作经历</h2></div>
        <el-button type="primary" icon="el-icon-edit" round></el-button>
        <el-button type="primary" icon="el-icon-delete" round></el-button>
      </el-container>
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="主要学习及工作经历" name="1" >
    <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="25"  align="center" />
      <el-table-column label="起止日期" prop="startDate" sortable width="300" align="center" />
      <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" />
      <el-table-column label="证明人" prop="witness" sortable width="300" align="center" />
          <!--      操作-->
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -223,19 +268,16 @@
        </template>
      </el-table-column>
    </el-table>
    </div>
<!--    家庭成员及主要社会关系情况-->
    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >家庭成员及主要社会关系情况</h2></div>
        <el-button type="primary" icon="el-icon-edit" round></el-button>
        <el-button type="primary" icon="el-icon-delete" round></el-button>
      </el-container>
      </el-collapse-item>
      <el-collapse-item title="家庭成员及主要社会关系情况" name="2" >
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="25"  align="center" />
          <el-table-column label="与本人关系"  prop="relation" sortable width="260" align="center" />
          <el-table-column label="姓名" prop="nickName" sortable width="260" align="center" />
          <el-table-column label="单位及职务" prop="unit position" sortable width="260" align="center" />
          <el-table-column label="单位及职务" prop="unit position" sortable width="260" align="center">
            <template slot-scope="scope">
              {{scope.row.unit}}/{{scope.row.position}}
            </template>
          </el-table-column>
          <el-table-column label="政治面貌" prop="politicalOutlook" sortable width="260" align="center"/>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -260,71 +302,44 @@
            </template>
          </el-table-column>
        </el-table>
    </div>
  <!--    移居国(境)情况-->
      </el-collapse-item>
      <el-collapse-item title="移居国(境)情况" name="3" >
    <div>
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >移居国(境)情况</h2></div>
      </el-container>
      <div style="width:100%">
        <el-container>
          <span style="font-size:15px" >是否拥有外籍、境外居留权、长期居留许可</span>
          <el-radio v-model="formData.outStatus" label="1">是</el-radio>
          <el-radio v-model="formData.outStatus" label="0">否</el-radio>
        </el-container>
      </div>
      <div style="padding-top:20px">
        <el-container>
          <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" label-position="left">
              <el-form-item label="证件号码" prop="idNo">
                <el-input v-model="formData.idNo" placeholder="" clearable  :disabled="dsb">
                </el-input>
          <el-form>
            <el-form-item label="是否拥有外籍、境外居留权、长期居留许可">
              <el-radio-group v-model="form.outStatus" style="margin-bottom: 0">
                <el-radio :label="true">是</el-radio>
                <el-radio :label="false">否</el-radio>
              </el-radio-group>
              </el-form-item>
          </el-form>
        </el-container>
          <div>
            <el-table :data="individualList.idNo" border stripe>
              <el-table-column label="证件号码"  width="80" align="center">
              </el-table-column>
            </el-table>
      </div>
    </div>
  <!--    持有出入境证件情况-->
      <div style="padding-top:30px">
        <el-container>
          <div style="width:100%"><h2 style="font-size:15px" >持有出入境证件情况</h2></div>
          <el-button type="primary" icon="el-icon-edit" round></el-button>
          <el-button type="primary" icon="el-icon-delete" round></el-button>
        </el-container>
        <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="25"  align="center" />
      </el-collapse-item>
      <el-collapse-item title="持有出入境证件情况" name="4" >
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange">
          <el-table-column label="证件名称"  sortable width="280" align="center" />
          <el-table-column label="持有情况"  sortable width="280" align="center" />
          <el-table-column label="证件号码"  sortable width="280" align="center" />
          <el-table-column label="有效期"  sortable width="280" align="center">
          </el-table-column>
        </el-table>
      </div>
  <!--    出国(境)情况-->
      <div style="padding-top:30px">
        <el-container>
          <div style="width:100%"><h2 style="font-size:15px" >出国(境)情况</h2></div>
          <el-button type="primary" icon="el-icon-edit" round></el-button>
          <el-button type="primary" icon="el-icon-delete" round></el-button>
        </el-container>
        <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="25"  align="center" />
      </el-collapse-item>
      <el-collapse-item title="出国(境)情况" name="5" >
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange">
          <el-table-column label="起止日期" prop="startDate" sortable width="350" align="center" />
          <el-table-column label="所到国家或者地区" prop="content" sortable width="350" align="center" />
          <el-table-column label="事由(旅游、走访、探亲、继承财产、其他)" prop="witness" sortable width="400" align="center" />
        </el-table>
      </div>
      </el-collapse-item>
    </el-collapse>
<!--    自传-->
    <div style="padding-top:30px">
@@ -332,32 +347,15 @@
        <div style="width:100%"><h2 style="font-size:15px" >自传</h2></div>
      </el-container>
      <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
        <el-tab-pane label="0~3岁(婴儿期)" name="first"></el-tab-pane>
        <el-tab-pane label="6~12(小学)" name="second"></el-tab-pane>
        <el-tab-pane label="12~15(初中)" name="third"></el-tab-pane>
        <el-tab-pane label="15~18(高中)" name="fourth"></el-tab-pane>
        <el-tab-pane label="0~3岁(婴儿期)" name="1" index="1"></el-tab-pane>
        <el-tab-pane label="6~12(小学)" name="2"></el-tab-pane>
        <el-tab-pane label="12~15(初中)" name="3"></el-tab-pane>
        <el-tab-pane label="15~18(高中)" name="4"></el-tab-pane>
        <el-tab-pane label="18~22(大学)" name="5"></el-tab-pane>
        <el-tab-pane label="22~25(研究生)" name="6"></el-tab-pane>
        <el-tab-pane label="26~ (工作)" name="7"></el-tab-pane>
        <el-tab-pane label="?岁结婚" name="8"></el-tab-pane>
      </el-tabs>
<!--      <el-card class="box-card">-->
<!--        <div slot="header" class="clearfix">-->
<!--          <el-button type="primary" round>0~3岁(婴儿期)</el-button>-->
<!--          <el-button type="primary" round>6~12(小学)</el-button>-->
<!--          <el-button type="primary" round>12~15(初中)</el-button>-->
<!--          <el-button type="primary" round>15~18(高中)</el-button>-->
<!--          <el-button type="primary" round>18~22(大学)</el-button>-->
<!--          <el-button type="primary" round>22~25(研究生)</el-button>-->
<!--          <el-button type="primary" round>26~ (工作)</el-button>-->
<!--          <el-button type="primary" round>?岁结婚</el-button>-->
<!--          <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
<!--        </div>-->
<!--        <div v-for="o in 4" :key="o" class="text item">-->
<!--          {{ }}-->
<!--        </div>-->
<!--      </el-card>-->
    </div>
@@ -385,6 +383,7 @@
//在system/note/index.js中导入接口函数  --接好了
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
  addExperience,delExperience} from "@/api/self/index";
import { getAbroadList, getAutobiographyTermList, getCertificateList } from '../../api/self'
export default {
  name: "show",
  dicts: ['sys_normal_disable'],
@@ -411,7 +410,14 @@
      experienceList: [],
      //家庭成员关系数据
      relationList:[],
      //出入境证件情况
      certificateList:[],
      //出国情况
      AbroadList:[],
      //不同时段个人自传
      AutobiographyTermList:[],
      //下拉实现
      activeNames:['1'],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -435,7 +441,7 @@
      dsb:true,
      btn:false,
      //个人自传
      activeName: 'second',
      activeName: '1',
      formDat: {
        //个人基本信息
@@ -460,6 +466,7 @@
        fatherId:undefined,
        momId:undefined,
        birth:undefined,
        familyId:undefined,
        //主要学习及工作经历
        id:undefined,
@@ -577,13 +584,16 @@
  created() {
    this.getList();
    //   this.getCateInfor()
  },
  methods: {
    // 取消按钮
    cancelData() {
      this.open = false;
      this.reset();
    },
    //下拉
    handleChange(val) {
      console.log(val);
    },
    //编辑按钮
    edit(row){
@@ -596,6 +606,14 @@
    //个人自传
    handleClick(tab, event) {
      console.log(tab, event);
      //根据不同时段的个人自传
      getAutobiographyTermList(this.queryParams).then(response => {
        //  alert(123)
        //   console.log(response.data)
        this.AutobiographyTermList = response.data;
        this.total = response.data.total;
        this.loading = false;
      });
    },
    /** 查询角色列表 */
@@ -605,35 +623,56 @@
      this.loading = true;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      //个人经历
      listExperience(this.queryParams).then(response => {
            alert(123)
             console.log(response.data)
          //  alert(123)
          //   console.log(response.data)
          this.experienceList = response.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      //成员关系
      getIndividualRelation(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.relationList = response.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      //个人信息
      getIndividualList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.individualList = response.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      //出入境证件情况
      getCertificateList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.certificateList = response.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      //出国情况
      getAbroadList(this.queryParams).then(response => {
        //  alert(123)
        //   console.log(response.data)
        this.AbroadList = response.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    // 取消按钮
    cancel() {
@@ -781,3 +820,4 @@
  }
};
</script>