成长经历阅历的新增以弹窗形式展示（但还有一点问题正在解决），可删除单独的一条数据 新增荣誉证书详情页面（但数据调不出来）

Tcsm

2023-05-27 97819279661596858ab40a40d321db61f297df93

成长经历阅历的新增以弹窗形式展示（但还有一点问题正在解决），可删除单独的一条数据
新增荣誉证书详情页面（但数据调不出来）

 ruoyi-ui/src/api/self/index.js

@@ -148,10 +148,10 @@
}

//删除出国情况
export function delAbroad()
export function delAbroad(ids)
{
  return request({
    url: '/zAbroad/1' ,
    url: '/zAbroad/' +ids ,
    method: 'delete',
  })
}

 ruoyi-ui/src/router/index.js

@@ -330,7 +330,22 @@
      }
    ]
  },
//证书、资质
  {
    path: '/self/honor',
    component: Layout,
    hidden: true,
    permissions: ['self:honor:info'],

    children: [
      {
        path: 'honorInfo/:id(\\d+)',
        component: () => import('@/views/honor/honorInfo'),
        name: 'honorInfo',
        meta: { title: '荣誉证书详情',activeMenu: '/self/zHonor'}
      }
    ]
  },
  {
    path: '/system/role-auth',
    component: Layout,

 ruoyi-ui/src/views/honor/honorInfo.vue

New file
@@ -0,0 +1,487 @@
<template>
  <div class="app-container">
    <div class="form-header mt">
      <h4 class="dt h4">荣誉证书详细信息 </h4>
      <!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >编辑</el-button>-->
      <!--      <br>-->
      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
      <!--                 v-hasPermi="['self:user:export']" >导出</el-button>-->
    </div>
    <div>
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
        <!--      <el-form-item label="id" prop="id">-->
        <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
        <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
        <!--      </el-form-item>-->
        <el-container>
          <div>
            <el-container>
              <el-row>
                <el-cow :span="8">
                  <el-form-item label="时间" prop="createTime" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.createTime" placeholder="请输入时间" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="类别" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="名称" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.name" placeholder="请输入名称" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="证号/专业" prop="idNo" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.idNo" placeholder="请输入证号/专业" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="级别" prop="grade" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.grade" placeholder="请输入级别" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="备注" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                  </el-form-item>
                </el-cow>
              </el-row>
            </el-container>
          </div>
          <div style="padding-left:120px">
            <el-container>
              <el-row>
                <el-cow :span="8">
                  <el-form-item label="有效时间" prop="validityDate" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.validityDate" placeholder="请输入有效时间" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="获得时间" prop="getDate" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.getDate" placeholder="请输入获得时间" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
                  <el-form-item label="存放位置" prop="location" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                    <el-input v-model="formData.location" placeholder="请输入存放位置" clearable :style="{width: '100%'}" :disabled="dsb">
                    </el-input>
                  </el-form-item>
                </el-cow>
              </el-row>
            </el-container>
          </div>
        </el-container>
        <h4 class="form-header">电子文件 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 147px; height: 147px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
        <span
          v-if="isShow"
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleDownload(file.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


          </div>
        </el-upload>

        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          list-type="picture-card"
          :on-preview="handleFileCardPreview"
          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >

          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/401_images/401.gif"
              alt=""
              style="width: 147px; height: 147px"
              fit="cover"
            >
            <span class="el-upload-list__item-actions">
                <span
                  v-if="isShow"
                  class="el-upload-list__item-preview"
                  @click="handleFileCardPreview(file)"
                >
                  <i class="el-icon-zoom-in"></i>
                </span>
                <span
                  v-if="isShow"
                  @click="handleRemove(file)"
                  class="el-upload-list__item-delete"

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


          </div>


        </el-upload>

        <el-form-item size="large">
          <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        </el-form-item>
      </el-form>
    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
  </div>
</template>

<script>
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { download,uploadPic} from "@/api/doctor/index";
import {listHonor,updateHonor} from "@/api/honor/index";

export default {
  components: {},
  props: [],
  data() {
    return {
      cdi:"荣誉证书详细信息",
      udi:"荣誉证书信息详情",
      fot:[".jpg",".jif","png"],
      fileList:[
      ],
      fileListOther:[

      ],
      dsb:true,
      btn:false,
      isShow:true,
      // 荣誉表格数据
      honorList: [],

      formData: {
        //荣誉证书记录
        id:undefined,
        type:undefined,
        createTime:undefined,
        name:undefined,
        idNo:undefined,
        grade:undefined,
        validityDate:undefined,
        getDate:undefined,
        location:undefined,
        remark:undefined,
        url: undefined,
      },
      dialogImageUrl: '',
      dialogVisible: false,
      disabled: false,
      rules: {
        createTime: [{
          required: true,
          message: '请输入创建时间',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请输入类型',
          trigger: 'blur'
        }],
        name: [{
          required: true,
          message: '请输入名称',
          trigger: 'blur'
        }],
        grade: [{
          required: true,
          message: '请输入级别',
          trigger: 'blur'
        }],
        idNo: [{
          required: true,
          message: '请输入证件号/专业',
          trigger: 'blur'
        }],
        validityDate: [{
          // required: true,
          message: '请输入有效时间',
          trigger: 'blur'
        }],
        getDate: [{
          // required: true,
          message: '请输入获得时间',
          trigger: 'blur'
        }],
        location: [{
          // required: true,
          message: '请输入存放位置',
          trigger: 'blur'
        }],
        remark: [{
          // required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
    }
  },
  computed: {},
  watch: {},
  created() {
    const id = this.$route.params && this.$route.params.id;
    let jd;
    if(this.$route.query.detail!=undefined)
    {
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      document.title = "修改荣誉证书详细信息";
      this.$route.meta.title = "修改荣誉证书详细信息";//列表的名称
    }
    else{
      document.title = "查看荣誉证书详细信息";
      this.$route.meta.title = "查看荣誉证书详细信息";//列表的名称
      this.isShow=false
    }

    let _this = this
    if (id) {
      this.loading = true;
      listHonor(id).then((response) => {
        this.formData = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {

            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            else {
              // alert(paths[i])
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        this.loading = false;
      });
      this.getCateInfor()

    }
  },
  mounted() {},
  methods: {
    /** 查询类别信息 */
    // getCateInfor()
    // {
    //   let _this = this
    //   getCategory().then(response=>{
    //
    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
    //     })
    //   })
    // },
    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.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


        if (valid) {
          if (this.formData.id != undefined) {
            updateHonor(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
    },
    resetForm() {
      this.$refs['elForm'].resetFields()
    },
    handlePreview(file)
    {
      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'property_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
    },
    handleFileCardPreview(file){
      this.dialogFileUrl = file.url;
      const Base64 = require('js-base64').Base64
      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    handleDownload(url) {
      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'honor_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleEdit()
    {
      this.dsb = false
      // this.btn = true
      this.isShow=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})

        }
      })

    },

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

  }
}

</script>

<style scoped>
.app-container{
  background-color: #FEF7FC;
}
.mt
{
  position: relative;
}
.dt{
  display: block;

}
.pt{
  right: 10px;
  top:-3px;
  display: block;
  position: absolute;
}
</style>

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

@@ -187,6 +187,9 @@
      <el-table-column label="获得时间" prop="getDate" sortable width="170" align="center" >
        <template slot-scope="scope">{{scope.row.getDate? scope.row.getDate: '————'}}</template>
      </el-table-column>
      <el-table-column label="存放位置" prop="location" sortable width="170" align="center" >
        <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="160" align="center">
        <template slot-scope="scope" >
          <img
@@ -228,12 +231,12 @@
            v-hasPermi="['system:role:remove']"
          >删除</el-button>

<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            icon="el-icon-d-arrow-right"-->
<!--            @click="handleCheck(scope.row)">-->
<!--            查看详情</el-button>-->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-d-arrow-right"
            @click="handleCheck(scope.row)">
            查看详情</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -626,7 +629,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/familymodel/Doctor/doctorInfo/" + id);
      this.$router.push("/self/honor/honorInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -634,7 +637,7 @@
      let jd = true

      this.$router.push({
        path:"/familymodel/Doctor/doctorInfo/" + id,
        path:"/self/honor/honorInfo/" + id,
        query:{
          detail:jd
        }

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

@@ -209,9 +209,9 @@

    <!--折叠面板-->
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="主要学习及工作经历" name="1">
      <el-collapse-item title="主要学习及工作经历" name="1" >
        <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" />
          <el-table-column label="开始日期" prop="startDate" sortable width="300" align="center" />
          <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" />
          <el-table-column label="证明人" prop="witness" sortable width="300" align="center" />
          <!--      操作-->
@@ -222,9 +222,9 @@
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleAdd"
                @click="showDialog1"
                v-hasPermi="['system:role:edit']"
              >修改</el-button>
              >新增</el-button>
              <el-button
                size="mini"
                type="text"
@@ -232,10 +232,14 @@
                @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 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-dropdown>-->
            </template>
          </el-table-column>
        </el-table>
@@ -257,6 +261,13 @@
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="showDialog2"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['system:role:edit']"
              >修改</el-button>
@@ -264,13 +275,13 @@
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleCertificateDelete(scope.row)"
                @click="handDelete(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 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-dropdown>-->
            </template>
          </el-table-column>
        </el-table>
@@ -305,17 +316,97 @@
          <el-table-column label="证件名称" prop="cerName" sortable width="280" align="center" />
          <el-table-column label="持有情况" prop="ownStatus" sortable width="280" align="center" />
          <el-table-column label="证件号码" prop="idNo" sortable width="280" align="center" />
          <el-table-column label="有效期" prop="validityDate"  sortable width="280" align="center">
          <el-table-column label="有效期" prop="startTime endTime"  sortable width="280" 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>
          </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="showDialog3"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>
              <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>-->
            </template>
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <el-collapse-item title="出国（境）情况" name="5">
        <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="startDate" sortable width="350" align="center" />
          <el-table-column label="起止日期" prop="startTime endTime" sortable width="350" 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>
          </el-table-column>
          <el-table-column label="所到国家或者地区" prop="destination" sortable width="350" align="center" />
          <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="cause" sortable width="400" align="center" />
          <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="showDialog4"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>
              <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>-->
            </template>
          </el-table-column>
        </el-table>
      </el-collapse-item>
    </el-collapse>
@@ -339,26 +430,6 @@
          <div v-if="item.term === '工作'"> {{item.content}}</div>
          <div v-if="item.term === '结婚后'"> {{item.content}}</div>
        </el-tab-pane>
<!--        <el-tab-pane label="婴儿"  >-->
<!--          <div v-if="AutobiographyList.term === '婴儿'" v-model="AutobiographyList.content">-->
<!--            {{AutobiographyList.content}}-->
<!--          </div>-->
<!--        </el-tab-pane>-->
<!--        <el-tab-pane label="3~6岁(幼儿期)" name="2" ></el-tab-pane>-->
<!--        <el-tab-pane label="6~12(小学)" name="3" ></el-tab-pane>-->
<!--        <el-tab-pane label="12~15(初中)" name="4"></el-tab-pane>-->
<!--        <el-tab-pane label="15~18(高中)" name="5"></el-tab-pane>-->
<!--        <el-tab-pane label="18~22(大学)" name="6"></el-tab-pane>-->
<!--        <el-tab-pane label="22~25(研究生)" name="7"></el-tab-pane>-->
<!--        <el-tab-pane label="26~ (工作)" name="8"></el-tab-pane>-->
<!--        <el-tab-pane label="？岁结婚" name="9"></el-tab-pane>-->
<!--        &lt;!&ndash;    </div>&ndash;&gt;-->
<!--        &lt;!&ndash;        <el-tab-pane&ndash;&gt;-->
<!--        &lt;!&ndash;          v-for="(item, index) in AutobiographyTermList"&ndash;&gt;-->
<!--        &lt;!&ndash;          :key="index"&ndash;&gt;-->
<!--        &lt;!&ndash;          :name="item"&ndash;&gt;-->
<!--        &lt;!&ndash;          :label="item"&ndash;&gt;-->
<!--        &lt;!&ndash;        />&ndash;&gt;-->
      </el-tabs>


@@ -372,11 +443,11 @@
      @pagination="getList"
    />

    <!-- 修改主要经历信息配置对话框 -->
    <!-- 新增主要经历信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
        <el-form-item label="起止日期" prop="startDate">
          <el-input v-model="formDat.startDate" placeholder="请输入起止日期" clearable :style="{width: '100%'}" ></el-input>
      <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" placeholder="请输入开始日期" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="主要学习经历、工作单位及任职情况" prop="content">
          <el-input v-model="formDat.content" placeholder="请输入主要学习经历、工作单位及任职情况" clearable :style="{width: '100%'}" >
@@ -391,12 +462,98 @@
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增家庭成员及主要社会关系情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="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>
        </el-form-item>
        <el-form-item label="姓名" prop="nickName">
          <el-input v-model="formDat.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="单位" prop="unit">
          <el-input v-model="formDat.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="职务" prop="position">
          <el-input v-model="formDat.position" placeholder="请输入职务" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="政治面貌" prop="politicalOutlook">
          <el-input v-model="formDat.politicalOutlook" placeholder="请输入政治面貌" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

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

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增持有出入境证件情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="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="ownStatus">
          <el-input v-model="formDat.ownStatus" placeholder="请输入持有情况" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="证件号码" prop="idNo">
          <el-input v-model="formDat.idNo" placeholder="请输入证件号码" clearable :style="{width: '100%'}" >
          </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-form-item>
        <el-form-item label="结束日期" prop="endTime">
          <el-input v-model="formDat.endTime" placeholder="请输入结束日期" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
         </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增出国（境）情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="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" 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-form-item>
        <el-form-item label="所到国家或者地区" prop="destination">
          <el-input v-model="formDat.destination" placeholder="请输入所到国家或者地区" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="事由(旅游、走访、探亲、继承财产、其他)" prop="cause">
          <el-input v-model="formDat.cause" placeholder="请输入事由(旅游、走访、探亲、继承财产、其他)" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

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

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


  </div>
@@ -409,10 +566,22 @@


//在system/note/index.js中导入接口函数  --接好了
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
  addExperience,delExperience} from "@/api/self/index";
import {
  getIndividualList,
  getIndividualRelation,
  delIndividual,
  updateIndividual,
  addIndividual,
  listExperience,
  updateExperience,
  addExperience,
  delExperience,
  delCertificate,
  addCertificate,
  addAbroad,
  delAbroad
} from "@/api/self/index";
import {
  getAbroadList,
  getAutobiography,
  getAutobiographyList,
@@ -422,6 +591,7 @@
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
import {getCategory} from "@/api/self/index";
import {addContact} from "@/api/contacts";

export default {
  name: "show",
@@ -482,6 +652,9 @@
      title: "",
      // 是否显示弹出层
      open: false,
      relation1:false,
      certificate:false,
      abroad:false,
      // open:true,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
@@ -543,6 +716,8 @@
        ownStatus:undefined,
        //出国（境）情况
        destination:undefined,
        startTime:undefined,
        endTime:undefined,
        cause:undefined,
        url: undefined,
      },
@@ -655,8 +830,52 @@
      this.reset();
    },
    //下拉
    handleChange(val) {
      console.log(val);
    handleChange(activeNames) {
      // console.log(val);
      this.reset();
      if (activeNames.includes('1')) {
        this.showDialog1();
      }else if (activeNames.includes('2')) {
        this.showDialog2();
      }else if (activeNames.includes('3')) {
        this.showDialog3();
      }else if (activeNames.includes('4')) {
        this.showDialog4();
      }else {
        this.open = false;
        this.relation1 = false;
        this.certificate =false;
        this.abroad=false
      }
    },
    //打开不同的新增弹窗
    showDialog1() {
      this.open = true;
      this.relation1 = false;
      this.certificate =false;
      this.abroad=false;
      this.title = "添加主要个人经历信息";
    },
    showDialog2() {
      this.open = false;
      this.relation1 = true;
      this.certificate =false;
      this.abroad=false;
      this.title = "添加家庭成员及主要社会关系情况";
    },
    showDialog3() {
      this.open = false;
      this.relation1 = false;
      this.certificate =true;
      this.abroad=false;
      this.title = "添加持有出入境证件情况";
    },
    showDialog4() {
      this.open = false;
      this.relation1 = false;
      this.certificate =false;
      this.abroad=true;
      this.title = "添加出国（境）情况";
    },

    //个人自传
@@ -769,8 +988,6 @@
      this.formDat.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


        if (valid) {
          if (this.formDat.id != undefined) {
            updateIndividual(this.formDat).then(response => {
@@ -886,11 +1103,11 @@
      this.isShow_2=true
    },
    //修改按钮
    /** 修改按钮操作 */
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "修改详细信息";
      // this.open = true;
      this.title = "新增详细信息";
    },
    /** 查询自传信息 */
    getAutobiographyInfor()
@@ -916,9 +1133,20 @@
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addIndividual(this.formDat).then(response => {

          addExperience(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
          addCertificate(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.certificate = false;
            this.getList();
          });
          addAbroad(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.abroad = false;
            this.getList();
          });
        }
@@ -950,7 +1178,7 @@
    /** 删除个人经历按钮操作 */
    handleExperienceDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除序号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delExperience(Ids);
      }).then(() => {
        this.getList();
@@ -960,13 +1188,23 @@
    /** 删除持有出入境证件情况按钮操作 */
    handleCertificateDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除序号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delCertificate(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 删除出国（境）情况按钮操作 */
    handleAbroadDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delAbroad(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('/self/user/export', {