修改完254、258、259、260、261错误

yz3456

2024-04-25 79d870e1d8c88c01fa5075e3fb30ad9f0b6f37f7

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

@@ -6,240 +6,423 @@
                 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;">
      <span>个人简历</span>
    <h1 style="font-size:21px;padding-top:30px;display: flex;">
      <span>个人记事本</span>
      <div class="button-container" ></div>
    <!--  <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-print="'#printable-content'"
            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>
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人简历</span></div>
        </el-button>
      </div>
    </h1>
    <el-divider />
    <!--    基本信息-->
    <h2 style="font-size:16px">基本信息</h2>
    <el-container>
      <div >
        <el-container >
          <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-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-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-form-item label="身份证号" prop="idNum" label-width="70px">
                  <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
            </el-form>
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px">
        <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">
              <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>-->
                  <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">
                <el-form-item label="民族" prop="nation"label-width="40px">
                  <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="5">
                <el-form-item label="联系方式" prop="phoneNumber" label-width="70px">
                  <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
            </el-form>
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px">
        <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">
              <el-row :span="5">
                <el-form-item label="国籍" prop="nationality" label-width="40px">
                  <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="5">
                <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px">
                  <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>
    <!--  刷新页面  -->
    <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch">

            </el-form>
          </el-col>
        </el-container>
      </div>
      <div style="padding-left:30px;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;" >
                <el-image
                  :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-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @keyup.enter.native="handleQuery"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="人物" prop="people">
        <el-input
          v-model="queryParams1.people"
          placeholder="请输入人物"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>

      <el-form-item label="地点" prop="address">
        <el-input
          v-model="queryParams1.address"
          placeholder="请输入地点"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>
      <el-form-item label="事件标题" prop="title">
        <el-input
          v-model="queryParams1.title"
          placeholder="请输入事件标题"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>

      <el-form-item>
        <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
        <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>
      </el-form-item>
    </el-form>
    <div>

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

      </div>
        <el-col :span="1.5">
          <el-button
            type="danger"
            plain
            icon="el-icon-delete"
            size="mini"
            :disabled="multiple"
            @click="handleDelete1"
            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="handleExportm"
            v-hasPermi="['family:note:export']"
          >导出</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="warning"
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExportTemplatem"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.5">

      <div style="padding-left:30px;padding-top:30px" >
        <el-container >
          <el-row  >
          <el-upload
            action=""

            class="upload-demo"
            :show-file-list="false"
            :http-request="handleEnportm"
          >
            <el-button size="mini"   type="primary"
                       plain
                  icon="el-icon-top" >导入</el-button>

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

    <el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>

      <el-table-column label="时间" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="人物" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" >
        <template slot-scope="scope">{{scope.row.people? scope.row.people: '————'}}</template>
      </el-table-column>
      <el-table-column label="地点" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
        <template slot-scope="scope">{{scope.row.address? scope.row.address: '————'}}</template>
      </el-table-column>
      <el-table-column label="事件标题" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
        <template slot-scope="scope">{{scope.row.title? scope.row.title: '————'}}</template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="160" align="center">
        <template slot-scope="scope" >
          <div  @click="handleCheck1(scope.row)">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
            >
            <img
              v-else
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceA.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"

            ></div>
        </template>
      </el-table-column>

      <!--      </el-table-column>-->
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <div class="button-container">
            <el-button
              type="primary"
              @click="handleEdit()"
              v-if="isShow"
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate1(scope.row)"
              v-hasPermi="['system:role:edit']"
            >编辑</el-button>
            <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">完成</el-button>
            <br>
            >
              <span style="font-size: 14px;">修改</span>
            </el-button>
            <el-button
              type="primary"
              @click="handleExport"
              v-hasPermi="['family:note:export']"
            >导出</el-button>
            <br>
              size="mini"
              type="text"
              icon="el-icon-delete"
              @click="handleDelete1(scope.row)"
              v-hasPermi="['system:role:remove']"
            ><span style="font-size: 14px;">删除</span></el-button>
            <el-button
              type="primary"
              v-hasPermi="['family:note:export']"
            >打印</el-button>
          </el-row>
              size="mini"
              type="text"
              icon="el-icon-d-arrow-right"
              @click="handleCheck1(scope.row)">
              <span style="font-size: 14px;">查看详情</span></el-button>
          </div>
        </template>
      </el-table-column>
    </el-table>

        </el-container>
      </div>
      <!--      </el-dialog> self:user:export-->
    </el-container>
    <el-container>
      <div>
        <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">
              <el-row :span="16">
                <el-form-item label="户籍地址" prop="locationAddress" label-width="70px">
                  <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px">
                  <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16" >
                <el-form-item label="单位" prop="unit" label-width="40px">
                  <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
    <pagination
      v-show="totalm>0"
      :total="totalm"
      :page.sync="queryParams1.pageNum"
      :limit.sync="queryParams1.pageSize"
      style="background: #FEF7FC;"
      @pagination="getList"
    />

            </el-form>
          </el-col>
        </el-container>
    <!-- 添加个人记事本配置对话框 -->
    <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="happenTime">
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker></el-form-item>
        <el-form-item label="人物" prop="people">
          <el-input v-model="formDat.people" 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="title">
          <el-input v-model="formDat.title" 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="#"
          accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        :on-change="handleChange"
        :auto-upload="false"
           ref="upload"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{ file }">
            <template v-if="fileList">
              <img
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                alt=""
                style="width: 100%; height: 100%; object-fit: cover;"
                fit="cover"
                :preview-src-list="[file.url]"
              >
            </template>
            <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>
        <el-button
                 style="margin-left: 10px"
                 size="small"
                 type="success"

                 @click="picUpload"
               >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>


        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          ref="upload1"
          :on-change="handleChange1"
          :auto-upload="false"
          list-type="picture-card"
          :on-remove="handleRemove"
          :http-request="requestUpload1m"
          :show-file-list="true"
        >

        <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <!-- 添加video元素用于显示视频 -->
            <video
              v-if="file.url.includes('.mp4')"
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              style="width: 147px; height: 147px"
              fit="cover"
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 :src="file.url"
                 alt=""
                 style="width: 100%; height: 100%"
                 fit="cover"></img>

            <span class="el-upload-list__item-actions">
                 <span class="el-upload-list__item-name">{{ file.name }}</span>
                      <span
                        class="el-upload-list__item-preview"
                        @click="handleFileCardPreview(file)"
                      >
                        <i class="el-icon-zoom-in"></i>
                      </span>

                      <span

                        class="el-upload-list__item-delete"
                        @click="handleRemoveFile(file)"
                      >
                        <i class="el-icon-delete"></i>
                      </span>
                </span>

          </div>

        </el-upload>

        <el-button
                style="margin-left: 10px"
                size="small"
                type="success"
                @click="fileUpload"
            >上传到服务器</el-button>
      </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScopem">保 存</el-button>
        <el-button @click="cancelDataPer">取 消</el-button>
      </div>
      <div style="padding-left:30px">
        <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">
              <el-row :span="12">
                <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px">
                  <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px">
                  <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12" >
                <el-form-item label="职务职称" prop="position" label-width="70px">
                  <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
            </el-form>
          </el-col>
        </el-container>
      </div>
    </el-container>
    </el-dialog>

    <!-- 分配角色数据权限对话框 -->
    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>

    </el-dialog>

<!--    <MyComponent :key="componentKey" />-->

    <!--    基本信息-->


    <!--折叠面板-->
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="移居国（境）情况" name="3" >
    <el-collapse  v-model="activeNames" @change="handleChange5">
      <!-- <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-form-item label="是否拥有外籍、境外居留权、长期居留许可" >
            <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>
@@ -247,7 +430,7 @@
              <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 v-model="individualList.idNo" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-form>
@@ -258,15 +441,15 @@

      </div>

    </el-collapse-item>
    </el-collapse-item> -->

      <!--主要学习及工作经历-->
      <el-collapse-item name="1"  >
        <template v-slot:title>
          <div class="title-wrapper">
            主要学习及工作经历
            <div class="left-content">主要学习及工作经历</div>
            <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 +458,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" >
@@ -313,10 +501,11 @@
      <el-collapse-item name="2" >
        <template v-slot:title>
          <div class="title-wrapper">
            家庭成员及主要社会关系情况
            <div class="left-content">家庭成员及主要社会关系情况</div>
            <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>
            <el-button class="button" size="mini" type="text"  @click="showDialog('relation1')">
              <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,8 +556,8 @@
      <el-collapse-item  name="4">
        <template v-slot:title>
          <div class="title-wrapper">
            持有出入境证件情况
            <el-button class="button4" size="mini" type="text"  @click="showDialog('certificate')">
            <div class="left-content">持有证件情况</div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('certificate')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
@@ -401,13 +590,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">
@@ -426,8 +621,8 @@
      <el-collapse-item  name="5">
        <template v-slot:title>
          <div class="title-wrapper">
            出国（境）情况
            <el-button class="button5" size="mini" type="text"  @click="showDialog('abroad')">
            <div class="left-content">出国（境）情况</div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('abroad')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
@@ -436,13 +631,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 +670,42 @@
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <!--    自传-->
      <el-collapse-item  name="6">
        <template v-slot:title>
          <div class="title-wrapper">
            <div class="left-content">自传</div>
            <div>
              <el-button size='mini' type="text" class="button" @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>{{ item.content }}</div>
                <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                </el-button>

                <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(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 +716,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 +746,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 +776,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 +800,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 +817,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,24 +846,31 @@
      </div>
    </el-dialog>
    <!--新增自传-->
    <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" >
    <el-dialog :title="isEdit1 ? '编辑记录' : '新增记录'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
      <el-col >
        <el-form ref="elForm" :model="AutobiographyList" :rules="rules" size="medium"  label-position="left"
                 v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange" >
        <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="AutobiographyList.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 ——</span>
              <el-input v-model="AutobiographyList.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 </span>
          </el-form-item>
            <el-form-item label="时期：" prop="term">
              <el-select v-model="formDat.term" placeholder="请选择时期" clearable :style="{width: '50%'}"  >
                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                ></el-option>
              </el-select>
<!--              <el-select v-model="formDat.term" placeholder="请选择时期" clearable :style="{width: '50%'}"  >-->
<!--                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
<!--                ></el-option>-->
<!--              </el-select>-->
              <el-input v-model="formDat.term"  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%'}" >
@@ -661,7 +887,6 @@
      </div>
    </el-dialog>


  </div>
</template>

@@ -676,11 +901,18 @@
  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,delAutobiography,
  getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
// import { listRole, getRole, delRole, addRole, updateRole, dataScope,changeRoleStatus, deptTreeSelect } from "@/api/system/role";
// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

//导入接口函数
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";

import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'


@@ -688,15 +920,23 @@
export default {
  name: "show",
  dicts: ['sys_normal_disable'],

  data() {
    return {
       uploadFileList: [],
      uploadFileList1: [],
      // 遮罩层
      disabled: false,

      loading: true,
      formData:[],
      componentKey: 0,
      // 选中数组
      ids: [],
      //性别
      inds:undefined,
      //婚姻类别
      mrs:undefined,
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -705,6 +945,7 @@
      showSearch: true,
      // 总条数
      total: 0,
      totalm: 0,
      //头像上传
      showBtnDealImg:true,
      noneBtnImg:false,
@@ -713,7 +954,7 @@
      //个人信息数据
      individualList:[],
      isEditing: false,
      // fit:['fill'],
      fit:['cover'],
      // 个人经历数据
      experienceList: [],
      // isEdit:true,
@@ -722,6 +963,7 @@
      relationList:[],
      //出入境证件情况
      certificateList:[],
      typeList:[],
      //出国情况
      AbroadList:[],

@@ -753,10 +995,8 @@
      },
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,

      // open:true,
       open:false,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
      menuExpand: false,
@@ -766,16 +1006,18 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],

      ],
      fileList1:[],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      isShow:true,
      isShow_2:false,
      isEdit1:false,
      formDat: {
        //个人基本信息
        nickName:undefined,
@@ -800,7 +1042,7 @@
        momId:undefined,
        birth:undefined,
        familyId:undefined,

        url: '',

        //主要学习及工作经历
        id:undefined,
@@ -826,16 +1068,28 @@
        startTime:undefined,
        endTime:undefined,
        cause:undefined,
        url: undefined,

        //自传
        ageBegin:undefined,
        ageEnd:undefined,
        term:undefined
        term:undefined,

      },
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
        happenTime:undefined,
        people:undefined,
        address:undefined,
        title:undefined,
        remark:undefined
      },
      // 个人记事本表格数据
      noteList: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -852,6 +1106,21 @@
      },
      // 表单校验
      rules: {
        happenTime: [{
          required: true,
          message: '请选择时间',
          trigger: 'blur'
        }],
        people: [{
          required: true,
          message: '请输入人物',
          trigger: 'blur'
        }],
        title: [{
          required: true,
          message: '请输入事件标题',
          trigger: 'blur'
        }],
        //基本信息
        nickName: [{
          // required: true,
@@ -921,8 +1190,8 @@
          trigger: 'blur'
        }],
        content: [{
          // required: true,
          message: '请输入',
          required: true,
          message: '请输入文本',
          trigger: 'blur'
        }],
        witness: [{
@@ -930,19 +1199,29 @@
          message: '请输入证明人',
          trigger: 'blur'
        }],
        //自传
        term: [{
          required: true,
          message: '请输入时期',
          trigger: 'blur'
        }],
        ageBegin: [{
          required: true,
          message: '',
          trigger: 'blur'
        }],
        ageEnd: [{
          required: true,
          message: '',
          trigger: 'blur'
        }],

      },
      selectedOption:'',
      typeOptions:[],
      typeOption: [{
        value:'护照',
        label:'护照'
      },{
        value:'通行证',
        label:'通行证'
      },{
        value:'身份证',
        label:'身份证'
      }],
      typeOption:[],
      newOption: undefined,
      showInput: true
    };
  },
  created() {
@@ -951,18 +1230,134 @@

  },
  methods: {
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
    {
          this.$delete(this.fileListOther,i);
      this.$delete(this.uploadFileList1,i);
      }
      }
    },
    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
      {
          this.$delete(this.fileList,i);
           this.$delete(this.uploadFileList,i);
           }
      }
     },

   fileUpload(){
   //   var file = params.file;

      var formData = new FormData();
      this.$refs.upload1.submit();
      // formData.append('uploadFile', file);
      if(this.uploadFileList1.length==0){
           this.$modal.msgSuccess("文档上传列表不能为空!");
           return
      }
      this.uploadFileList1.forEach((elem)=>{
         formData.append("files", elem)

      })

      let _this = this

      this.uploading = true;
      uploadPic(formData).then(response => {
      _this.uploadFileList1 = []
      _this.formDat.url = _this.formDat.url+","+response.fileNames
      _this.$modal.msgSuccess("文件上传成功!");
        })

   },

   picUpload()
   {
      var formData = new FormData();
      //alert(976)
      //this.$refs.upload.submit();
      //alert(8)
      //alert(this.uploadFileList.length)
   if(this.uploadFileList.length==0){
        this.$modal.msgSuccess("图片上传列表不能为空！");
        return}
   //console.log(this.uploadFileList)
  // alert(this.uploadFileList)
      this.uploadFileList.forEach((elem)=>{
         formData.append("files", elem)

      })
      //alert(90)
      let _this = this
      //alert(9)
       uploadPic(formData).then(response => {
         // console.log(response,'123123123')
   //            console.log(_this.formDat.url,'666')
         _this.formDat.url = _this.formDat.url+","+response.fileNames

            // alert(_this.formDat.url)
        _this.uploadFileList = []
        _this.$modal.msgSuccess("图片上传成功");

     });
   },

    handleChange(file, fileList1) {
       //定义一个全局数组uploadFileList来做存储

     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    //alert(file)
        this.uploadFileList.push(file.raw);
         this.fileList.push({name:file.name,url:file.url})
    //alert(fileList1.length)
    },
    handleChange1(file, fileOtherList1) {
       //定义一个全局数组uploadFileList来做存储
    this.uploadFileList1.push(file.raw);
     this.fileListOther.push({name:file.name,url:file.url})
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },



    // 取消按钮
    cancelData() {
   //   alert(23)
      this.dialogVisible.open = false;
      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();
    // alert(32)
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    handleUploadSuccess(response, file) {
      // 处理文件上传成功后的回调
      this.individualList.img = response.url;
    },

    //下拉
    handleChange(activeNames) {
      // console.log(val);
    handleChange5(activeNames) {
      // console.log(activeNames);
      this.reset();
    },
    showDialog(dialogName) {
@@ -973,7 +1368,24 @@
    handleClick(tab, event) {
      // 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;
    },
    editAutobiography(item) {
      this.isEdit1 = true;
      this.dialogVisible.autobiography = true;
      this.formDat = { ...item };
    },

    //隔行变色
@@ -996,64 +1408,89 @@
        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;
      this.queryParams1.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams1.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listNote(this.queryParams1).then(response => {
         // alert(321)
          //   console.log(response.data)
          this.noteList = response.data.data;

          this.totalm = response.data.total;
          this.loading = false;
        }
      );


      this.loading = true;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      //个人经历
      let _this = this;
      listExperience(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.experienceList = response.data;
          this.total = response.data.total;
          this.loading = false;
          _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;
          _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;
        }
      );
  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;
          _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;
          _this.AbroadList = response.data;
          // this.total = response.data.total;
          _this.loading = false;
        }
      );
      //查询个人所有自传
      getAutobiographyList(this.queryParams).then(response => {
        //  alert(123)
        //   console.log(response.data)
        this.AutobiographyList = response.data;
        this.total = response.data.total;
        this.loading = false;
        _this.AutobiographyList = response.data;
        // this.total = response.data.total;
        _this.loading = false;

      });
      //根据不同时段的个人自传
      // getAutobiographyTermList(this.queryParams).then(response => {
@@ -1063,6 +1500,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;
      }, []);

    },

@@ -1120,7 +1582,143 @@
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
/** 新增按钮操作 */
    handleAdd1() {
      this.reset();
      this.open = true;
      this.title = "添加个人记事本详细信息";
    },
    /** 查看详细信息 */
    handleCheck1(row){
      const id = row.id;
      this.$router.push("/self/self/memoInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate1(row) {
      const id = row.id;
      let jd = true

      this.$router.push({
        path:"/self/self/memoInfo/" + id,
        query:{
          detail:jd
        }
      });
    },
    requestUploadm(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('files', file);
      let _this = this
      this.uploading = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        this.uploading = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.fileNames, "url":response.data.url})
        }
      })
    },
    requestUpload1m(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('files', file);
      let _this = this
      this.uploading1 = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        this.uploading1 = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) !== true)
        {
          _this.fileListOther.push({name:response.fileNames, url:response.data.url})
        }
      })
    },

    /** 导出按钮操作 */
    handleExportm() {
      const Ids = this.ids;

      if(Ids.length==0)
      {
        this.download('/zSelfNote/export', {
          ...this.queryParams
        }, `zSelfNote${new Date().getTime()}.xlsx`)
      }else{
        this.download('/zSelfNote/export1/'+Ids, {

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

    handleExportTemplatem(){
      this.download('/zSelfNote/model', {

      }, `zSelfNote${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnportm(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this

      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

      }).catch(() => { Message({ message: "导入失败", type: 'error' })});

    },
    /** 提交按钮（数据权限） */
    submitDataScopem: 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) {

          addNote(this.formDat).then(response => {
            console.log(this.formDat)
            this.$modal.msgSuccess("新增成功");
            this.getList();
            this.open = false;
            // 清空formDat对象的数据
            Object.keys(this.formDat).forEach(key => {
              this.formDat[key] = '';
            });
            for(let i = 0; i <= this.fileList.length; i++)
            {
              this.handleRemove(this.fileList[0]);
            }
            for(let i = 0; i < this.fileListOther.length; i++){
              this.handleRemoveFile(this.fileListOther[0]);
            }
            this.getList();
          });
        }
      });
    },
   /** 删除按钮操作 */
    handleDelete1(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delNote(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    //个人记事本
    toMemo(){
      this.$router.push("/self/self/memo/" + this.individualList.userId);
@@ -1144,12 +1742,6 @@
      });
    },

    handleRemoveFile(file) {
      alert(23)
    },
    handleRemove(file) {
      alert("323")
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
@@ -1168,38 +1760,49 @@
        saveAs(blob, filename)
      })
    },
    // 编辑按钮
    handleEdit()
    {
      this.dsb = false
      this.btn = true
      this.isShow=false
      this.isShow_2=true
      this.isEditing=true
      // this.isEdit=false
    },
   cancelDataPer()
   {
      this.open = false;

      // alert(123)
      // alert(this.open)
   },

    /** 查询自传信息 */
    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());

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
          // 判断 typeOptions 数组中是否已存在相同的 value
          if (!_this.typeOptions.some(option => option.value === value)) {
            _this.typeOptions.push({ "label": label, "value": value });
          }
          // console.log(_this.typeOptions)
          // _this.getSrc1(value)
        });
      });

    },

    /** 提交按钮（数据权限） */
    //新增主要经历的保存
    submitDataScope: function() {
      this.$refs["elForm"].validate(valid => {
      let _this = this
      this.$refs["elForm1"].validate(valid => {
        if (valid) {
          addExperience(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.open = false;
            this.getList();
         //alert(1235)
            _this.dialogVisible.open = false;
          addExperience(_this.formDat).then(response => {
            _this.$modal.msgSuccess("新增成功");

            _this.getList();
          });
        }
      });
@@ -1212,9 +1815,10 @@
    submitDataScope2: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {
                 this.dialogVisible.relation1 = false;
          addRelation(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.relation1 = false;

            this.getList();
          });
        }
@@ -1256,20 +1860,49 @@
        this.formDat[key] = '';
      });
    },
    //个人自传的保存
    submitDataScope6: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          addAutobiography(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.autobiography = false;
            this.getList();
          });
          // 根据值找到选中的选项对象
          // const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);

          if (this.isEdit1) {
            // 执行修改操作
            updateAutobiography(this.formDat).then(response => {
              // 将选中选项的文本设置为"term"字段的值
              // this.formDat.term = selectedOption.value;
              // 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) {
@@ -1277,37 +1910,12 @@
      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) {
     // 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);
@@ -1320,15 +1928,15 @@
          } 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) {
     // 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);
@@ -1341,15 +1949,15 @@
          } 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) {
     // 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);
@@ -1362,15 +1970,15 @@
          } 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) {
     // 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);
@@ -1383,33 +1991,10 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
     //   }
     // });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    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})

        }
      })

    },

    /** 删除个人经历按钮操作 */
@@ -1452,18 +2037,23 @@
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 删除个人自传按钮操作 */
    handleAutobiography(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delAutobiography(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },

    /** 导出按钮操作 */
    handleExport() {
      this.download('/self/user/export', {
        ...this.queryParams
      }, `self_${new Date().getTime()}.xlsx`)
    }

  }
};
</script>

<style >
<style scoped="">
/*.uoloadSty {*/
/*  width:110px;*/
/*  height:110px;*/
@@ -1487,35 +2077,44 @@
  background: #FFEFF2;

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

.el-collapse-item__header {
  background-color:#FEF7FC;
  width: 100%;
}
.title-wrapper {
  display: flex;
  justify-content: space-between;
  align-items: center;
  width: calc(100% - 50px);
}
.left-content {

  width: 100%;
}
.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') ;
}
.btn_del{
  background:center no-repeat url('../../assets/images/删除2.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') ;
  margin-left: 69.5vw;

}
.button2 {
  background: center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 66vw;
}
.button4 {
  background: center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 69.5vw;
}
.button5 {
  background:center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 71vw;
  /*margin-right: -10px ;*/
  flex-shrink: 0;
  width: 30px;
  height: 28px;
}
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;