Commit cb866a4b authored by astavrak's avatar astavrak
Browse files

merge conflict

parent 1ca28312
<template>
<<<<<<< HEAD
<div id="app">
<el-card class="box-card" style="width:700px;margin:auto;">
<el-form ref="form" :model="form" label-width="120px">
......@@ -24,33 +23,6 @@
<div class="el-upload__text">Drop file here or <em>click to upload (PDF, JPEG, PNG) </em></div>
</el-upload>
</el-form-item>
=======
<div class="app-container">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="To:">
<el-input v-model="form.receiver" type="textbox" placeholder="Patient's email"/>
</el-form-item>
<el-form-item label="Message:">
<el-input v-model="form.desc" type="textarea" />
</el-form-item>
<el-form-item label="Upload Media">
<el-upload
class="upload-demo"
drag
action="https://jsonplaceholder.typicode.com/posts/"
accept="image/jpeg,image/png,text/plain, application/pdf"
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="handleUploadSuccess"
:auto-upload="false"
:before-upload="handleUploadbefore"
:file-list="fileList"
multiple>
<i class="el-icon-upload"></i>
<div class="el-upload__text">Drop file here or <em>click to upload (PDF, JPEG, PNG) </em></div>
</el-upload>
</el-form-item>
>>>>>>> lexi_omega
<el-form-item>
<el-button type="primary" @click="onSubmit">Submit</el-button>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment