Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 ruoyi-ui/src/views/self/show.vue

@@ -1,16 +1,46 @@
<template>
  <div class="app-container">
    <!--  刷新页面  -->
<!--    <MyComponent :key="componentKey" />-->
    <!--    回到顶部-->
    <el-backtop :bottom="150" :right="30">
      <el-button type="primary" circle
                 class="el-icon-top"
      ></el-button>
    </el-backtop>
    <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
    <h1 style="font-size:21px;padding-top:30px;display: flex;">
      <span>个人简历</span>
      <div class="button-container" >
          <el-button
            size="mini"
            style="background: #E0EEFE;
            border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
            @click="handleEdit()"
            v-if="isShow"
            v-hasPermi="['system:role:edit']"
          >编辑</el-button>
          <el-button v-if="isShow_2" size="mini"
                     style=" width: 67px;height: 27px;background:#E0EEFE;
            border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">完成</el-button>

          <el-button
            size="mini"
            style=" width: 67px;height: 27px;background: #D2F3E0;
            border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "
            @click="handleExport"
            v-hasPermi="['family:note:export']"
          >导出</el-button>

          <el-button
            size="mini"
            style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
            v-hasPermi="['family:note:export']"
          >打印</el-button>
      </div>
      <div   style="display: flex; align-items: center;">
        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']">
          <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
          <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人记事本</span></div>
        </el-button>
@@ -25,19 +55,19 @@
          <el-col >
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left"
                     v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
              <el-row :span="5">
              <el-row :span="6">
                <el-form-item label="姓名" prop="nickName" label-width="40px">
                  <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="5">
              <el-row :span="6">
                <el-form-item label="曾用名" prop="oldName" label-width="60px">
                  <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="5">
              <el-row :span="6">
                <el-form-item label="身份证号" prop="idNum" label-width="70px">
                  <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
@@ -47,7 +77,7 @@
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px">
      <div style="padding-left:60px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
@@ -56,12 +86,12 @@
<!--                  <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
<!--                  </el-input>-->
                  <template v-if="!isEditing">
                    <el-input v-model="individualList.sex === 1 ? '男':'女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                    <el-input v-model="individualList.sex === 1 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                  </template>
                  <template v-else>
                    <el-select v-model="individualList.sex" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="男" value="1"></el-option>
                      <el-option label="女" value="0"></el-option>
                    <el-select v-model="inds" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-option label="男" value='1'></el-option>
                      <el-option label="女" value='0'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
@@ -82,7 +112,7 @@
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px">
      <div style="padding-left:60px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left":disabled="dsb">
@@ -97,13 +127,14 @@
                  <template v-if="!isEditing" >
                    <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="离婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input>

                  </template>
                  <template v-else>
                    <el-select v-model="individualList.maritalStatus" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="未婚" value="0"></el-option>
                      <el-option label="已婚" value="1"></el-option>
                      <el-option label="离婚" value="2"></el-option>
                    <el-select v-model="mrs" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="未婚" value='0'></el-option>
                      <el-option label="已婚" value='1'></el-option>
                      <el-option label="离婚" value='2'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
@@ -113,67 +144,58 @@
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px;padding-top:30px">
      <div style="padding-left:100px;padding-top:30px">
        <el-col :span="6" :data="individualList">
          <div class="block" :model="individualList" >
            <el-col v-model="individualList.img" prop="img">
              <el-avatar shape="square" style="width: 200px;height: 150px;" >
          <div class="block" :model="individualList">
            <div v-if="!isEditing">
              <el-avatar shape="square" style="width: 200px; height: 150px;">
                <el-image
                  :src="'http://47.93.189.255:8080/'+ individualList.img"
                  class="el-upload-list__item-thumbnail"
                  v-if="!individualList.img"
                  src="default-avatar-url"
                  :fit="fit"
                  style="width: 100%;height: 100%;"
                  style="width: 100%; height: 100%;"
                ></el-image>
                <el-image
                  v-else
                  :src="'http://47.93.189.255:8080/' + individualList.img"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
              </el-avatar>
<!--              <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: 147px; height: 147px"-->
<!--                    fit="cover"-->
<!--                    :preview-src-list="[file.url]"-->
<!--                  >-->
<!--                </div>-->
<!--              </el-upload>-->
         </el-col>
            </div>
            <el-upload v-else
                       class="upload-demo"
                       action="#"
                       :auto-upload="false"
                       :http-request="requestUpload"
                       :limit="1"
                       :file-list="fileList"
            >
              <el-avatar shape="square" style="width: 200px; height: 150px;">
                <el-image
                  class="el-upload-list__item-thumbnail"
                  v-if="!individualList.img"
                  src="default-avatar-url"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
                <el-image
                  v-else
                  :src="'http://47.93.189.255:8080/' + individualList.img"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
              </el-avatar>
            </el-upload>
            <div class="edit-text" v-if="isEditing" @click="uploadImage">点击更换图片</div>
          </div>

        </el-col>

      </div>

      <div style="padding-left:30px;padding-top:30px" >
        <el-container >
          <el-row  >
            <el-button
              type="primary"
              @click="handleEdit()"
              v-if="isShow"
              v-hasPermi="['system:role:edit']"
            >编辑</el-button>
            <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">完成</el-button>
            <br>
            <el-button
              type="primary"
              @click="handleExport"
              v-hasPermi="['family:note:export']"
            >导出</el-button>
            <br>
            <el-button
              type="primary"
              v-hasPermi="['family:note:export']"
            >打印</el-button>
          </el-row>

        </el-container>
      </div>
      <!--      </el-dialog> self:user:export-->
    </el-container>
@@ -205,7 +227,7 @@
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px">
      <div style="padding-left:60px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
@@ -239,7 +261,7 @@
      <div>
        <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
          <el-form-item label="是否拥有外籍、境外居留权、长期居留许可" >
            <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;">
            <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;" :disabled="dsb">
              <el-radio :label="1">是</el-radio>
              <el-radio :label="0">否</el-radio>
            </el-radio-group>
@@ -266,7 +288,7 @@
          <div class="title-wrapper">
            主要学习及工作经历
            <div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('open')">
            <el-button class="button" size="mini" type="text"  @click="showDialog('open')" >
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
            </div>
          </div>
@@ -275,13 +297,18 @@
          <el-table-column label="开始日期" prop="startDate" sortable width="250" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
              <template v-else><el-input v-model="scope.row.startDate"></el-input></template>
              <template v-else>
                <el-date-picker v-model="scope.row.startDate" type="date" placeholder="请选择日期"
                    :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
              ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="结束日期" prop="endDate" sortable width="250" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.endDate }}</template>
              <template v-else><el-input v-model="scope.row.endDate"></el-input></template>
              <template v-else><el-date-picker v-model="scope.row.endDate" type="date" placeholder="请选择日期"
                     :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
              ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" >
@@ -316,7 +343,8 @@
            家庭成员及主要社会关系情况
            <div>
            <el-button class="button2" size="mini" type="text"  @click="showDialog('relation1')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button></div>
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
            </div>
          </div>
        </template>
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
@@ -367,7 +395,7 @@
      <el-collapse-item  name="4">
        <template v-slot:title>
          <div class="title-wrapper">
            持有出入境证件情况
            持有证件情况
            <el-button class="button4" size="mini" type="text"  @click="showDialog('certificate')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
@@ -401,13 +429,19 @@
          <el-table-column label="开始时间" prop="startTime"  sortable width="230" align="center">
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
              <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
              <template v-else>
                <el-date-picker v-model="scope.row.startTime" type="date" placeholder="请选择日期"
                    :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
              ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="结束时间" prop="endTime"  sortable width="230" align="center">
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
              <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
              <template v-else>
                <el-date-picker v-model="scope.row.endTime" type="date" placeholder="请选择日期"
                      :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
              ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -436,13 +470,19 @@
          <el-table-column label="开始时间" prop="startTime"  sortable width="200" align="center">
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
              <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
              <template v-else>
                <el-date-picker v-model="scope.row.startTime" type="date" placeholder="请选择日期"
                                :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
                ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="结束时间" prop="endTime"  sortable width="200" align="center">
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
              <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
              <template v-else>
                <el-date-picker v-model="scope.row.endTime" type="date" placeholder="请选择日期"
                                :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
                ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="所到国家或者地区" prop="destination" sortable width="300" align="center" >
@@ -469,35 +509,45 @@
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <!--    自传-->
      <el-collapse-item  name="6">
        <template v-slot:title>
          <div class="title-wrapper">
            自传
            <div>
              <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" >
                <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
              </el-button>
            </div>
          </div>
        </template>
        <el-contain>
          <div>
            <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
                     v-loading="loading" :data="AutobiographyList" >
              <el-tab-pane v-for="(item, index) in AutobiographyList"
                           :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'">
                <div v-if="item.term === '婴儿'"> {{item.content}}</div>
                <div v-if="item.term === '幼儿'"> {{item.content}}</div>
                <div v-if="item.term === '小学'"> {{item.content}}</div>
                <div v-if="item.term === '初中'"> {{item.content}}</div>
                <div v-if="item.term === '高中'"> {{item.content}}</div>
                <div v-if="item.term === '大学'"> {{item.content}}</div>
                <div v-if="item.term === '研究生'"> {{item.content}}</div>
                <div v-if="item.term === '工作'"> {{item.content}}</div>
                <div v-if="item.term === '结婚后'"> {{item.content}}</div>
                <el-button size='mini' type="text" class="btn_edit" @click="editData(item)" style='position: absolute;right:10px;top:5px;'>
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                </el-button>
              </el-tab-pane>
            </el-tabs></div>
        </el-contain>
      </el-collapse-item>

    </el-collapse>

    <!--    自传-->
    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >自传</h2></div>
      </el-container>
      <div style='position: relative;'>
        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
                 v-loading="loading" :data="AutobiographyList" >
          <el-tab-pane v-for="(item, index) in AutobiographyList"
                       :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'">
            <div v-if="item.term === '婴儿'"> {{item.content}}</div>
            <div v-if="item.term === '幼儿'"> {{item.content}}</div>
            <div v-if="item.term === '小学'"> {{item.content}}</div>
            <div v-if="item.term === '初中'"> {{item.content}}</div>
            <div v-if="item.term === '高中'"> {{item.content}}</div>
            <div v-if="item.term === '大学'"> {{item.content}}</div>
            <div v-if="item.term === '研究生'"> {{item.content}}</div>
            <div v-if="item.term === '工作'"> {{item.content}}</div>
            <div v-if="item.term === '结婚后'"> {{item.content}}</div>
          </el-tab-pane>
        </el-tabs>
        <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" style='position: absolute;right:10px;top:5px;'>
          <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
        </el-button>
      </div>

    </div>


    <pagination
      v-show="total>0"
@@ -508,13 +558,17 @@
    />

    <!-- 新增主要经历信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body>
    <el-dialog title="新增主要经历信息" :visible.sync="dialogVisible.open" width="900px" append-to-body>
      <el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
        <el-form-item label="开始日期" prop="startDate">
          <el-input v-model="formDat.startDate" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
          <el-date-picker v-model="formDat.startDate" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="结束日期" prop="endDate">
          <el-input v-model="formDat.endDate" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
          <el-date-picker v-model="formDat.endDate" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="主要学习经历、工作单位及任职情况" prop="content">
          <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="请输入主要学习经历、工作单位及任职情况" clearable :style="{width: '100%'}" >
@@ -534,7 +588,7 @@
      </div>
    </el-dialog>
    <!-- 新增家庭成员及主要社会关系情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="dialogVisible.relation1" width="900px" append-to-body>
    <el-dialog title="新增家庭成员及主要社会关系情况" :visible.sync="dialogVisible.relation1" width="900px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
        <el-form-item label="与本人关系" prop="relation">
          <el-input v-model="formDat.relation" placeholder="请输入与本人关系" clearable :style="{width: '100%'}" ></el-input>
@@ -564,18 +618,20 @@
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增持有出入境证件情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="dialogVisible.certificate" width="900px" append-to-body>
    <!-- 新增持有证件情况信息配置对话框 -->
    <el-dialog title="新增持有证件情况" :visible.sync="dialogVisible.certificate" width="900px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
        <el-form-item label="证件名称" prop="cerName">
          <el-input v-model="formDat.cerName" placeholder="请输入证件名称" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="证件类型" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类型" clearable :style="{width: '100%'}"  >
          <el-select v-model="formDat.type" placeholder="请选择证件类型" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
          <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" @change="addNewOption"></el-input>

        </el-form-item>
        <el-form-item label="持有情况" prop="ownStatus">
          <el-input v-model="formDat.ownStatus" placeholder="请输入持有情况" clearable :style="{width: '100%'}" >
@@ -586,11 +642,14 @@
          </el-input>
        </el-form-item>
        <el-form-item label="开始日期" prop="startTime">
          <el-input v-model="formDat.startTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
            <el-date-picker v-model="formDat.startTime" type="date" placeholder="请选择日期"
                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
            ></el-date-picker>
         </el-form-item>
        <el-form-item label="结束日期" prop="endTime">
          <el-input v-model="formDat.endTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
          <el-date-picker v-model="formDat.endTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker></el-form-item>
         </el-form>
      <h4 class="form-header"> </h4>

@@ -600,14 +659,16 @@
      </div>
    </el-dialog>
    <!-- 新增出国（境）情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body>
    <el-dialog title="新增出国（境）情况信息" :visible.sync="dialogVisible.abroad" width="900px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
        <el-form-item label="开始日期" prop="startTime">
          <el-input v-model="formDat.startTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
          <el-date-picker v-model="formDat.startTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker></el-form-item>
        <el-form-item label="结束日期" prop="endTime">
          <el-input v-model="formDat.endTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" >
          </el-input>
          <el-date-picker v-model="formDat.endTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="所到国家或者地区" prop="destination">
          <el-input v-model="formDat.destination" type="textarea" :rows="5" placeholder="请输入所到国家或者地区" clearable :style="{width: '100%'}" >
@@ -627,10 +688,16 @@
      </div>
    </el-dialog>
    <!--新增自传-->
    <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
    <el-dialog :title="isEdit1 ? '编辑记录' : '新增记录'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
      <el-col >
        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" >
          <el-row :span="5">
<!--            <el-form-item label="需要修改的记录：" prop="id">-->
<!--              <el-select v-model="formDat.id" placeholder="请选择需要修改的记录" clearable :style="{width: '50%'}"  >-->
<!--                <el-option v-for="(item, index) in AutobiographyList" :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'"-->
<!--                ></el-option>-->
<!--              </el-select>-->
<!--            </el-form-item>-->
            <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px">
              <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
@@ -660,7 +727,6 @@
      </div>
    </el-dialog>


  </div>
</template>

@@ -670,13 +736,12 @@
import axios from 'axios';

//在system/note/index.js中导入接口函数  --接好了
import {
  getIndividualList, addIndividual, updateIndividual, delIndividual,
import {getIndividualList, addIndividual, updateIndividual, delIndividual,
  listExperience, addExperience, updateExperience, delExperience,
  getIndividualRelation, addRelation, updateRelation, delRelation,
  getCertificateList, addCertificate, updateCertificate, delCertificate,
  getAbroadList, addAbroad,updateAbroad, delAbroad,
  getAutobiographyList, getAutobiographyTermList, addAutobiography,
  getAbroadList, addAbroad, updateAbroad, delAbroad,listType,
  getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography,
  getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -687,6 +752,7 @@
export default {
  name: "show",
  dicts: ['sys_normal_disable'],

  data() {
    return {
      // 遮罩层
@@ -694,8 +760,13 @@

      loading: true,
      formData:[],
      componentKey: 0,
      // 选中数组
      ids: [],
      //性别
      inds:undefined,
      //婚姻类别
      mrs:undefined,
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -712,7 +783,7 @@
      //个人信息数据
      individualList:[],
      isEditing: false,
      // fit:['fill'],
      fit:['cover'],
      // 个人经历数据
      experienceList: [],
      // isEdit:true,
@@ -721,6 +792,7 @@
      relationList:[],
      //出入境证件情况
      certificateList:[],
      typeList:[],
      //出国情况
      AbroadList:[],

@@ -752,8 +824,6 @@
      },
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,

      // open:true,
      // 是否显示弹出层（数据权限）
@@ -766,15 +836,13 @@
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      isShow:true,
      isShow_2:false,
      isEdit1:false,
      formDat: {
        //个人基本信息
        nickName:undefined,
@@ -832,7 +900,6 @@
        term:undefined,

      },
      AgeEnd:'',
      // 菜单列表
      menuOptions: [],
      // 部门列表
@@ -949,17 +1016,11 @@
        }],

      },
      selectedOption:'',
      typeOptions:[],
      typeOption: [{
        value:'护照',
        label:'护照'
      },{
        value:'通行证',
        label:'通行证'
      },{
        value:'身份证',
        label:'身份证'
      }],
      typeOption:[],
      newOption: undefined,
      showInput: true
    };
  },
  created() {
@@ -974,12 +1035,22 @@
      this.dialogVisible.relation1 = false;
      this.dialogVisible.certificate =false;
      this.dialogVisible.abroad=false;
      this.dialogVisible.autobiography=false
      this.dialogVisible.autobiography=false;
      this.isEdit1 = false;
      this.reset();
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    handleUploadSuccess(response, file) {
      // 处理文件上传成功后的回调
      this.individualList.img = response.url;
    },

    //下拉
    handleChange(activeNames) {
      // console.log(val);
      // console.log(activeNames);
      this.reset();
    },
    showDialog(dialogName) {
@@ -991,6 +1062,18 @@
      // console.log(tab, event);
      this.getAutobiographyInfor();
      // this.getSrc1(typeOptions)
    },
    //个人自传编辑
    editData(data) {
      this.isEdit1 = true; // 设置为编辑操作
      // 将要修改的数据填充到formDat对象中
      this.formDat.ageBegin = data.ageBegin;
      this.formDat.ageEnd = data.ageEnd;
      this.formDat.term = data.term;
      this.formDat.content = data.content;

      // 打开弹窗
      this.dialogVisible.autobiography = true;
    },

    //隔行变色
@@ -1013,12 +1096,14 @@
        return '——————'
      }
    },
    getSrc1(term){
      if(term==='7'){
        return '研究生'
//类别
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOption.includes(newOption)) {
        this.typeOption.push(newOption);
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },

    /** 查询角色列表 */
    getList() {
      this.loading = true;
@@ -1032,7 +1117,6 @@
          this.total = response.data.total;
          this.loading = false;
        }

      );
      //成员关系
      getIndividualRelation(this.queryParams).then(response => {
@@ -1087,6 +1171,31 @@
      //   this.total = response.data.total;
      //   this.loading = false;
      // });
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOption = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);

    },

@@ -1168,12 +1277,6 @@
      });
    },

    handleRemoveFile(file) {
      alert(23)
    },
    handleRemove(file) {
      alert("323")
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
@@ -1200,31 +1303,35 @@
      this.isShow=false
      this.isShow_2=true
      this.isEditing=true
      // this.isEdit=false
      if(this.individualList.maritalStatus == 0)
          this.mrs = '未婚'
      else if(this.individualList.maritalStatus == 1)
          this.mrs = '已婚'
      else
          this.mrs = '离婚'// this.isEdit=false
    },

    /** 查询自传信息 */
    getAutobiographyInfor()
    {
      let _this = this
      getCategory().then(response=>{

      getCategory().then(response => {
        // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
        //   _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        // })
        response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
          const label = elem.split(":")[0].trim();
          const value = parseInt(elem.split(":")[1].trim());
          _this.typeOptions.push({ "label": label, "value": value });
          // this.getSrc1(value)
        })
      })

      // if(AutobiographyList.ageEnd==null){
      //   this.AgeEnd='?'
      // }else{
      //   this.AgeEnd=this.ageEnd
      // }
          // 判断 typeOptions 数组中是否已存在相同的 value
          if (!_this.typeOptions.some(option => option.value === value)) {
            _this.typeOptions.push({ "label": label, "value": value });
          }
          // console.log(_this.typeOptions)
          // _this.getSrc1(value)
        });
      });

    },

    /** 提交按钮（数据权限） */
@@ -1292,25 +1399,49 @@
        this.formDat[key] = '';
      });
    },
    //个人自传
    //个人自传的保存
    submitDataScope6: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          // 根据值找到选中的选项对象
          const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
          // 将选中选项的文本设置为"term"字段的值
          this.formDat.term = selectedOption.label;
          addAutobiography(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.autobiography = false;
            this.getList();
          });

          if (this.isEdit1) {
            // 执行修改操作
            updateAutobiography(this.formDat).then(response => {
              // 将选中选项的文本设置为"term"字段的值
              this.formDat.term = selectedOption.label;
              this.formDat.id = selectedOption.id;
              console.log("1")
              this.$modal.msgSuccess("修改成功");
              this.dialogVisible.autobiography = false;
              this.isEdit1 = false;
              this.getList();
            }).catch(error => {
              console.log(error);
              this.isEdit1 = false;
              this.dialogVisible.autobiography = false;
            });
          } else {
            // 执行新增操作
            addAutobiography(this.formDat).then(response => {
              this.formDat.term = selectedOption.label;
              this.$modal.msgSuccess("新增成功");
              this.dialogVisible.autobiography = false;
              this.getList();
            }).catch(error => {
              console.log(error);
              this.dialogVisible.autobiography = false;
            });
          }
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      // 重置isEdit为false，以便下次点击新增时为新增操作
      this.isEdit1 = false;
    },

    editRow(row) {
@@ -1320,6 +1451,16 @@
    //修改后的保存
    //个人基本信息
    submitForm() {
      if(this.inds=='1')
        this.individualList.sex = 1;
      else
        this.individualList.sex = 0;
      if(this.mrs=='0')
        this.individualList.maritalStatus = 0
      else if(this.mrs == '1')
        this.individualList.maritalStatus = 1
      else
        this.individualList.maritalStatus = 2
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
@@ -1333,8 +1474,15 @@
          if (this.individualList.userId !== undefined) {
            updateIndividual(this.individualList).then(response => {
              this.$modal.msgSuccess("修改成功");
              // 强制更新相关组件
              this.individualList={...this.individualList}

              // this.open = false;
              this.dsb = true
              this.btn=false
              this.isShow_2=false
              this.isShow=true
              this.isEditing = false
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -1343,7 +1491,52 @@
        }
      })
      // 刷新页面
      window.location.reload();
      // window.location.reload();
    },
    //头像修改
    uploadImage() {
      const inputElement = document.createElement("input");
      inputElement.type = "file";
      inputElement.accept = "image/*";
      inputElement.style.display = "none";
      document.body.appendChild(inputElement);

      inputElement.addEventListener("change", () => {
        const file = inputElement.files[0];
        if (file) {
          const formData = new FormData();
          formData.append("image", file);

          // 调用uploadPic接口上传图片
          axios.post("/common/upload", formData, {
            headers: {
              "Content-Type": "multipart/form-data"
            }
          }).then(response => {
            // 上传成功，获取新图片的URL
            const newImageUrl = response.data.img;

            // 假设individualList是一个对象，更新individualList.img
            this.individualList.img =   newImageUrl;

            // 假设fileList是一个数组，更新fileList中对应的图片URL
            // const index = this.fileList.findIndex(item => item.id === fileId);
            // this.fileList[index].url = newImageUrl;

            // 清除input元素并移除事件监听
            document.body.removeChild(inputElement);
            inputElement.removeEventListener("change", null);
          }).catch(error => {
            console.error("上传失败:", error);
            // 清除input元素并移除事件监听
            document.body.removeChild(inputElement);
            inputElement.removeEventListener("change", null);
          });
        }
      });

      // 触发点击事件，显示文件选择对话框
      inputElement.click();
    },
    //主要经历
    saveRowExperienceList(row) {
@@ -1528,9 +1721,7 @@
  background: #FFEFF2;

}
/*.co-item{*/
/*  background-color: #EBAFB4;*/
/*}*/

.el-collapse-item__header {
  background-color:#FEF7FC;
}
@@ -1540,6 +1731,18 @@
}
.btn_autobiography{
  background:center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 76vw;
}
.btn_edit{
  background:center no-repeat url('../../assets/icons/edit.png') ;
}

.button-container {
  text-align: right;
  display: flex;
  justify-content: flex-end;
  align-items: center;
  flex-grow: 1;
}
.button {
  background:center no-repeat url('../../assets/icons/add1.png') ;
@@ -1552,7 +1755,7 @@
}
.button4 {
  background: center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 69.5vw;
  margin-left: 71.5vw;
}
.button5 {
  background:center no-repeat url('../../assets/icons/add1.png') ;