From 2c8b26bef24ccfde85cce836fea1681b204aa74c Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 11 六月 2023 18:17:38 +0800
Subject: [PATCH] 1.通讯录模块“称呼”改为“通讯录中称呼”，“成员姓名”改成“家人姓名” 2.家根网详情成功展示数据
---
ruoyi-ui/src/views/doctor/index.vue | 149 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index f8528d2..8c1842f 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -51,16 +51,21 @@
-->
</el-form-item>
- <el-form-item label="绫诲瀷" prop="type" >
- <el-input
+ <el-form-item label="绫诲埆" prop="type">
+ <el-select
v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍨�"
+ placeholder="鎵�鏈夌被鍒�"
clearable
style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
-
+ @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="symptom">
@@ -108,22 +113,21 @@
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1; " @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1; " @click="resetQuery">閲嶇疆</el-button>
-
- </el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+ </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>
+<!-- <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">
@@ -164,7 +168,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -186,36 +190,38 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
- <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="selection" width="25" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+
+ <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">
- <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="symptom" sortable :show-overflow-tooltip="true" width="80" 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="110" align="center" >
+ <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="110" align="center" >
+ <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable 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="110" align="center">
+ <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable 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="80" align="center" >
+ <el-table-column label="鍔熸晥" prop="effect" sortable 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="110" align="center" >
+ <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="remark" sortable 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="80" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
<template slot-scope="scope" >
<img
class="el-upload-list__item-thumbnail"
@@ -223,7 +229,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== null"
+ v-if="scope.row.url !== ','"
>
<img
class="el-upload-list__item-thumbnail"
@@ -231,7 +237,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url === null"
+ v-if="scope.row.url ===',' "
>
</template>
</el-table-column>
@@ -278,8 +284,10 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="绫诲瀷" prop="type">
- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍨�" clearable :style="{width: '100%'}" >
- </el-input>
+ <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>
+ </el-select>
</el-form-item>
<el-form-item label="鐥囩姸" prop="symptom">
@@ -520,12 +528,21 @@
trigger: 'blur'
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value:'绁炵粡绉�',
+ label:'绁炵粡绉�'
+ },{
+ value:'鐗欑',
+ label:'鐗欑'
+ },{
+ value:'鍐呯',
+ label:'鍐呯'
+ }],
};
},
created() {
this.getList();
- // this.getCateInfor()
+ this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -561,17 +578,28 @@
);
},
/** 鏌ヨ绫诲埆淇℃伅 */
- // 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]})
- // })
- // })
- // },
+ 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 === '绁炵粡绉�'){
+ return '绁炵粡绉�'
+ }else if(type === '鐗欑'){
+ return '鐗欑'
+ }else if(type === '鍐呯'){
+ return '鍐呯'
+ }else {
+ return '鍏跺畠'
+ }
+ },
handleRemove(file) {
alert(323)
},
@@ -579,6 +607,10 @@
cancel() {
this.open = false;
this.reset();
+ },
+ getRowId(row)
+ {
+ return row.id
},
// 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
cancelDataScope() {
@@ -711,7 +743,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
return delDoctor(Ids);
}).then(() => {
this.getList();
@@ -720,9 +752,24 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('zfDoctor/export', {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('/zfDoctor/export', {
...this.queryParams
}, `zfDoctor_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/zfDoctor/export1/'+Ids, {
+
+ }, `zfDoctor_${new Date().getTime()}.xlsx`)
+ }
+ },
+
+ handleExportTemplate(){
+ this.download('/zfDoctor/model', {
+
+ }, `zfDoctor_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
--
Gitblit v1.9.1