完善荣誉证书模块的类别和名称的选择输入功能；家根网可以按照身份、姓名搜索；成长经历阅历的各个小模块的时间在修改时变成可选形式

Tcsm

2023-08-15 ecec72d382a83718d3b1d8e60a473829c8d90d40

完善荣誉证书模块的类别和名称的选择输入功能；家根网可以按照身份、姓名搜索；成长经历阅历的各个小模块的时间在修改时变成可选形式

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

@@ -48,14 +48,11 @@
      </el-form-item>

      <el-form-item label="性别" prop="sex">
        <el-input
          v-model="queryParams.sex"
          placeholder="请输入性别"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable
                   style="width: 240px" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOption"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>

      <el-form-item label="生日" prop="birth">
@@ -404,6 +401,14 @@
        }],

      },
      typeOption: [{
        value: '1',
        label: '男',
      },
        {
          value: '0',
          label: '女',
        }],
      typeOptions: [{
        value:'1',
        label:'第1代'

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

@@ -25,18 +25,10 @@
<!--                </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;" :disabled="dsb">
                    <template v-if="!isEditing" >
                      <el-input v-if="formData.type===0" placeholder="证件"></el-input>
                      <el-input v-if="formData.type===1" placeholder="荣誉"></el-input>
                      <el-input v-if="formData.type===2" placeholder="资质"></el-input>
                    </template>
                    <template v-else>
                    <el-select v-model="types" 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 v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"   :disabled="dsb">
                      <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
                      ></el-option>
                    </el-select>
                    </template>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
@@ -299,9 +291,9 @@
      newOption: undefined,
      showInput: false,
      typeOption:[
        {value:'0',label:'证件'},
        {value:'1',label:'荣誉'},
        {value:'2',label:'资质'},],
        {value:'证件',label:'证件'},
        {value:'荣誉',label:'荣誉'},
        {value:'资质',label:'资质'},],
      types:undefined
    }
  },

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

@@ -137,8 +137,8 @@
      <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="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!--        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>-->
        <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>
        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
<!--        <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>-->
      </el-table-column>
      <el-table-column label="名称" prop="name" sortable  width="120" align="center" >
        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
@@ -479,9 +479,9 @@
      newOption: undefined,
      showInput: true,
      typeOption:[
        {value:'0',label:'证件'},
        {value:'1',label:'荣誉'},
        {value:'2',label:'资质'},]
        {value:'证件',label:'证件'},
        {value:'荣誉',label:'荣誉'},
        {value:'资质',label:'资质'},]

    };
  },
@@ -509,7 +509,7 @@
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
        this.$set(this.formDat, 'name', newOption); // 更新formDat.type的值为新的选项
      }
    },
    /** 查询记录列表 */

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

@@ -1259,18 +1259,22 @@
    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());
          _this.typeOptions.push({ "label": label, "value": value });
          // this.getSrc1(value)
        })
      })

          // 判断 typeOptions 数组中是否已存在相同的 value
          if (!_this.typeOptions.some(option => option.value === value)) {
            _this.typeOptions.push({ "label": label, "value": value });
          }
          // console.log(_this.typeOptions)
          // _this.getSrc1(value)
        });
      });

      // if(AutobiographyList.ageEnd==null){
      //   this.AgeEnd='?'
@@ -1438,6 +1442,7 @@
      // 刷新页面
      // window.location.reload();
    },
    //头像修改
    uploadImage() {
      const inputElement = document.createElement("input");
      inputElement.type = "file";