From b35a804358de7849f42bcdae934c236d13e3f233 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期二, 19 九月 2023 14:20:57 +0800 Subject: [PATCH] 全局搜索样式调整,家谱加上页码 --- ruoyi-ui/src/views/doctor/index.vue | 117 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 59 insertions(+), 58 deletions(-) diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue index f413210..a1c52bc 100644 --- a/ruoyi-ui/src/views/doctor/index.vue +++ b/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> @@ -128,15 +111,6 @@ </el-form-item> </el-form> <div> -<!-- <div style="width: 100px;--> -<!-- height: 24px;--> -<!-- font-size: 18px;--> -<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;--> -<!-- font-weight: 400;--> -<!-- color: #000000;--> -<!-- line-height: 21px;--> -<!-- ">瀹跺涵灏忓尰鐢�</div>--> - <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -200,13 +174,13 @@ </div> <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 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 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> - <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" > + <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" > <template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" > @@ -225,7 +199,9 @@ <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="140" align="center" > <template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '鈥斺�斺�斺��'}}</template> </el-table-column> - + <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" > + <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template> + </el-table-column> <el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> </el-table-column> @@ -293,7 +269,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> @@ -329,7 +305,7 @@ <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> - <h4 class="form-header">鐢靛瓙鏂囦欢 </h4> + <h4 class="form-header">鐩稿叧鍥剧墖 </h4> <el-upload action="#" list-type="picture-card" @@ -337,7 +313,7 @@ :http-request="requestUpload" :file-list="fileList" > - <i slot="default" class="el-icon-plus"></i> + <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> <img class="el-upload-list__item-thumbnail" @@ -379,6 +355,7 @@ :show-file-list="true" > <el-button type="primary">鐐瑰嚮涓婁紶</el-button> + <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> <template #tip> <div class="el-upload__tip"> </div> @@ -409,7 +386,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 +411,7 @@ total: 0, // 灏忓尰鐢熻〃鏍兼暟鎹� doctorList: [], + typeList:[], // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -447,13 +425,14 @@ // 鏃ユ湡鑼冨洿 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, btn:false, fit:['fill'], - + uploading: false, formDat: { //灏卞尰璁板綍 id:undefined, @@ -496,7 +475,7 @@ type: [{ // required: true, - message: '璇疯緭鍏ョ被鍨�', + message: '璇疯緭鍏ョ被鍒�', trigger: 'blur' }], symptom: [{ @@ -536,26 +515,14 @@ trigger: 'blur' }], }, - typeOptions: [{ - value:'绁炵粡绉�', - label:'绁炵粡绉�' - },{ - value:'鐗欑', - label:'鐗欑' - },{ - value:'鍐呯', - label:'鍐呯' - }], + typeOptions: [], newOption: undefined, showInput: true }; }, created() { this.getList(); - this.getCateInfor() - // for (let i = 0; i < this.contactList.length; i++) { - // this.formDat[i] = this.contactList[i]; - // } + this.getTypeOptions(); }, methods: { // 鍙栨秷鎸夐挳 @@ -580,6 +547,7 @@ this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」 } }, + /** 鏌ヨ璁板綍鍒楄〃 */ getList() { this.loading = true; @@ -589,12 +557,37 @@ // 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() // { @@ -749,6 +742,13 @@ Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); + for(let i = 0; i <= this.fileList.length; i++) + { + this.handleRemove(this.fileList[0]); + } + for(let i = 0; i < this.fileListOther.length; i++){ + this.handleRemoveFile(this.fileListOther[0]); + } }, requestUpload(params) { @@ -756,10 +756,11 @@ var formData = new FormData(); formData.append('uploadFile', file); let _this = this - + this.uploading = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - + this.uploading = false; + this.$modal.msgSuccess("涓婁紶鎴愬姛"); if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) -- Gitblit v1.9.1