From d03c0c366862d917bdac6ba9cab8d338e722da10 Mon Sep 17 00:00:00 2001 From: yz3456 <2753272399@qq.com> Date: 星期二, 11 六月 2024 14:12:38 +0800 Subject: [PATCH] 修改 --- ruoyi-ui/src/views/doctor/index.vue | 295 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 214 insertions(+), 81 deletions(-) diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue index 0dc87ca..91f1e29 100644 --- a/ruoyi-ui/src/views/doctor/index.vue +++ b/ruoyi-ui/src/views/doctor/index.vue @@ -3,10 +3,10 @@ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="绫诲埆" prop="type"> <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable - style="width: 200px; + style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; - opacity: 0.5;" @keyup.enter.native="handleQuery"> + opacity: 0.5;" @keyup.enter.native="handleQuery" filterable allow-create> <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"/> </el-select> @@ -74,7 +74,7 @@ </el-form-item> </el-form> <div> - <el-row :gutter="10" class="mb8"> + <el-row :gutter="10" class="mb8" v-if="userId != 2"> <el-col :span="1.5"> <el-button type="primary" @@ -117,7 +117,7 @@ v-hasPermi="['family:note:export']" >瀵煎叆妯℃澘涓嬭浇</el-button> </el-col> - <el-col :span="1.2"> + <el-col :span="1.5"> <el-upload action="" @@ -128,7 +128,7 @@ > <el-button size="mini" type="primary" plain - icon="el-icon-plus" >瀵煎叆</el-button> + icon="el-icon-top">瀵煎叆</el-button> </el-upload> </el-col> @@ -139,7 +139,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="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 :show-overflow-tooltip="true" 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> @@ -149,23 +149,23 @@ <el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" > <template slot-scope="scope">{{scope.row.duration? scope.row.duration: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable width="160" align="center" > + <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable :show-overflow-tooltip="true" width="160" align="center" > <template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable width="160" align="center"> + <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable :show-overflow-tooltip="true" width="160" align="center"> <template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鍔熸晥" prop="effect" sortable width="120" align="center" > + <el-table-column label="鍔熸晥" prop="effect" sortable :show-overflow-tooltip="true" width="120" align="center" > <template slot-scope="scope">{{scope.row.effect? scope.row.effect: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="140" align="center" > + <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" 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" > + <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable :show-overflow-tooltip="true" width="150px" align="center" > <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template> </el-table-column> - <el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center"> + <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center"> @@ -191,30 +191,34 @@ </template> </el-table-column> -<!-- </el-table-column>--> - <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> + <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> + <div class="button-container"> <el-button size="mini" type="text" icon="el-icon-edit" + :disabled="!scope.row.ownData" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']" - >淇敼</el-button> + > + <span style="font-size: 14px;">淇敼</span> + </el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" + :disabled="!scope.row.ownData" v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> - -<el-button + ><span style="font-size: 14px;">鍒犻櫎</span></el-button> + <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)"> -鏌ョ湅璇︽儏</el-button> + <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button> + </div> </template> </el-table-column> </el-table> @@ -244,7 +248,7 @@ <el-input v-model="formDat.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="鎸佺画鏃堕棿" prop="duration"> - <el-input v-model="formDat.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" > + <el-input v-model="formDat.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" type="number" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="涓尰澶勬柟" prop="cmedical"> @@ -274,8 +278,11 @@ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif" list-type="picture-card" multiple - :http-request="requestUpload" - :file-list="fileList" + :http-request="requestUpload" + :file-list="fileList" + :on-change="handleChange" + :auto-upload="false" + ref="upload" > <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> @@ -309,6 +316,13 @@ </div> </el-upload> + <el-button + style="margin-left: 10px" + size="small" + type="success" + + @click="picUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> <h4 class="form-header">鍏朵粬闄勪欢 </h4> <el-upload action="" @@ -319,15 +333,59 @@ :on-remove="handleRemoveFile" :http-request="requestUpload1" :show-file-list="true" - > - <el-button type="primary">鐐瑰嚮涓婁紶</el-button> - <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div> - <template #tip> - <div class="el-upload__tip"> - </div> - </template> - </el-upload> + ref="upload1" + :on-change="handleChange1" + :auto-upload="false" + list-type="picture-card" + > + + +<i slot="default" class="el-icon-plus"></i> + <div slot="file" slot-scope="{file}"> + <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 --> + <video + v-if="file.url.includes('.mp4')" + class="el-upload-list__item-thumbnail" + :src="file.url" + style="width: 147px; height: 147px" + fit="cover" + ></video> + <img v-else + class="el-upload-list__item-thumbnail" + src="../../assets/images/deviceLis.png" + alt="" + style="width: 100%; height: 100%" + fit="cover"></img> + + <span class="el-upload-list__item-actions"> + <span class="el-upload-list__item-name">{{ file.name }}</span> + <span + class="el-upload-list__item-preview" + @click="handleFileCardPreview(file)" + > + <i class="el-icon-zoom-in"></i> + </span> + + <span + + class="el-upload-list__item-delete" + @click="handleRemoveFile(file)" + > + <i class="el-icon-delete"></i> + </span> + </span> + + </div> + + + </el-upload> + <el-button + style="margin-left: 10px" + size="small" + type="success" + @click="fileUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> </el-form> <h4 class="form-header"> </h4> @@ -348,7 +406,7 @@ <script> import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; - +import {getInfo} from "@/api/login"; //瀵煎叆鎺ュ彛鍑芥暟 @@ -360,6 +418,7 @@ dicts: ['sys_normal_disable'], data() { return { + userId: undefined, // 閬僵灞� disabled: false, @@ -394,6 +453,9 @@ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], fileList:[], + fileList1:[], + uploadFileList: [], + uploadFileList1: [], fileListOther:[], dsb:true, btn:false, @@ -411,7 +473,7 @@ effect:undefined, suitable:undefined, remark:undefined, - url: undefined, + url: "", }, // 鑿滃崟鍒楄〃 @@ -441,7 +503,7 @@ rules: { type: [{ - // required: true, + required: true, message: '璇疯緭鍏ョ被鍒�', trigger: 'blur' }], @@ -490,8 +552,16 @@ created() { this.getList(); this.getTypeOptions(); + this.getInfo() }, methods: { + getInfo(){ + console.log('-----------------') + getInfo().then(response=>{ + console.log(response.user.roles[0].roleId,'roleID') + this.userId = response.user.roles[0].roleId + }) + }, // 鍙栨秷鎸夐挳 cancelData() { this.open = false; @@ -518,19 +588,25 @@ /** 鏌ヨ璁板綍鍒楄〃 */ getList() { this.loading = true; + let _this = this; // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listDoctor(this.queryParams).then(response => { // alert(123) // console.log(response.data) - this.doctorList = response.data.data; - this.total = response.data.total; - this.loading = false; + if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�") + { + _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�"); + _this.loading = false; + }else{ + _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(); @@ -571,14 +647,22 @@ for(let i = 0; i < this.fileList.length; i++) { if(this.fileList[i].url==file.url) + { this.$delete(this.fileList,i); + this.$delete(this.uploadFileList,i); + } } }, handleRemoveFile(file) { for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) + { + this.$delete(this.fileListOther,i); + this.$delete(this.uploadFileList1,i); + + } } }, // 鍙栨秷鎸夐挳 @@ -616,7 +700,7 @@ deptCheckStrictly: true, remark: undefined }; - this.resetForm("form"); + this.resetForm("elForm"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -677,13 +761,7 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ submitDataScope: 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) { @@ -706,40 +784,88 @@ } }); }, - requestUpload(params) - { - var file = params.file; - 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}) - } - }) - }, - requestUpload1(params) - { - var file = params.file; - var formData = new FormData(); - formData.append('uploadFile', file); - let _this = this - this.uploading1 = true; - uploadPic(formData).then(response => { - let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - this.uploading1 = false; - this.$modal.msgSuccess("涓婁紶鎴愬姛"); - if(_this.fot.includes(pth) !== true) - { - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) - } - }) - }, + handleChange(file, fileList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + + // this.uploadFileList.push(file.raw); + console.log("=========5555=========") + console.log(file) + // console.log(this.uploadFileList) + // this.fileList = fileList + //alert(file) + this.uploadFileList.push(file.raw); + this.fileList.push({name:file.name,url:file.url}) + //alert(fileList1.length) + }, + handleChange1(file, fileOtherList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + this.uploadFileList1.push(file.raw); + this.fileListOther.push({name:file.name,url:file.url}) + // this.uploadFileList.push(file.raw); + console.log("=========5555=========") + //console.log(file) + // console.log(this.uploadFileList) + // this.fileList = fileList + }, + fileUpload(){ + // var file = params.file; + + var formData = new FormData(); + this.$refs.upload1.submit(); + // formData.append('uploadFile', file); + if(this.uploadFileList1.length==0){ + this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!"); + return + } + this.uploadFileList1.forEach((elem)=>{ + formData.append("files", elem) + + }) + + let _this = this + + this.uploading = true; + uploadPic(formData).then(response => { + _this.uploadFileList1 = [] + _this.formDat.url = _this.formDat.url+","+response.fileNames + _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!"); + }) + + }, + picUpload() + { + var formData = new FormData(); + //alert(976) + //this.$refs.upload.submit(); + //alert(8) + //alert(this.uploadFileList.length) + if(this.uploadFileList.length==0){ + this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�"); + return} + //console.log(this.uploadFileList) + this.uploadFileList.forEach((elem)=>{ + formData.append("files", elem) + + }) + //alert(90) + let _this = this + //alert(9) + uploadPic(formData).then(response => { + // alert("dds") + _this.formDat.url = _this.formDat.url+","+response.fileNames + _this.uploadFileList = [] + _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + + }); + }, + requestUpload(params) { + //alert(98) + // this.uploadFileList.push(params.file); + }, + requestUpload1(params) + { + // this.uploadFileList1.push(params.file); + }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const Ids = row.id || this.ids; @@ -809,6 +935,13 @@ background: #FFEFF2; } - - +.tableRowClassName { + height: 40px; +} +.el-table__cell { + font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */ +} +.button-container { + display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */ +} </style> -- Gitblit v1.9.1