Merge remote-tracking branch 'origin/master'

Tcsm

2023-08-15 fbca70fb635b386eb0ec09e47bd11c5c51e059c2

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

@@ -17,26 +17,12 @@
          <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;" :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 +285,9 @@
      newOption: undefined,
      showInput: false,
      typeOption:[
        {value:'0',label:'证件'},
        {value:'1',label:'荣誉'},
        {value:'2',label:'资质'},],
        {value:'证件',label:'证件'},
        {value:'荣誉',label:'荣誉'},
        {value:'资质',label:'资质'},],
      types:undefined
    }
  },