linwenling
2023-08-08 49bf04d7865d999463a024b82a6cd7608bb89507
Merge remote-tracking branch 'origin/master'
14个文件已修改
681 ■■■■■ 已修改文件
ruoyi-ui/src/api/collection/index.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/doctor/index.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/honor/index.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/collectionInfo.vue 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/doctorInfo.vue 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/healthyInfo.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/honorInfo.vue 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/index.vue 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/memoInfo.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/wishInfo.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/collection/index.js
@@ -9,6 +9,15 @@
  })
}
//类别数据
export function listType(query) {
  return request({
    url: '/zfCollection/type',
    method: 'get',
    params: query
  })
}
// 根据id查询收藏和荣誉
export function getCollection(id) {
  return request({
ruoyi-ui/src/api/doctor/index.js
@@ -8,6 +8,14 @@
    params: query
  })
}
//类别数据
export function listType(query) {
  return request({
    url: '/zfDoctor/type',
    method: 'get',
    params: query
  })
}
// 根据id查询记录
export function getDoctor(id) {
ruoyi-ui/src/api/honor/index.js
@@ -8,6 +8,14 @@
    params: query
  })
}
//名称数据
export function listType(query) {
  return request({
    url: '/zHonor/type',
    method: 'get',
    params: query
  })
}
// 根据id查询记录
export function getHonor(query) {
  return request({
ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -21,16 +21,15 @@
                </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;">
                 <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
                 <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"   :disabled="dsb">
                   <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                   ></el-option>
                 </el-select>
                 <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类别,请在此输入新的类别" @change="addNewOption"></el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
@@ -90,14 +89,14 @@
              >
              <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)"
                >
@@ -139,14 +138,14 @@
                fit="cover"
              >
              <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                    <span
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
@@ -186,7 +185,8 @@
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import {getCollection, updateCollection,download,uploadPic} from "@/api/collection/index";
import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";
export default {
  components: {},
@@ -195,7 +195,8 @@
    return {
      cdi:"收藏与荣誉详细信息",
      udi:"收藏与荣誉信息详情",
      fot:[".jpg",".jif"],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[
      ],
      fileListOther:[
@@ -206,7 +207,7 @@
      isShow:true,
      // 收藏与荣誉表格数据
     collectionList: [],
      typeList:[],
      formData: {
        //收藏与荣誉记录
        id:undefined,
@@ -267,30 +268,9 @@
        }],
      },
      typeOptions: [
        {
          value: '邮票',
          label: '邮票'
        }, {
          value: '日本军刀',
          label: '日本军刀'
        }, {
          value: '茅台酒',
          label: '茅台酒'
        }, {
          value: '红木',
          label: '红木'
        }, {
          value: '纪念品',
          label: '纪念品'
        }, {
          value: '瓷器',
          label: '瓷器'
        }, {
          value: '书籍',
          label: '书籍'
        }
      ],
      typeOptions: [],
      newOption: undefined,
      showInput: false
    }
  },
  computed: {},
@@ -303,6 +283,7 @@
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.showInput=true
      document.title = "修改收藏与荣誉详细信息";
      this.$route.meta.title = "修改收藏与荣誉详细信息";//列表的名称
    }
@@ -336,6 +317,15 @@
        }
        this.loading = false;
      });
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
      // this.getCateInfor()
    }
@@ -353,6 +343,31 @@
    //     })
    //   })
    // },
    //类别
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formData, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
    },
    submitForm() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
ruoyi-ui/src/views/collection/index.vue
@@ -69,22 +69,13 @@
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-select
          v-model="queryParams.type"
          placeholder="所有类别"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        >
          <el-option
            v-for="item in typeOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        <el-select v-model="queryParams.type" placeholder="所有类别" clearable
                   style="width: 240px" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOptions"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>
      <el-cntainer>
        <el-col :span="9" >
          <el-form-item>
@@ -195,8 +186,8 @@
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="类别" prop="type" sortable width="120" align="center">
        <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
<!--        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>-->
<!--        <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
      </el-table-column>
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
@@ -297,6 +288,7 @@
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
          <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类别,请在此输入新的类别" @change="addNewOption"></el-input>
        </el-form-item>
        <el-form-item label="名称" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入名称" clearable :style="{width: '100%'}" >
@@ -403,7 +395,7 @@
//导入接口函数
import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
import {enload} from "@/api/doctor";
import {Message} from "element-ui";
@@ -430,6 +422,7 @@
      total: 0,
      // 收藏与荣誉表格数据
      collectionList: [],
      typeList:[],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -443,12 +436,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[
      ],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],
@@ -533,35 +524,15 @@
          trigger: 'blur'
        }],
      },
      typeOptions: [
        {
          value: '邮票',
          label: '邮票'
        }, {
          value: '日本军刀',
          label: '日本军刀'
        }, {
          value: '茅台酒',
          label: '茅台酒'
        }, {
          value: '红木',
          label: '红木'
        }, {
          value: '纪念品',
          label: '纪念品'
        }, {
          value: '瓷器',
          label: '瓷器'
        }, {
          value: '书籍',
          label: '书籍'
        }
      ],
      typeOptions: [],
      newOption: undefined,
      showInput: true
    };
  },
  created() {
    this.getList();
    this.getCateInfor()
    this.getTypeOptions();
    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -584,6 +555,14 @@
        return "statistics-warning-row";
      }
    },
    //类别
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    /** 查询记录列表 */
    getList() {
      this.loading = true;
@@ -596,23 +575,48 @@
          //  alert(123)
          //   console.log(response.data)
          this.collectionList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
    },
    /** 查询类别信息 */
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    },
    // /** 查询类别信息 */
    // 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]})
    //     })
    //   })
    // },
    //类别选择
    getSrc(type) {
      if (type === '邮票') {
ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -18,11 +18,12 @@
        <el-container>
          <el-row>
            <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-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
              <el-form-item label="类别" prop="type" label-width="55px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"   :disabled="dsb">
                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                  ></el-option>
                </el-select>
                <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类别,请在此输入新的类别" @change="addNewOption"></el-input>
            </el-form-item>
            </el-cow>
            <el-cow :span="8">
@@ -190,7 +191,7 @@
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { getDoctor, updateDoctor,download,uploadPic} from "@/api/doctor/index";
import {getDoctor, updateDoctor, download, uploadPic, listType} from "@/api/doctor/index";
export default {
  components: {},
@@ -199,18 +200,16 @@
    return {
      cdi:"就医记录详细信息",
      udi:"就医记录信息详情",
      fot:[".jpg",".jif","png"],
      fileList:[
      ],
      fileListOther:[
      ],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      isShow:true,
      // 就医记录表格数据
      doctorList: [],
      typeList:[],
      formData: {
        //就医记录
        id:undefined,
@@ -230,7 +229,7 @@
      rules: {
        type: [{
          required: true,
          message: '请输入类型',
          message: '请输入类别',
          trigger: 'blur'
        }],
        symptom: [{
@@ -271,16 +270,9 @@
        }],
      },
      typeOptions: [{
        value:'神经科',
        label:'神经科'
      },{
        value:'牙科',
        label:'牙科'
      },{
        value:'内科',
        label:'内科'
      }],
      typeOptions: [],
      newOption: undefined,
      showInput: false
    }
  },
  computed: {},
@@ -294,6 +286,7 @@
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      this.showInput=true
      document.title = "修改就医记录详细信息";
      this.$route.meta.title = "修改就医记录详细信息";//列表的名称
    }
@@ -327,7 +320,16 @@
        }
        this.loading = false;
      });
      this.getCateInfor()
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
      // this.getCateInfor()
    }
  },
@@ -344,6 +346,31 @@
    //     })
    //   })
    // },
    //类别
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formData, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
    },
    submitForm() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
ruoyi-ui/src/views/doctor/index.vue
@@ -52,27 +52,10 @@
      </el-form-item>
      <el-form-item label="类别" prop="type">
<!--        <el-input-->
<!--          v-model="queryParams.type"-->
<!--          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.type"
          placeholder="所有类别"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        >
          <el-option
            v-for="item in typeOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        <el-select v-model="queryParams.type" placeholder="所有类别" clearable
          style="width: 240px" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOptions"
            :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>
@@ -202,7 +185,7 @@
    <el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="25"  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 width="80" align="center">
      <el-table-column label="类别" prop="type" sortable width="80" align="center">
<!--        <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
      </el-table-column>
@@ -293,7 +276,7 @@
    <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="type">
        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
@@ -409,7 +392,7 @@
//导入接口函数
import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic} from "@/api/doctor/index";
import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType} from "@/api/doctor/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -434,6 +417,7 @@
      total: 0,
      // 小医生表格数据
      doctorList: [],
      typeList:[],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -447,7 +431,8 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
@@ -496,7 +481,7 @@
        type: [{
          // required: true,
          message: '请输入类型',
          message: '请输入类别',
          trigger: 'blur'
        }],
        symptom: [{
@@ -536,23 +521,15 @@
          trigger: 'blur'
        }],
      },
      typeOptions: [{
        value:'神经科',
        label:'神经科'
      },{
        value:'牙科',
        label:'牙科'
      },{
        value:'内科',
        label:'内科'
      }],
      typeOptions: [],
      newOption: undefined,
      showInput: true
    };
  },
  created() {
    this.getList();
    this.getCateInfor()
    // this.getCateInfor();
    this.getTypeOptions();
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -580,6 +557,7 @@
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    /** 查询记录列表 */
    getList() {
      this.loading = true;
@@ -589,11 +567,36 @@
          //  alert(123)
          //   console.log(response.data)
          this.doctorList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
        // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
    },
    /** 查询类别信息 */
    // getCateInfor()
ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -51,14 +51,14 @@
          >
          <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)"
          >
@@ -101,14 +101,14 @@
          >
          <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"
                    class="el-upload-list__item-delete"
                    @click="handleDownload(file.url)"
                  >
ruoyi-ui/src/views/honor/honorInfo.vue
@@ -24,30 +24,29 @@
<!--                  </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-select v-model="formData.type" placeholder="请选择类别" clearable style="width: 300px">
                      <el-option v-for="dict in typeOption" :key="dict.value"
                        :label="dict.label" :value="dict.value"/>
                  <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>
                    </template>
                  </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-select v-model="formData.name" placeholder="请选择类别" clearable style="width: 300px">
                      <el-option v-for="dict in typeOptions" :key="dict.value"
                                 :label="dict.label" :value="dict.value"/>
                    <el-select v-model="formData.name" placeholder="请选择名称" clearable :style="{width: '100%'}"   :disabled="dsb">
                      <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                      ></el-option>
                    </el-select>
<!--                    <template v-if="dsb" >-->
<!--                      <el-input v-if="formData.name==0" placeholder="未婚"></el-input>-->
<!--                      <el-input v-if="formData.name==1" placeholder="已婚"></el-input>-->
<!--                      <el-input v-if="formData.name==2" placeholder="学生证"></el-input>-->
<!--                    </template>-->
<!--                    <template v-else>-->
<!--                      <el-select v-model="formData.name" placeholder="请选择类别" clearable style="width: 300px" :disabled="dsb">-->
<!--                        <el-option v-for="dict in typeOptions" :key="dict.value"-->
<!--                                   :label="dict.label" :value="dict.value"/>-->
<!--                      </el-select>-->
<!--                    </template>-->
                    <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应名称,请在此输入新的名称" @change="addNewOption"></el-input>
                  </el-form-item>
                </el-cow>
                <el-cow :span="8">
@@ -115,14 +114,14 @@
            >
            <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)"
        >
@@ -165,14 +164,14 @@
            >
            <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"
                  class="el-upload-list__item-delete"
                  @click="handleDownload(file.url)"
                >
@@ -210,7 +209,7 @@
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { download,uploadPic} from "@/api/doctor/index";
import {updateHonor,getHonor,getCategory} from "@/api/honor/index";
import {updateHonor,getHonor,getCategory, listType} from "@/api/honor/index";
export default {
  components: {},
@@ -219,18 +218,17 @@
    return {
      cdi:"荣誉证书详细信息",
      udi:"荣誉证书信息详情",
      fot:[".jpg",".jif","png"],
      fileList:[
      ],
      fileListOther:[
      ],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      isShow:true,
      isEditing: false,
      // 荣誉表格数据
      honorList: [],
      typeList:[],
      formData: {
        //荣誉证书记录
        id:undefined,
@@ -296,10 +294,13 @@
        }],
      },
      typeOptions: [],
      newOption: undefined,
      showInput: false,
      typeOption:[
        {value:'1',label:'荣誉'},
        {value:'0',label:'证件'},
        {value:'2',label:'资质'},]
        {value:'1',label:'荣誉'},
        {value:'2',label:'资质'},],
      types:undefined
    }
  },
  computed: {},
@@ -307,12 +308,20 @@
  created() {
    const id = this.$route.params && this.$route.params.id;
    let jd;
    if(this.formData.type == 0)
      this.types = '证件'
    else if(this.formData.type== 1)
      this.types = '荣誉'
    else
      this.types = '资质'
    if(this.$route.query.detail!=undefined)
    {
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      this.showInput=true
      this.isEditing=true
      document.title = "修改荣誉证书详细信息";
      this.$route.meta.title = "修改荣誉证书详细信息";//列表的名称
    }
@@ -346,9 +355,17 @@
        }
        this.loading = false;
      });
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
      this.fetchData()
      this.getCateInfor()
      // this.getCateInfor()
    }
@@ -367,28 +384,39 @@
          console.error('Error:', error); // 处理错误
        });
    },
    //类别
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formData, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      // 创建一个空对象用于存储唯一的字符串选项
      const uniqueOptions = {};
      // 构建下拉选项列表
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
    },
    //类别选择
    getSrc(type) {
      if (type === 1){
        return '出生证'
    getSrc1(type){
      if(type===0){
        return '证件'
      }else if(type===1){
        return '荣誉'
      }else if(type === 2){
        return '学生证'
      }else if(type === 3){
        return '毕业证'
      }else if(type === 4){
        return '结婚证'
      }else if(type === 5){
        return '户口簿'
      }else if(type === 6){
        return '独生子女证'
      }else if(type === 7){
        return '高级职称'
      }else if(type === 8){
        return '护照'
      }else if(type === 9){
        return '通行证'
      }else {
        return '其它'
        return '资质'
      }
    },
    /** 查询类别信息 */
@@ -408,6 +436,13 @@
      })
    },
    submitForm() {
      if(this.types=='0')
        this.formData.type = 0
      else if(this.types == '1')
        this.formData.type = 1
      else if(this.types == '2')
        this.formData.type = 2
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
ruoyi-ui/src/views/honor/index.vue
@@ -50,27 +50,11 @@
                  -->
      </el-form-item>
      <el-form-item label="名称" prop="name">
<!--        <el-input-->
<!--          v-model="queryParams.name"-->
<!--          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.name"
          placeholder="所有类别"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        >
          <el-option
            v-for="dic in typeOptions"
            :key="dic.value"
            :label="dic.label"
            :value="dic.value"
          />
        <el-select v-model="queryParams.name" placeholder="所有名称" clearable
                   style="width: 240px" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOptions"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>
      <el-form-item label="类别" prop="type" >
@@ -203,19 +187,20 @@
      </el-table-column>
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!--        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>-->
        <template slot-scope="scope">
<!--        <template slot-scope="scope">-->
<!--          <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>-->
          <template v-if="scope.row.name == 1">出生证</template>
          <template v-else-if="scope.row.name == 2">学生证</template>
          <template v-else-if="scope.row.name == 3">毕业证</template>
          <template v-else-if="scope.row.name == 4">结婚证</template>
          <template v-else-if="scope.row.name == 5">户口簿</template>
          <template v-else-if="scope.row.name == 6">独生子女证</template>
          <template v-else-if="scope.row.name == 7">高级职称</template>
          <template v-else-if="scope.row.name == 8">护照</template>
          <template v-else-if="scope.row.name == 9">通行证</template>
          <template v-else>{{ scope.row.name }}</template>
        </template>
<!--          <template v-if="scope.row.name == 1">出生证</template>-->
<!--          <template v-else-if="scope.row.name == 2">学生证</template>-->
<!--          <template v-else-if="scope.row.name == 3">毕业证</template>-->
<!--          <template v-else-if="scope.row.name == 4">结婚证</template>-->
<!--          <template v-else-if="scope.row.name == 5">户口簿</template>-->
<!--          <template v-else-if="scope.row.name == 6">独生子女证</template>-->
<!--          <template v-else-if="scope.row.name == 7">高级职称</template>-->
<!--          <template v-else-if="scope.row.name == 8">护照</template>-->
<!--          <template v-else-if="scope.row.name == 9">通行证</template>-->
<!--          <template v-else>{{ scope.row.name }}</template>-->
<!--        </template>-->
        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
      </el-table-column>
      <el-table-column label="证号/专业" prop="idNo" sortable width="170" align="center" >
        <template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '————'}}</template>
@@ -306,7 +291,7 @@
<!--          <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%'}"  >
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
@@ -316,6 +301,8 @@
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
          <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应名称,请在此输入新的名称" @change="addNewOption"></el-input>
        </el-form-item>
        <el-form-item label="证件号/专业" prop="idNo">
          <el-input v-model="formDat.idNo" placeholder="请输入证件号/专业" clearable :style="{width: '100%'}" >
@@ -423,7 +410,7 @@
//导入接口函数
import {listHonor,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory} from "@/api/honor/index";
import {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory} from "@/api/honor/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -448,6 +435,7 @@
      total: 0,
      // 荣誉表格数据
      honorList: [],
      typeList:[],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -461,12 +449,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[
      ],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],
@@ -519,7 +505,7 @@
          trigger: 'blur'
        }],
        name: [{
          required: true,
          // required: true,
          message: '请输入名称',
          trigger: 'blur'
        }],
@@ -556,16 +542,18 @@
      },
      selected:'',
      typeOptions: [],
      newOption: undefined,
      showInput: true,
      typeOption:[
        {value:'1',label:'荣誉'},
        {value:'0',label:'证件'},
        {value:'1',label:'荣誉'},
        {value:'2',label:'资质'},]
    };
  },
  created() {
    this.getList();
    this.getCateInfor()
    this.getTypeOptions();
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -585,6 +573,14 @@
        return "statistics-warning-row";
      }
    },
    //名称
    addNewOption() {
      const newOption = this.newOption.trim();
      if (newOption && !this.typeOptions.includes(newOption)) {
        this.typeOptions.push(newOption);
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    /** 查询记录列表 */
    getList() {
      this.loading = true;
@@ -601,6 +597,32 @@
          this.loading = false;
        }
      );
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
        }
      );
    },
    getTypeOptions() {
      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
      const uniqueOptions = {};
      this.typeOptions = filteredOptions.reduce((options, option) => {
        if (!uniqueOptions[option]) {
          uniqueOptions[option] = true;
          options.push({
            label: option,
            value: option
          });
        }
        return options;
      }, []);
    },
    /** 查询类别信息 */
    getCateInfor()
@@ -763,6 +785,7 @@
    /** 提交按钮(数据权限) */
    submitDataScope: function() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
ruoyi-ui/src/views/self/memoInfo.vue
@@ -65,14 +65,14 @@
            >
            <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)"
        >
@@ -115,14 +115,14 @@
            >
            <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"
                  class="el-upload-list__item-delete"
                  @click="handleDownload(file.url)"
                >
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -101,14 +101,14 @@
            >
            <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)"
            >
@@ -170,14 +170,14 @@
              fit="cover"
            >
            <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                    <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
@@ -334,7 +334,7 @@
    else{
      document.title = "个人财产详细信息";
      this.$route.meta.title = "个人财产详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }
    let _this = this
ruoyi-ui/src/views/wish/index.vue
@@ -437,13 +437,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[
      ],
      fileListOther:[
      ],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],
ruoyi-ui/src/views/wish/wishInfo.vue
@@ -58,7 +58,7 @@
            </el-cow>
            <el-cow >
              <el-form-item label="是否依旧有效" prop="isEffective" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.isEffective" placeholder="请选择是否依旧有效" clearable :style="{width: '100%'}"  >
                <el-select v-model="formData.isEffective" placeholder="请选择是否依旧有效" clearable :style="{width: '100%'}"  :disabled="dsb">
                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                  ></el-option>
                </el-select>
@@ -91,14 +91,14 @@
            >
            <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)"
            >
@@ -140,14 +140,14 @@
              fit="cover"
            >
            <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                    <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
@@ -288,7 +288,7 @@
    else{
      document.title = "百年心愿详细信息";
      this.$route.meta.title = "百年心愿详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }
    let _this = this