From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/doctor/doctorInfo.vue | 146 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 52 deletions(-)
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 71c7098..04fa9f8 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -2,50 +2,80 @@
<div class="app-container">
<div class="form-header mt">
<h4 class="dt h4">灏卞尰璁板綍璇︾粏淇℃伅 </h4>
- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
+<!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
<!-- <br>-->
<!-- <el-button type="primary" class="pt" @click="handleExport"-->
<!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
</div>
-
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+ <div>
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
<!-- <el-form-item label="id" prop="id">-->
<!-- <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
<!-- clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="绫诲瀷" prop="type">
- <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍨�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="鐥囩姸" prop="symptom">
- <el-input v-model="formData.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="鎸佺画鏃堕棿" prop="duration">
- <el-input v-model="formData.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="涓尰澶勬柟" prop="cmedical">
- <el-input v-model="formData.cmedical" placeholder="璇疯緭鍏ヤ腑鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="瑗垮尰澶勬柟" prop="wmedical">
- <el-input v-model="formData.wmedical" placeholder="璇疯緭鍏ヨタ鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="鍔熸晥" prop="effect">
- <el-input v-model="formData.effect" placeholder="璇疯緭鍏ュ姛鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="閫傜敤浜�" prop="suitable">
- <el-input v-model="formData.suitable" placeholder="璇疯緭鍏ラ�傜敤浜�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
-
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
-
+ <el-container>
+ <div>
+ <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-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="鐥囩姸" prop="symptom" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="鎸佺画鏃堕棿" prop="duration" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="鍔熸晥" prop="effect" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.effect" placeholder="璇疯緭鍏ュ姛鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="閫傜敤浜�" prop="suitable" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.suitable" placeholder="璇疯緭鍏ラ�傜敤浜�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-cow>
+ </el-row>
+ </el-container>
+ </div>
+ <div style="padding-left:120px">
+ <el-container>
+ <el-row>
+ <el-cow :span="8">
+ <el-form-item label="涓尰澶勬柟" prop="cmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.cmedical" placeholder="璇疯緭鍏ヤ腑鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="瑗垮尰澶勬柟" prop="wmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.wmedical" placeholder="璇疯緭鍏ヨタ鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ </el-row>
+ </el-container>
+ </div>
+ </el-container>
<h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
<el-upload
action="#"
@@ -66,20 +96,21 @@
>
<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="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
<i class="el-icon-download"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
@@ -99,7 +130,7 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -115,21 +146,21 @@
>
<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="!disabled"
- @click="handleRemove(file)"
+ v-if="isShow"
class="el-upload-list__item-delete"
-
+ @click="handleDownload(file.url)"
>
- <i class="el-icon-download"></i>
- </span>
+ <i class="el-icon-download"></i>
+ </span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
@@ -144,12 +175,12 @@
</el-upload>
<el-form-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
</el-form>
-
+ </div>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -240,7 +271,16 @@
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value:'绁炵粡绉�',
+ label:'绁炵粡绉�'
+ },{
+ value:'鐗欑',
+ label:'鐗欑'
+ },{
+ value:'鍐呯',
+ label:'鍐呯'
+ }],
}
},
computed: {},
@@ -253,12 +293,14 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.isShow=true
document.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";
this.$route.meta.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "灏卞尰璁板綍璇︾粏淇℃伅";
+ this.$route.meta.title = "灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
}
let _this = this
@@ -376,7 +418,7 @@
download(formData).then(async (response) => {
const isLogin = await blobValidate(response);
let nt = new Date().getTime()
- let filename = 'property_'+nt+'.'+suffix
+ let filename = 'doctor_'+nt+'.'+suffix
const blob = new Blob([response])
saveAs(blob, filename)
})
--
Gitblit v1.9.1