成长经历阅历除自传外都可以进行修改

Tcsm

2023-07-24 f36d42d392784481c6e16b9421fdeee38f8c3e89

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

@@ -6,7 +6,16 @@
                 class="el-icon-top"
      ></el-button>
    </el-backtop>
    <h1 style="font-size:21px;padding-top:30px">个人简历</h1>
    <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
      <span>个人简历</span>
      <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>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人记事本</span></div>
        </el-button>
      </div>
    </h1>
    <el-divider />
    <!--    基本信息-->
    <h2 style="font-size:16px">基本信息</h2>
@@ -44,8 +53,17 @@
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="5">
                <el-form-item label="性别" prop="sex" label-width="40px">
                  <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
<!--                  <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>
                  </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>
                  </template>
                </el-form-item>
              </el-row>
              <el-row :span="5">
@@ -76,8 +94,18 @@
              </el-row>
              <el-row :span="5">
                <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px">
                  <el-input v-model="individualList.maritalStatus === 1 ? '已婚':'未婚'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                  <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>
                  </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>
                  </template>
                </el-form-item>
              </el-row>

@@ -88,44 +116,38 @@
      <div style="padding-left:30px;padding-top:30px">
        <el-col :span="6" :data="individualList">
          <div class="block" :model="individualList" >
            <el-col v-model="individualList.url" prop="url">
              <el-avatar shape="square" :size=200 >
            <el-col v-model="individualList.img" prop="img">
              <el-avatar shape="square" style="width: 200px;height: 150px;" >
                <el-image
                  :src="'http://47.93.189.255:8080/'+ individualList.url"
                  :src="'http://47.93.189.255:8080/'+ individualList.img"
                  :fit="fit"
                  style="width: 100%;height: 100%;"
                ></el-image>
              </el-avatar>
            </el-col>
<!--              <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-col>


        <!--        <el-row>-->
        <!--&lt;!&ndash;          <el-table  border style="width: 100%">&ndash;&gt;-->
        <!--&lt;!&ndash;            <el-table-column&ndash;&gt;-->
        <!--&lt;!&ndash;              prop="img"&ndash;&gt;-->
        <!--&lt;!&ndash;              v-model="individualList.img"&ndash;&gt;-->
        <!--&lt;!&ndash;              placeholder=""&ndash;&gt;-->
        <!--&lt;!&ndash;              width="180">&ndash;&gt;-->
        <!--&lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
        <!--&lt;!&ndash;                <img :src="scope.row.src" style="width:100px;height:50px;"/>&ndash;&gt;-->
        <!--&lt;!&ndash;              </template>&ndash;&gt;-->
        <!--&lt;!&ndash;            </el-table-column>&ndash;&gt;-->

        <!--&lt;!&ndash;          </el-table>&ndash;&gt;-->
        <!--&lt;!&ndash;          <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"&ndash;&gt;-->
        <!--&lt;!&ndash;                      ref="ref1"&ndash;&gt;-->
        <!--&lt;!&ndash;                     action=""&ndash;&gt;-->
        <!--&lt;!&ndash;                     :file-list="fileList"&ndash;&gt;-->
        <!--&lt;!&ndash;                     list-type="picture-card"&ndash;&gt;-->
        <!--&lt;!&ndash;                     accept="image/*"&ndash;&gt;-->
        <!--&lt;!&ndash;                     :auto-upload="false"&ndash;&gt;-->
        <!--&lt;!&ndash;                     :multiple="false"&ndash;&gt;-->
        <!--&lt;!&ndash;                     :limit="limitCountImg">&ndash;&gt;-->
        <!--&lt;!&ndash;            <i class="el-icon-plus"></i>&ndash;&gt;-->
        <!--&lt;!&ndash;          </el-upload>&ndash;&gt;-->
        <!--        </el-row>-->
      </div>

      <div style="padding-left:30px;padding-top:30px" >
@@ -137,6 +159,7 @@
              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"
@@ -144,7 +167,10 @@
              v-hasPermi="['family:note:export']"
            >导出</el-button>
            <br>
            <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">完成</el-button>
            <el-button
              type="primary"
              v-hasPermi="['family:note:export']"
            >打印</el-button>
          </el-row>

        </el-container>
@@ -209,6 +235,31 @@

    <!--折叠面板-->
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="移居国（境）情况" name="3" >
      <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">
              <el-radio :label="1">是</el-radio>
              <el-radio :label="0">否</el-radio>
            </el-radio-group>
            <el-container >
              <el-row :span="7">
                <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
                  <el-form-item label="证件号码" prop="idNo" label-width="70px">
                    <el-input v-model="individualList.idNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-form>
              </el-row>
            </el-container>
          </el-form-item>
        </el-form>

      </div>

    </el-collapse-item>

      <!--主要学习及工作经历-->
      <el-collapse-item name="1"  >
        <template v-slot:title>
@@ -221,41 +272,39 @@
          </div>
        </template>
        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="开始日期" prop="startDate" sortable width="300" align="center" >
            <template slot-scope="scope">{{scope.row.startDate? scope.row.startDate: '————'}}</template>
          <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>
          </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>
          </el-table-column>
          <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" >
            <template slot-scope="scope">{{scope.row.content? scope.row.content: '————'}}</template>
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.content }}</template>
              <template v-else><el-input v-model="scope.row.content"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="证明人" prop="witness" sortable width="300" align="center" >
            <template slot-scope="scope">{{scope.row.witness? scope.row.witness: '————'}}</template>
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.witness }}</template>
              <template v-else><el-input v-model="scope.row.witness"></el-input></template>
            </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">
<!--              @click="handleUpdate(scope.row)"-->
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="showDialog1"
                v-hasPermi="['system:role:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleExperienceDelete(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>-->
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
               @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
              <el-button size="mini" type="text"
                v-if="editStatus[scope.row.id]" @click="saveRowExperienceList(scope.row)">保存</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete"
                @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -273,69 +322,46 @@
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="与本人关系"  prop="relation" sortable width="260" align="center" >
            <template slot-scope="scope">{{scope.row.relation? scope.row.relation: '————'}}</template>
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.relation }}</template>
              <template v-else><el-input v-model="scope.row.relation"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="姓名" prop="otherName" sortable width="260" align="center" >
            <template slot-scope="scope">{{scope.row.otherName? scope.row.otherName: '————'}}</template>
          </el-table-column>
          <el-table-column label="单位及职务" prop="otherUnit position" sortable width="260" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.otherUnit || scope.row.otherPosition  == true">
                {{scope.row.otherUnit}}/{{scope.row.otherPosition}}
              </span>
              <span v-else>————</span>
              <template v-if="!scope.row.isEdit">{{ scope.row.otherName }}</template>
              <template v-else><el-input v-model="scope.row.otherName"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="单位" prop="otherUnit" sortable width="220" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.otherUnit }}</template>
              <template v-else><el-input v-model="scope.row.otherUnit"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="职务" prop="otherPosition" sortable width="220" align="center">
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.otherPosition }}</template>
              <template v-else><el-input v-model="scope.row.otherPosition"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="政治面貌" prop="otherPolitical" sortable width="260" align="center">
            <template slot-scope="scope">{{scope.row.otherPolitical? scope.row.otherPolitical: '————'}}</template>
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.otherPolitical }}</template>
              <template v-else><el-input v-model="scope.row.otherPolitical"></el-input></template>
            </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="handleRelationDelete(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>-->
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
              <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
                @click="saveRowRelationList(scope.row)">保存</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete"
                @click="handleRelationDelete(scope.row)" v-hasPermi="['system:role:remove']">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <el-collapse-item title="移居国（境）情况" name="3" >
        <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">
                <el-radio :label="1">是</el-radio>
                <el-radio :label="0">否</el-radio>
              </el-radio-group>
              <el-container >
                <el-row :span="7">
                  <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
                    <el-form-item label="证件号码" prop="idNo" label-width="70px">
                      <el-input v-model="individualList.idNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                      </el-input>
                    </el-form-item>
                  </el-form>
                </el-row>
              </el-container>
            </el-form-item>
          </el-form>

        </div>

      </el-collapse-item>
      <!--持有出入境证件情况-->
      <el-collapse-item  name="4">
@@ -348,48 +374,50 @@
        </template>
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="证件名称" prop="cerName" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.cerName? scope.row.cerName: '————'}}</template>
          </el-table-column>
          <el-table-column label="持有情况" prop="ownStatus" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.ownStatus? scope.row.ownStatus: '————'}}</template>
          </el-table-column>
          <el-table-column label="证件号码" prop="idNo" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '————'}}</template>
          </el-table-column>
          <el-table-column label="有效期" prop="startTime endTime"  sortable width="280" align="center">
          <el-table-column label="证件名称" prop="cerName" sortable width="230" align="center" >
            <template slot-scope="scope">
              <span v-if="scope.row.startTime || scope.row.endTime  == true">
                {{scope.row.startTime}} 至 {{scope.row.endTime}}
              </span>
              <span v-else>————</span>
              <template v-if="!scope.row.isEdit">{{ scope.row.cerName }}</template>
              <template v-else><el-input v-model="scope.row.cerName"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="证件类型" prop="type" sortable width="230" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.type }}</template>
              <template v-else><el-input v-model="scope.row.type"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="持有情况" prop="ownStatus" sortable width="230" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.ownStatus }}</template>
              <template v-else><el-input v-model="scope.row.ownStatus"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="证件号码" prop="idNo" sortable width="230" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.idNo }}</template>
              <template v-else><el-input v-model="scope.row.idNo"></el-input></template>
            </template>
          </el-table-column>
          <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>
          </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>
          </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">
              <!--              @click="handleUpdate(scope.row)"-->
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleAdd"
                v-hasPermi="['system:role:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleCertificateDelete(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>-->
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                         @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
              <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
                         @click="saveRowCertificateList(scope.row)">保存</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete"
                @click="handleCertificateDelete(scope.row)" v-hasPermi="['system:role:remove']">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -405,46 +433,38 @@
        </template>
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="起止日期" prop="startTime endTime" sortable width="350" align="center" >
          <el-table-column label="开始时间" prop="startTime"  sortable width="200" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.startTime || scope.row.endTime  == true">
                {{scope.row.startTime}} 至 {{scope.row.endTime}}
              </span>
              <span v-else>————</span>
              <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
              <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="所到国家或者地区" prop="destination" sortable width="350" align="center" >
            <template slot-scope="scope">{{scope.row.destination? scope.row.destination: '————'}}</template>
          <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>
          </el-table-column>
          <el-table-column label="所到国家或者地区" prop="destination" sortable width="300" align="center" >
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.destination }}</template>
              <template v-else><el-input v-model="scope.row.destination"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="cause" sortable width="420" align="center" >
            <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '————'}}</template>
            <template slot-scope="scope">
              <template v-if="!scope.row.isEdit">{{ scope.row.cause }}</template>
              <template v-else><el-input v-model="scope.row.cause"></el-input></template>
            </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">
              <!--              @click="handleUpdate(scope.row)"-->

              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleAdd"
                v-hasPermi="['system:role:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleAbroadDelete(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>-->
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                         @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
              <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
                         @click="saveRowAbroadList(scope.row)">保存</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAbroadDelete(scope.row)"
                         v-hasPermi="['system:role:remove']">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -472,9 +492,9 @@
            <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>
<!--        <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>
@@ -492,6 +512,9 @@
      <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-form-item>
        <el-form-item label="结束日期" prop="endDate">
          <el-input v-model="formDat.endDate" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="主要学习经历、工作单位及任职情况" prop="content">
          <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="请输入主要学习经历、工作单位及任职情况" clearable :style="{width: '100%'}" >
@@ -548,6 +571,12 @@
          <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-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="持有情况" prop="ownStatus">
          <el-input v-model="formDat.ownStatus" placeholder="请输入持有情况" clearable :style="{width: '100%'}" >
          </el-input>
@@ -557,11 +586,10 @@
          </el-input>
        </el-form-item>
        <el-form-item label="开始日期" prop="startTime">
          <el-input v-model="formDat.startTime" placeholder="请输入开始日期" clearable :style="{width: '100%'}" ></el-input>
          <el-input v-model="formDat.startTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="结束日期" prop="endTime">
          <el-input v-model="formDat.endTime" placeholder="请输入结束日期" clearable :style="{width: '100%'}" >
          </el-input>
          <el-input v-model="formDat.endTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
         </el-form>
      <h4 class="form-header"> </h4>
@@ -640,17 +668,18 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";


import axios from 'axios';

//在system/note/index.js中导入接口函数  --接好了
import {getIndividualList, addIndividual, updateIndividual, delIndividual,
        listExperience,  addExperience,updateExperience, delExperience,
        getIndividualRelation,addRelation,updateRelation,delRelation,
        getCertificateList, addCertificate, delCertificate,
        getAbroadList,addAbroad, delAbroad,
        getAutobiographyList, getAutobiographyTermList,addAutobiography,
        getCategory} from "@/api/self/index";
import {
  getIndividualList, addIndividual, updateIndividual, delIndividual,
  listExperience, addExperience, updateExperience, delExperience,
  getIndividualRelation, addRelation, updateRelation, delRelation,
  getCertificateList, addCertificate, updateCertificate, delCertificate,
  getAbroadList, addAbroad,updateAbroad, delAbroad,
  getAutobiographyList, getAutobiographyTermList, addAutobiography,
  getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'

@@ -679,12 +708,16 @@
      //头像上传
      showBtnDealImg:true,
      noneBtnImg:false,
      limitCountImg:1,//上传图片的最大数量
      //上传图片的最大数量
      limitCountImg:1,
      //个人信息数据
      individualList:[],
      fit:['fill'],
      isEditing: false,
      // fit:['fill'],
      // 个人经历数据
      experienceList: [],
      // isEdit:true,
      editStatus: {},
      //家庭成员关系数据
      relationList:[],
      //出入境证件情况
@@ -710,7 +743,7 @@
      // current: 0,

      //下拉实现
      activeNames:'',
      activeNames:'3',
      dialogVisible: {
        open: false,
        relation1:false,
@@ -773,6 +806,7 @@
        id:undefined,
        userId:undefined,
        startDate:undefined,
        endDate:undefined,
        content:undefined,
        witness:undefined,
        remark: undefined,
@@ -783,6 +817,7 @@
        otherPosition:undefined,
        otherPolitical:undefined,
        //持有出入境证件情况
        type:undefined,
        cerName:undefined,
        validityDate:undefined,
        ownStatus:undefined,
@@ -880,6 +915,11 @@
          message: '请输入起始日期',
          trigger: 'blur'
        }],
        endDate: [{
          // required: true,
          message: '请输入结束日期',
          trigger: 'blur'
        }],
        content: [{
          // required: true,
          message: '请输入',
@@ -892,12 +932,23 @@
        }],

      },
      typeOptions: [],
      typeOptions:[],
      typeOption: [{
        value:'护照',
        label:'护照'
      },{
        value:'通行证',
        label:'通行证'
      },{
        value:'身份证',
        label:'身份证'
      }],
    };
  },
  created() {
    this.getList();
    this.getAutobiographyInfor()

  },
  methods: {
    // 取消按钮
@@ -933,7 +984,18 @@
        return "statistics-warning-row";
      }
    },

    //证件类别
    getSrc(type) {
      if (type === '护照'){
        return '护照'
      }else if(type === '通行证'){
        return '通行证'
      }else if(type === '身份证'){
        return '身份证'
      }else {
        return '——————'
      }
    },

    /** 查询角色列表 */
    getList() {
@@ -1006,7 +1068,6 @@

    //图片的上传及上传按钮隐藏


    // 取消按钮
    cancel() {
      this.open = false;
@@ -1018,30 +1079,6 @@
      this.reset();
    },

    submitForm() {
      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.individualList.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {
        if (valid) {
          if (this.individualList.id !== undefined) {
            updateIndividual(this.individualList).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
    },
    // 表单重置
    reset() {
      if (this.$refs.menu !== undefined) {
@@ -1084,13 +1121,10 @@
      this.multiple = !selection.length
    },

    /** 新增按钮操作 */
    // handleAdd() {
    //   this.reset();
    //   this.open = true;
    //   this.title = "添加个人信息";
    // },

    //个人记事本
    toMemo(){
      this.$router.push("/self/self/memo/" + this.individualList.userId);
    },

    /** 查看详细信息 */
    handleCheck(row){
@@ -1141,14 +1175,10 @@
      this.btn = true
      this.isShow=false
      this.isShow_2=true
      this.isEditing=true
      // this.isEdit=false
    },
    //修改按钮
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      // this.open = true;
      this.title = "新增详细信息";
    },

    /** 查询自传信息 */
    getAutobiographyInfor()
    {
@@ -1160,9 +1190,10 @@
        })
      })
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

    /** 提交按钮（数据权限） */
    //新增主要经历的保存
    submitDataScope: function() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
@@ -1180,9 +1211,13 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    //新增成员关系的保存
    submitDataScope2: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
@@ -1200,7 +1235,12 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    //新增出入境证件的保存
    submitDataScope4: function() {

      let ul = this.fileList.map(function (elem){
@@ -1220,9 +1260,13 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    //新增出国境的保存
    submitDataScope5: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
@@ -1239,6 +1283,10 @@
            this.getList();
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    submitDataScope6: function() {
@@ -1260,8 +1308,128 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },

    editRow(row) {
      this.$set(row, 'isEdit', true);
      this.$set(this.editStatus, row.id, true);
    },
    //修改后的保存
    //个人基本信息
    submitForm() {
      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.individualList.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {
        if (valid) {
          if (this.individualList.userId !== undefined) {
            updateIndividual(this.individualList).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
      // 刷新页面
      window.location.reload();
    },
    //主要经历
    saveRowExperienceList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
            updateExperience(updatedData).then(response => {
              this.$modal.msgSuccess("修改成功");
            }).catch(error => {
              this.$modal.msgError("修改失败");
              console.log(error);
            });
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //成员关系
    saveRowRelationList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          const foundIndex = this.relationList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.relationList[foundIndex], row);
            updateRelation(updatedData).then(response => {
              this.$modal.msgSuccess("修改成功");
            }).catch(error => {
              this.$modal.msgError("修改失败");
              console.log(error);
            });
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //证件情况
    saveRowCertificateList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
            updateCertificate(updatedData).then(response => {
              this.$modal.msgSuccess("修改成功");
            }).catch(error => {
              this.$modal.msgError("修改失败");
              console.log(error);
            });
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //出国情况
    saveRowAbroadList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
            updateAbroad(updatedData).then(response => {
              this.$modal.msgSuccess("修改成功");
            }).catch(error => {
              this.$modal.msgError("修改失败");
              console.log(error);
            });
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    requestUpload(params)
    {
      var file = params.file;
@@ -1299,7 +1467,7 @@
    /** 删除成员关系按钮操作 */
    handleRelationDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？'+Ids).then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delRelation(Ids);
      }).then(() => {
        this.getList();
@@ -1319,7 +1487,7 @@
    /** 删除出国（境）情况按钮操作 */
    handleAbroadDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？'+Ids).then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delAbroad(Ids);
      }).then(() => {
        this.getList();
@@ -1391,4 +1559,8 @@
  background:center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 71vw;
}
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;

}
</style>