Skip to content

P
pet-business-web
Commit a3a3a5d9 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 45c4185e 453860fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 632 additions and 502 deletions
src/views/equipment-management/use-management/use-management.vue
View file @ a3a3a5d9
......@@ -95,7 +95,7 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="100" :show-overflow-tooltip="true">
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.deviceName || '-' }}</span>
</template>
......@@ -105,7 +105,7 @@
<span>{{ scope.row.deviceCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="100" :show-overflow-tooltip="true">
<el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.checkItemsName || '-' }}</span>
</template>
......@@ -120,12 +120,12 @@
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template>
</el-table-column>
<el-table-column label="宠主姓名" align="left" prop="ownerNikename" min-width="120" :show-overflow-tooltip="true">
<el-table-column label="宠主姓名" align="left" prop="ownerNikename" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.ownerNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="宠主手机号" align="left" min-width="120" prop="phoneNumber">
<el-table-column label="宠主手机号" align="left" min-width="100" prop="phoneNumber">
<template slot-scope="scope">
<span>{{ scope.row.ownerPhone || '-' }}</span>
</template>
......@@ -161,7 +161,7 @@
>{{ showStatus(scope.row.status) || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="120">
<el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="60">
<template slot-scope="scope">
<el-button
v-hasPermi="['business:use:query']"
......
src/views/service-management/hospitalization-management/hospitalization-details.vue
View file @ a3a3a5d9
......@@ -331,7 +331,7 @@
</div>
</div>
<div style="padding: 20px;">
<div style="padding: 20px 0 20px 20px;">
<el-table :data="hosDetailBos" style="cursor: pointer;">
<el-table-column label="病房类型" align="left" prop="wardType">
<template slot-scope="scope">
......@@ -376,7 +376,7 @@
</div>
</div>
<div style="padding: 30px 20px 30px 20px;">
<div style="padding: 30px 0px 30px 16px;">
<el-table :data="finTradeHis" style="cursor: pointer;">
<el-table-column label="时间" align="left" prop="createTime" />
<el-table-column label="金额" align="left" prop="paymentAmount">
......@@ -399,7 +399,7 @@
</el-table>
</div>
<div v-if="detailInfo.status<4" >
<div v-if="detailInfo.status<4" style="margin-left: -1rem;padding-left: 16px;">
<el-button v-show="detailInfo.status==='2'||detailInfo.status==='0'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handAdmission">办理入院</el-button>
<el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handDisCharge">办理出院</el-button>
<el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="changeWard">变更病房</el-button>
......@@ -407,7 +407,7 @@
<el-button class="fourWordswhiteBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
</div>
<div v-else style="padding-left: 20px">
<div v-else style="padding-left: 16px;">
<el-button class="fourWordswhiteBtn" icon="el-icon-document-remove" disabled>查看入院单</el-button>
<el-button class="fourWordswhiteBtn" icon="el-icon-document-remove" disabled>查看出院单</el-button>
<el-button class="fourWordswhiteBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
......
src/views/service-management/medical-record-management/check-detail.vue
View file @ a3a3a5d9
......@@ -759,6 +759,7 @@ export default {
}
.el-icon-document {
width: 24.5rem;
line-height: 20px;
border: 1px solid #e4e7ed;
padding: 10px;
background-color: #f1f2f5;
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ a3a3a5d9
......@@ -371,6 +371,7 @@
<!--缴费时间-->
<el-form-item label="缴费时间">
<el-date-picker
v-if="detailInfo.payStatus !== '2'"
v-model="detailInfo.payTime"
clearable
disabled
......@@ -379,6 +380,7 @@
value-format="yyyy-MM-dd"
format="yyyy/MM/dd HH:mm:ss"
/>
<el-input v-else v-model="blank" placeholder="-" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -580,6 +582,7 @@ export default {
},
data() {
return {
blank: '-',
defaultImage: petPic,
submiting: false, // 提交按钮loading flag
// 进度
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ a3a3a5d9
......@@ -456,12 +456,12 @@
<!-- <div class="tip1" />-->
<!-- <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">预约记录</div>-->
<!-- </div>-->
<div class="title-paragraph-treat" style="margin-top: 0px !important;">
<div class="title-paragraph-dialogBox" style="margin-top: 0px !important;">
<span class="title-text">治疗进度</span>
</div>
<el-form :model="allocationForm" label-width="auto">
<el-form :model="allocationForm" label-width="4.3rem">
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="诊室">
<el-select
v-model="allocationForm.consultRoomIdList"
......@@ -496,7 +496,7 @@
</el-form>
<el-table
:data="appointmentRoomList"
style="width: 95.6%;margin-left: 26px;"
style="width: 96.4%;margin-left: 1rem;"
:header-cell-style="{background:'#F4F4F4'}"
>
<el-table-column prop="consulting_name" align="left" label="诊室名称" :show-overflow-tooltip="true">
......@@ -537,14 +537,14 @@
<!-- <div class="tip1" />-->
<!-- <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">添加预约</div>-->
<!-- </div>-->
<div class="title-paragraph-treat" style="margin-top: 30px;">
<div class="title-paragraph-dialogBox" style="margin-top: 30px;">
<span class="title-text">添加预约</span>
</div>
<el-form
ref="useRecordForm"
:model="reservationForm"
:rules="useRecordrules"
label-width="6.7rem"
label-width="5.8rem"
>
<el-row>
<el-col :span="8">
......@@ -1163,6 +1163,21 @@ export default {
</script>
<style scoped lang="scss">
.title-paragraph-dialogBox {
margin-top: 20px;
margin-left: 0px;
margin-bottom: 30px;
border-left: 3px solid #5FB54B;
border-bottom: 24px;
padding-top: 1px;
padding-bottom: 1px;
.title-text {
font-size: 16px;
font-weight: bold;
padding-left: 12px;
}
}
.title-paragraph-treat {
margin-top: 20px;
margin-left: 10px;
......@@ -1192,12 +1207,15 @@ export default {
width: 392px;
}
.el-icon-document {
width: 24.5rem;
line-height: 20px;
border: 1px solid #e4e7ed;
padding: 10px;
background-color: white;
transition: background-color 0.3s ease;
border-radius: 5px;
&:hover {
color: #3490CE;
color: #5bb647;
}
}
.el-icon-document:hover {
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ a3a3a5d9
......@@ -248,13 +248,12 @@
:close-on-click-modal="false"
@close="closeDialogRoom"
>
<div style="display: flex;padding-bottom: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">预约记录</div>
<div class="title-paragraph-dialog" style="margin-top: 0rem !important;">
<div class="title-text">预约记录</div>
</div>
<el-form :model="allocationForm" label-width="auto">
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="诊室">
<el-select
v-model="allocationForm.consultRoomIdList"
......@@ -289,7 +288,7 @@
</el-form>
<el-table
:data="appointmentRoomList"
style="width: 100%;padding-left: 22px;"
style="width: 96%;margin-left: 1rem;"
:header-cell-style="{background:'#F4F4F4'}"
>
<el-table-column prop="consulting_name" align="left" label="诊室名称" :show-overflow-tooltip="true">
......@@ -326,11 +325,10 @@
:limit.sync="allocationForm.pageSize"
@pagination="getAppointmentRecord"
/>
<div style="display: flex;padding-top: 20px;padding-bottom: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">添加预约</div>
<div class="title-paragraph-dialog" style="margin-top: 1.95rem;">
<div class="title-text">添加预约</div>
</div>
<el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="6.5rem" class="useRecordForm">
<el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="5.8rem" class="useRecordForm">
<el-row>
<el-col :span="8">
<el-form-item label="诊室" prop="consultRoomName">
......@@ -1019,4 +1017,19 @@ export default {
height: 30px;
border-left: 5px solid #5bb647;
}
.title-paragraph-dialog {
margin-top: 20px;
margin-left: 0px;
margin-bottom: 30px;
border-left: 3px solid #5FB54B;
border-bottom: 24px;
padding-top: 1px;
padding-bottom: 1px;
.title-text {
font-size: 16px;
font-weight: bold;
padding-left: 12px;
}
}
</style>
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