1.将收藏荣誉、荣誉证书中的时间字段变成了可选项 2.成长经历阅历主要经历变成长文本框，新增按钮接入蓝湖样式，点击保存之后可以自动刷新

Tcsm

2023-06-05 c9f3bc911ddb0a10768fd73641728a43320e97d1

1.将收藏荣誉、荣誉证书中的时间字段变成了可选项
2.成长经历阅历主要经历变成长文本框，新增按钮接入蓝湖样式，点击保存之后可以自动刷新

 ruoyi-ui/src/assets/icons/add.png

 ruoyi-ui/src/views/collection/collectionInfo.vue

@@ -20,6 +20,9 @@
                <el-input v-model="formData.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
<!--               <el-form-item label="获得时间" prop="happenTime" label-width="78px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
<!--                 <el-date-picker v-model='formData.happenTime' type='date' placeholder='请选择日期'></el-date-picker>-->
<!--               </el-form-item>-->
             </el-cow>
             <el-cow >
               <el-form-item label="类别" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">

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

@@ -51,16 +51,20 @@
                  -->
      </el-form-item>

      <el-form-item label="时间" style="padding-left:190px">
      <el-form-item label="时间">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px"
          value-format="yyyy-MM-dd HH-MM"
          style="width:  197px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @keyup.enter.native="handleQuery"
        ></el-date-picker>
      </el-form-item>

@@ -280,8 +284,11 @@
    <!-- 添加收藏与荣誉信息配置对话框 -->
    <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-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>-->
<!--        </el-form-item>-->
        <el-form-item label="获得时间" prop="happenTime">
          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>
          <el-date-picker v-model='formDat.happenTime' type='date' placeholder='选择日期'></el-date-picker>
        </el-form-item>
        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
@@ -469,7 +476,7 @@
        type:undefined,
        owner:undefined,
        location:undefined,
        happenTime:undefined,
        // happenTime:undefined,
      },
      // searchVal:"",

@@ -488,8 +495,8 @@
          trigger: 'blur'
        }],
        happenTime: [{
          // required: true,
          message: '请输入时间',
          required: true,
          message: '请选择时间',
          trigger: 'blur'
        }],
        name: [{
@@ -578,7 +585,10 @@
    /** 查询记录列表 */
    getList() {
      this.loading = true;
      // console.log(this.queryParams)
      console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listCollection(this.queryParams).then(response => {
          //  alert(123)

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

@@ -270,9 +270,12 @@
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="时间" prop="createTime">
          <el-input v-model="formDat.createTime" placeholder="请输入创建时间" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.createTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
<!--        <el-form-item label="获得时间" prop="happenTime">-->
<!--          <el-date-picker v-model='formDat.happenTime' type='date' placeholder='选择日期'></el-date-picker>-->
<!--        </el-form-item>-->
        <el-form-item label="类别" prop="type">
<!--          <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" >-->
<!--          </el-input>-->
@@ -293,11 +296,11 @@
          </el-input>
        </el-form-item>
        <el-form-item label="有效时间" prop="validityDate">
          <el-input v-model="formDat.validityDate" placeholder="请输入有效时间" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.validityDate" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="获得时间" prop="getDate">
          <el-input v-model="formDat.getDate" placeholder="请输入获得时间" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.getDate" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="存放位置" prop="location">
@@ -549,7 +552,9 @@
    /** 查询记录列表 */
    getList() {
      this.loading = true;
      // console.log(this.queryParams)
      console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listHonor(this.queryParams).then(response => {
          //  alert(123)

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

@@ -214,8 +214,10 @@
        <template v-slot:title>
          <div class="title-wrapper">
            主要学习及工作经历
            <el-button class="button" type="primary" size='mini'  @click="showDialog('open')">
              新增</el-button>
            <div>
            <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>
        </template>
        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
@@ -263,8 +265,9 @@
        <template v-slot:title>
          <div class="title-wrapper">
            家庭成员及主要社会关系情况
            <el-button class="button2" type="primary" size='mini'  @click="showDialog('relation1')">
              新增</el-button>
            <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>
          </div>
        </template>
        <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
@@ -339,8 +342,8 @@
        <template v-slot:title>
          <div class="title-wrapper">
            持有出入境证件情况
            <el-button class="button" type="primary" size='mini'  @click="showDialog('certificate')">
              新增</el-button>
            <el-button class="button4" size="mini" type="text"  @click="showDialog('certificate')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
@@ -396,8 +399,8 @@
        <template v-slot:title>
          <div class="title-wrapper">
            出国（境）情况
            <el-button class="button5" type="primary" size='mini'  @click="showDialog('abroad')">
              新增</el-button>
            <el-button class="button5" size="mini" type="text"  @click="showDialog('abroad')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          </div>
        </template>
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
@@ -453,22 +456,26 @@
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >自传</h2></div>
      </el-container>
      <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>

      <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>

@@ -484,10 +491,10 @@
    <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>
          <el-input v-model="formDat.startDate" type='date' 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%'}" >
          <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="请输入主要学习经历、工作单位及任职情况" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="证明人" prop="witness">
@@ -568,14 +575,14 @@
    <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>
          <el-input v-model="formDat.startTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="结束日期" prop="endTime">
          <el-input v-model="formDat.endTime" placeholder="请输入结束日期" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.endTime" type='date' 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 v-model="formDat.destination" type="textarea" :rows="5" placeholder="请输入所到国家或者地区" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="事由(旅游、走访、探亲、继承财产、其他)" prop="cause">
@@ -588,6 +595,40 @@

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope5">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
    <!--新增自传-->
    <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" >
      <el-col >
        <el-form ref="elForm" :model="AutobiographyList" :rules="rules" size="medium"  label-position="left"
                 v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange" >
          <el-row :span="5">
            <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px">
              <el-input v-model="AutobiographyList.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 ——</span>
              <el-input v-model="AutobiographyList.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 </span>
          </el-form-item>
            <el-form-item label="时期：" prop="term">
              <el-select v-model="formDat.type" 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-form-item>
            <el-form-item label="内容编辑：" prop="content">
              <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
              </el-input>
            </el-form-item>
          </el-row>
        </el-form>
      </el-col>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope6">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>
@@ -608,7 +649,7 @@
        getIndividualRelation,addRelation,updateRelation,delRelation,
        getCertificateList, addCertificate, delCertificate,
        getAbroadList,addAbroad, delAbroad,
        getAutobiographyList, getAutobiographyTermList,
        getAutobiographyList, getAutobiographyTermList,addAutobiography,
        getCategory} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
@@ -675,6 +716,7 @@
        relation1:false,
        certificate:false,
        abroad:false,
        autobiography:false
      },
      // 弹出层标题
      title: "",
@@ -750,6 +792,10 @@
        endTime:undefined,
        cause:undefined,
        url: undefined,
        //自传
        ageBegin:undefined,
        ageEnd:undefined,
        term:undefined
      },
      // 菜单列表
      menuOptions: [],
@@ -835,8 +881,8 @@
          trigger: 'blur'
        }],
        content: [{
          required: true,
          message: '请输入主要学习经历、工作单位及任职情况',
          // required: true,
          message: '请输入',
          trigger: 'blur'
        }],
        witness: [{
@@ -859,7 +905,8 @@
      this.dialogVisible.open = false;
      this.dialogVisible.relation1 = false;
      this.dialogVisible.certificate =false;
      this.dialogVisible.abroad=false
      this.dialogVisible.abroad=false;
      this.dialogVisible.autobiography=false
      this.reset();
    },
    //下拉
@@ -1128,7 +1175,7 @@
        if (valid) {
          addExperience(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.dialogVisible.open = false;
            this.getList();
          });
        }
@@ -1148,7 +1195,7 @@
        if (valid) {
          addRelation(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.relation1 = false;
            this.dialogVisible.relation1 = false;
            this.getList();
          });
        }
@@ -1168,7 +1215,7 @@
        if (valid) {
          addCertificate(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.certificate = false;
            this.dialogVisible.certificate = false;
            this.getList();
          });
        }
@@ -1188,7 +1235,27 @@
        if (valid) {
          addAbroad(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.abroad = false;
            this.dialogVisible.abroad = false;
            this.getList();
          });
        }
      });
    },
    submitDataScope6: 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) {
          addAutobiography(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.autobiography = false;
            this.getList();
          });
        }
@@ -1304,14 +1371,24 @@
  display: flex;
  justify-content: space-between;
}

.btn_autobiography{
  background:center no-repeat url('../../assets/icons/add.png') ;
}
.button {
  margin-left: 67.6vw;
  background:center no-repeat url('../../assets/icons/add.png') ;
  margin-left: 69.5vw;

}
.button2 {
  margin-left: 64vw;
  background: center no-repeat url('../../assets/icons/add.png') ;
  margin-left: 66vw;
}
.button4 {
  background: center no-repeat url('../../assets/icons/add.png') ;
  margin-left: 69.5vw;
}
.button5 {
  margin-left: 69.5vw;
  background:center no-repeat url('../../assets/icons/add.png') ;
  margin-left: 71vw;
}
</style>

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

New file
@@ -0,0 +1,13 @@
<template>
 <div>hello</div>
</template>

<script>
export default {
  name: "index"
}
</script>

<style scoped>

</style>