Skip to content

P
pet-business-web
Commit 1d8a9ffc authored by 盖献康's avatar 盖献康
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents aaf0e996 338bdf18
Show whitespace changes
Inline Side-by-side
Showing with 454 additions and 348 deletions
src/components/BackBtn/index.vue 0 → 100644
View file @ 1d8a9ffc
<template>
<el-button :loading="loading" :class="buttonClass" :icon="buttonIcon" @click="clickEvent">{{ buttonText }}</el-button>
</template>
<script>
export default {
name: 'Index',
props: {
buttonClass: {
type: String,
default: 'resetBtn'
},
loading: {
type: Boolean,
default: false
},
buttonIcon: {
type: String,
default: 'el-icon-back'
},
buttonText: {
type: String,
default: '返 回'
},
clickAction: {
type: Object,
required: true
},
isShowConfirm: {
type: Boolean,
default: false
}
},
methods: {
clickEvent() {
if (this.isShowConfirm) {
this.$confirm(this.buttonClass === 'queryBtn' ? '系统即将发布编辑内容，是否确定' : '是否立即返回，返回后系统不再保存已填写内容', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',
type: 'warning',
closeOnClickModal: false
}).then(() => {
this.clickAction()
})
} else {
this.clickAction()
}
}
}
}
</script>
<style scoped>
</style>
src/components/ImageUpload/index.vue
View file @ 1d8a9ffc
......@@ -42,7 +42,7 @@
<div
slot="error"
class="image-slot"
style="width: 100%;height: 100%; border: 1px solid #DB4747;border-radius:1px;"
style="width: 100%;height: 100%; border: 1px #DB4747;border-radius:5px;"
>
<div class="parent-container">
<img
......
src/router/index.js
View file @ 1d8a9ffc
......@@ -120,10 +120,10 @@ export const constantRoutes = [
},
{
path: 'equipment-detail',
path: 'equipment-edit',
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentDetail',
name: 'EquipmentEdit',
meta: { title: '设备详情' }
},
{
......@@ -131,7 +131,7 @@ export const constantRoutes = [
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentEdit',
meta: { title: '设备详情' }
meta: { title: '设备編輯' }
},
{
path: 'equipment-add',
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 1d8a9ffc
......@@ -605,7 +605,7 @@ export default {
/** 跳转到详情页*/
detailsDevice(id) {
this.$router.push({
name: 'EquipmentDetail',
name: 'EquipmentEdit',
query: {
identify: '2',
id: id
......
src/views/medical-record-management/medical-edit.vue
View file @ 1d8a9ffc
......@@ -38,8 +38,8 @@ color: #333333;"
:model="detailInfo"
:hide-required-asterisk="!isEdit"
:rules="formRules"
class="registration-add-form"
label-width="81px"
class="medical-detail__form"
label-width="120px"
size="small"
>
<!--2--基本信息-->
......@@ -51,10 +51,13 @@ color: #333333;"
>宠物信息
</div>
</div>
<!-- 内部信息 -->
<!-- 宠物基本信息-->
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<el-form-item label="宠物昵称" prop="petNickname">
<el-input v-model="detailInfo.petNickname" :placeholder="'-'" disabled />
</el-form-item>
......@@ -117,7 +120,7 @@ color: #333333;"
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<!--宠物性别-->
<el-form-item label="宠物性别" prop="petSex">
<el-select
......@@ -172,7 +175,7 @@ color: #333333;"
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<!--宠物毛色-->
<el-form-item label="宠物毛色" prop="petColor">
<el-input
......@@ -223,7 +226,7 @@ color: #333333;"
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<!--保险情况-->
<el-form-item label="宠物保险" prop="insure">
<el-select
......@@ -243,6 +246,9 @@ color: #333333;"
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
<!--3--宠主信息-->
<div style="display: flex;margin-bottom: 20px;">
<div class="tip-green" />
......@@ -251,10 +257,13 @@ color: #333333;"
>宠主信息
</div>
</div>
<!-- 内部信息 -->
<!-- 宠主基本信息-->
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<el-form-item label="宠主姓名">
<el-input v-model="detailInfo.petOwnerBo.nickName" :placeholder="'-'" disabled />
</el-form-item>
......@@ -271,7 +280,7 @@ color: #333333;"
</el-col>
</el-row>
<el-row>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-col v-if="deptLevel !== '1'" :span="8" class="form__left">
<el-form-item label="创建日期">
<span class="content-style">
<el-date-picker
......@@ -305,16 +314,16 @@ color: #333333;"
</el-form-item>
</el-col>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="会员卡余额" :label-width="100">
<div style="display: flex;align-items: center;">
<el-form-item label="会员卡余额">
<div style="display: flex;">
<el-input v-model="detailInfo.petOwnerBo.cardBalance" :placeholder="'-'" disabled />
<span class="unit-text">元</span>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="deptLevel !== '1'">
<el-col v-if="deptLevel !== '1'" :span="8">
<el-row v-if="deptLevel !== '1'" align="middle">
<el-col v-if="deptLevel !== '1'" :span="8" class="form__left">
<el-form-item label="状态">
<el-select v-model="detailInfo.petOwnerBo.status" :placeholder="'-'" disabled>
<el-option
......@@ -327,11 +336,15 @@ color: #333333;"
</el-form-item>
</el-col>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="绑定宠物数量" :label-width="'100'">
<el-form-item label="绑定宠物数量">
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'-'" disabled />
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
<!--4--兽医信息-->
<div style="display: flex;margin-bottom: 20px;">
<div class="tip-green" />
......@@ -340,10 +353,13 @@ color: #333333;"
>兽医信息
</div>
</div>
<!-- 内部信息 -->
<!-- 宠主基本信息-->
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<el-form-item label="医生姓名" prop="doctorName">
<el-input v-model="detailInfo.doctorName" :placeholder="'-'" disabled />
</el-form-item>
......@@ -358,7 +374,7 @@ color: #333333;"
<el-input v-model="detailInfo.doctorPhone" :placeholder="'-'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="form__left">
<el-form-item label="所属医院" prop="hospitalName">
<el-input v-model="detailInfo.hospitalName" :placeholder="'-'" disabled />
</el-form-item>
......@@ -374,6 +390,9 @@ color: #333333;"
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
<!--5--进度信息-->
<schedule-info :schedule-key="scheduleKey" />
<!--6--就诊信息-->
......@@ -387,7 +406,7 @@ color: #333333;"
<!-- 内部信息 -->
<!-- 宠主基本信息-->
<el-row>
<el-col :span="8">
<el-col :span="8" class="form__left">
<el-form-item label="病历号">
<el-input
v-model="detailInfo.medicalRecordNo"
......@@ -424,7 +443,7 @@ color: #333333;"
:placeholder="isEdit? '请输入主诉' : '-'"
type="textarea"
show-word-limit
style="width: 85% !important"
style="width: 90% !important"
/>
</el-form-item>
</el-col>
......@@ -437,7 +456,7 @@ color: #333333;"
maxlength="400"
:placeholder="isEdit? '请输入医嘱' : '-'"
type="textarea"
style="width: 85% !important"
style="width: 90% !important"
/>
</el-form-item>
</el-col>
......@@ -448,7 +467,7 @@ color: #333333;"
:disabled="!isEdit"
maxlength="20"
:placeholder="isEdit? '请输入诊断结果' : '-'"
style="width: 85% !important"
style="width: 90% !important"
/>
</el-form-item>
</el-col>
......@@ -1291,7 +1310,7 @@ color: #333333;"
show-word-limit
:placeholder="isEdit? '请输入回访情况' : '-'"
type="textarea"
style="width: 85% !important"
style="width: 90% !important"
/>
</el-form-item>
</el-col>
......@@ -2413,24 +2432,6 @@ export default {
//height:150px;
}
//1--基本信息--模块内信息整体样式
.base-msg {
//display: grid !important;
//grid-template-columns: repeat(2, auto);
color: #666666;
margin-top: 20px;
margin-bottom: 20px;
//margin-left: 5%;
//margin-right: 5%;
//基础信息右边的信息样式
.base-inner {
//display: grid !important;
//grid-template-columns: repeat(3, auto);
//与头像左边距
//padding-left: 10%;
}
}
//2--宠物保险--模块内信息整体样式
.table-content {
margin: 35px 1% 20px;
......@@ -2439,11 +2440,8 @@ export default {
//3--主人信息--模块内信息整体样式
.ownerMsg-inner {
color: #666666;
//display: grid !important;
//grid-template-columns: repeat(2, auto);
margin-top: 20px;
margin-bottom: 20px;
//margin-right: 5%;
}
//模块tip样式--绿色
......@@ -2607,4 +2605,47 @@ export default {
}
}
/*全部的回显框宽度限制*/
.medical-detail__form {
.el-form-item {
margin-right: 0 !important;
&__content {
.el-input, .el-select {
width: 100% !important;
}
.el-select ::v-deep .el-input {
width: 100% !important;
}
.half {
width: 50% !important;
}
.half__-5px {
width: calc(50% - 5px) !important;
}
}
}
}
//1--基本信息--模块内信息整体样式
.base-msg {
color: #666666;
margin-top: 20px;
margin-bottom: 20px;
}
.el-col-8 {
padding-left: 41px;
}
.form__left {
margin-left: -40px;
}
.base-inner {
padding-left: 10px;
}
</style>
src/views/service-management/registration-queue/registration-detail.vue
View file @ 1d8a9ffc
......@@ -545,16 +545,21 @@
/>
</div>
<!--底部返回按钮-->
<el-button
<back-btn
v-if="$route.params.type === 'enter'"
:loading="submiting"
class="queryBtn"
icon="el-icon-check"
@click="submitForm"
>提
交
</el-button>
<el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
:button-class="'queryBtn'"
:button-icon="'el-icon-check'"
:click-action="submitForm"
button-text="提 交"
:is-show-confirm="$route.params.type === 'enter'"
/>
<back-btn
button-text="返 回"
button-class="resetBtn"
:click-action="goBack"
:is-show-confirm="$route.params.type === 'enter'"
/>
</el-form>
</div>
</div>
......@@ -570,6 +575,7 @@ import scheduleInfo from '@/views/service-management/registration-queue/componen
import prescribingModle from '@/views/service-management/registration-queue/components/prescribing-modle'
import { insertDiagnosis } from '@/api/business/registration'
import { moneyFormat } from '@/utils'
import backBtn from '@/components/BackBtn'
export default {
name: 'RegistrationDetail',
......@@ -577,7 +583,8 @@ export default {
dicts: ['pet_sex', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'other_breed'],
components: {
scheduleInfo,
prescribingModle
prescribingModle,
backBtn
},
data() {
return {
......
Markdown is supported
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