1.将通讯录的”成员姓名“改成”家人姓名“ 2.修改成长经历阅历几处新增的bug

Tcsm

2023-05-30 65ef66fb1ea61a450cb75e206a3a4784794868e6

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

@@ -209,11 +209,25 @@

    <!--折叠面板-->
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="主要学习及工作经历" name="1" >
      <!--主要学习及工作经历-->
      <el-collapse-item name="1"  >
        <template v-slot:title>
          <div class="title-wrapper">
            主要学习及工作经历
            <el-button class="button" type="primary" size='mini'  @click="showDialog('open')">
              新增</el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="开始日期" prop="startDate" sortable width="300" align="center" />
          <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" />
          <el-table-column label="证明人" prop="witness" sortable width="300" align="center" />
          <el-table-column label="开始日期" prop="startDate" sortable width="300" align="center" >
            <template slot-scope="scope">{{scope.row.startDate? scope.row.startDate: '————'}}</template>
          </el-table-column>
          <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" >
            <template slot-scope="scope">{{scope.row.content? scope.row.content: '————'}}</template>
          </el-table-column>
          <el-table-column label="证明人" prop="witness" sortable width="300" align="center" >
            <template slot-scope="scope">{{scope.row.witness? scope.row.witness: '————'}}</template>
          </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">
@@ -224,7 +238,7 @@
                icon="el-icon-edit"
                @click="showDialog1"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>
              >修改</el-button>
              <el-button
                size="mini"
                type="text"
@@ -244,26 +258,36 @@
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <el-collapse-item title="家庭成员及主要社会关系情况" name="2" >
      <!--   家庭成员及主要社会关系情况   -->
      <el-collapse-item name="2" >
        <template v-slot:title>
          <div class="title-wrapper">
            家庭成员及主要社会关系情况
            <el-button class="button2" type="primary" size='mini'  @click="showDialog('relation1')">
              新增</el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="与本人关系"  prop="relation" sortable width="260" align="center" />
          <el-table-column label="姓名" prop="nickName" sortable width="260" align="center" />
          <el-table-column label="单位及职务" prop="unit position" sortable width="260" align="center">
          <el-table-column label="与本人关系"  prop="relation" sortable width="260" align="center" >
            <template slot-scope="scope">{{scope.row.relation? scope.row.relation: '————'}}</template>
          </el-table-column>
          <el-table-column label="姓名" prop="otherName" sortable width="260" align="center" >
            <template slot-scope="scope">{{scope.row.otherName? scope.row.otherName: '————'}}</template>
          </el-table-column>
          <el-table-column label="单位及职务" prop="otherUnit position" sortable width="260" align="center">
            <template slot-scope="scope">
              {{scope.row.unit}}/{{scope.row.position}}
              <span v-if="scope.row.otherUnit || scope.row.otherPosition  == true">
                {{scope.row.otherUnit}}/{{scope.row.otherPosition}}
              </span>
              <span v-else>————</span>
            </template>
          </el-table-column>
          <el-table-column label="政治面貌" prop="politicalOutlook" sortable width="260" align="center"/>
          <el-table-column label="政治面貌" prop="otherPolitical" sortable width="260" align="center">
            <template slot-scope="scope">{{scope.row.otherPolitical? scope.row.otherPolitical: '————'}}</template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
              <el-button
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="showDialog2"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>
              <el-button
                size="mini"
                type="text"
@@ -275,7 +299,7 @@
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handDelete(scope.row)"
                @click="handleRelationDelete(scope.row)"
                v-hasPermi="['system:role:remove']"
              >删除</el-button>
<!--              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">-->
@@ -310,12 +334,26 @@
        </div>

      </el-collapse-item>
      <el-collapse-item title="持有出入境证件情况" name="4">
      <!--持有出入境证件情况-->
      <el-collapse-item  name="4">
        <template v-slot:title>
          <div class="title-wrapper">
            持有出入境证件情况
            <el-button class="button" type="primary" size='mini'  @click="showDialog('certificate')">
              新增</el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="证件名称" prop="cerName" sortable width="280" align="center" />
          <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="cerName" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.cerName? scope.row.cerName: '————'}}</template>
          </el-table-column>
          <el-table-column label="持有情况" prop="ownStatus" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.ownStatus? scope.row.ownStatus: '————'}}</template>
          </el-table-column>
          <el-table-column label="证件号码" prop="idNo" sortable width="280" align="center" >
            <template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '————'}}</template>
          </el-table-column>
          <el-table-column label="有效期" prop="startTime endTime"  sortable width="280" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.startTime || scope.row.endTime  == true">
@@ -327,13 +365,6 @@
          <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"
@@ -360,7 +391,15 @@
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <el-collapse-item title="出国（境）情况" name="5">
      <!--出国（境）情况-->
      <el-collapse-item  name="5">
        <template v-slot:title>
          <div class="title-wrapper">
            出国（境）情况
            <el-button class="button5" type="primary" size='mini'  @click="showDialog('abroad')">
              新增</el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
                  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column label="起止日期" prop="startTime endTime" sortable width="350" align="center" >
@@ -371,18 +410,16 @@
              <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="所到国家或者地区" prop="destination" sortable width="350" align="center" >
            <template slot-scope="scope">{{scope.row.destination? scope.row.destination: '————'}}</template>
          </el-table-column>
          <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="cause" sortable width="420" align="center" >
            <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '————'}}</template>
          </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="showDialog4"
                v-hasPermi="['system:role:edit']"
              >新增</el-button>

              <el-button
                size="mini"
                type="text"
@@ -444,7 +481,7 @@
    />

    <!-- 新增主要经历信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
    <el-dialog :title="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" placeholder="请输入开始日期" clearable :style="{width: '100%'}" ></el-input>
@@ -467,25 +504,25 @@
      </div>
    </el-dialog>
    <!-- 新增家庭成员及主要社会关系情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="relation1" width="900px" append-to-body>
    <el-dialog :title="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>
        </el-form-item>
        <el-form-item label="姓名" prop="nickName">
          <el-input v-model="formDat.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" >
        <el-form-item label="姓名" prop="otherName">
          <el-input v-model="formDat.otherName" 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-form-item label="单位" prop="otherUnit">
          <el-input v-model="formDat.otherUnit" 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-form-item label="职务" prop="otherPosition">
          <el-input v-model="formDat.otherPosition" 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-form-item label="政治面貌" prop="otherPolitical">
          <el-input v-model="formDat.otherPolitical" placeholder="请输入政治面貌" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

@@ -493,12 +530,12 @@
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button type="primary" @click="submitDataScope2">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增持有出入境证件情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="certificate" width="900px" append-to-body>
    <el-dialog :title="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%'}" >
@@ -523,12 +560,12 @@
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button type="primary" @click="submitDataScope4">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 新增出国（境）情况信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="abroad" width="900px" append-to-body>
    <el-dialog :title="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" placeholder="请输入开始日期" clearable :style="{width: '100%'}" ></el-input>
@@ -550,7 +587,7 @@
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button type="primary" @click="submitDataScope5">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
@@ -566,32 +603,17 @@


//在system/note/index.js中导入接口函数  --接好了
import {
  getIndividualList,
  getIndividualRelation,
  delIndividual,
  updateIndividual,
  addIndividual,
  listExperience,
  updateExperience,
  addExperience,
  delExperience,
  delCertificate,
  addCertificate,
  addAbroad,
  delAbroad
} from "@/api/self/index";
import {
  getAbroadList,
  getAutobiography,
  getAutobiographyList,
  getAutobiographyTermList,
  getCertificateList
} from "@/api/self/index"
import {getIndividualList, addIndividual, updateIndividual, delIndividual,
        listExperience,  addExperience,updateExperience, delExperience,
        getIndividualRelation,addRelation,updateRelation,delRelation,
        getCertificateList, addCertificate, delCertificate,
        getAbroadList,addAbroad, delAbroad,
        getAutobiographyList, getAutobiographyTermList,
        getCategory} from "@/api/self/index";
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",
@@ -647,14 +669,18 @@
      // current: 0,

      //下拉实现
      activeNames:['1'],
      activeNames:'',
      dialogVisible: {
        open: false,
        relation1:false,
        certificate:false,
        abroad:false,
      },
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      relation1:false,
      certificate:false,
      abroad:false,

      // open:true,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
@@ -710,6 +736,10 @@
        remark: undefined,
        //家庭成员及主要社会关系情况
        relation:undefined,
        otherName:undefined,
        otherUnit:undefined,
        otherPosition:undefined,
        otherPolitical:undefined,
        //持有出入境证件情况
        cerName:undefined,
        validityDate:undefined,
@@ -764,7 +794,7 @@
        }],
        maritalStatus: [{
          // required: true,
          message: '请输入民族',
          message: '请输入婚姻状况',
          trigger: 'blur'
        }],
        locationAddress: [{
@@ -826,56 +856,19 @@
  methods: {
    // 取消按钮
    cancelData() {
      this.open = false;
      this.dialogVisible.open = false;
      this.dialogVisible.relation1 = false;
      this.dialogVisible.certificate =false;
      this.dialogVisible.abroad=false
      this.reset();
    },
    //下拉
    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 = "添加出国（境）情况";
    showDialog(dialogName) {
      this.dialogVisible[dialogName] = true;
    },

    //个人自传
@@ -985,12 +978,12 @@
      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.individualList.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {
        if (valid) {
          if (this.formDat.id != undefined) {
            updateIndividual(this.formDat).then(response => {
          if (this.individualList.id !== undefined) {
            updateIndividual(this.individualList).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
@@ -1004,7 +997,7 @@
    },
    // 表单重置
    reset() {
      if (this.$refs.menu != undefined) {
      if (this.$refs.menu !== undefined) {
        this.$refs.menu.setCheckedKeys([]);
      }
      this.menuExpand = false,
@@ -1130,20 +1123,69 @@
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls

      this.$refs["elForm"].validate(valid => {
        if (valid) {


          addExperience(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      });
    },
    submitDataScope2: 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) {
          addRelation(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.relation1 = false;
            this.getList();
          });
        }
      });
    },
    submitDataScope4: 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) {
          addCertificate(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.certificate = false;
            this.getList();
          });
        }
      });
    },
    submitDataScope5: 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) {
          addAbroad(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.abroad = false;
@@ -1152,6 +1194,7 @@
        }
      });
    },

    requestUpload(params)
    {
      var file = params.file;
@@ -1175,11 +1218,22 @@
      })

    },

    /** 删除个人经历按钮操作 */
    handleExperienceDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delExperience(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 删除成员关系按钮操作 */
    handleRelationDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？'+Ids).then(function() {
        return delRelation(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
@@ -1198,13 +1252,14 @@
    /** 删除出国（境）情况按钮操作 */
    handleAbroadDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？'+Ids).then(function() {
        return delAbroad(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },

    /** 导出按钮操作 */
    handleExport() {
      this.download('/self/user/export', {
@@ -1245,4 +1300,18 @@
.el-collapse-item__header {
  background-color:#FEF7FC;
}
.title-wrapper {
  display: flex;
  justify-content: space-between;
}

.button {
  margin-left: 67.6vw;
}
.button2 {
  margin-left: 64vw;
}
.button5 {
  margin-left: 69.5vw;
}
</style>