Commit f3b934c9 authored by 小费同学阿's avatar 小费同学阿 💬

Merge remote-tracking branch 'origin/master'

parents 79505abc 781ac5aa
......@@ -54,7 +54,14 @@ export function listDevice(query) {
params: query
})
}
// 查询设备列表不分页
export function listDeviceAll(query) {
return request({
url: '/business/device/deviceList',
method: 'get',
params: query
})
}
// 查询设备详细
export function getDevice(id) {
return request({
......
......@@ -9,6 +9,15 @@ export function listHistory(query) {
})
}
// 不分页查询授权历史列表
export function listNoPageHistory(query) {
return request({
url: '/system/history/listNoPage',
method: 'get',
params: query
})
}
// 查询授权历史详细
export function getHistory(id) {
return request({
......
......@@ -9,6 +9,14 @@ export function listManage(query) {
})
}
export function listCheckManage(query) {
return request({
url: '/business/check/checkList',
method: 'get',
params: query
})
}
// 查询业务管理-检查管理详细
export function getManage(id) {
return request({
......
......@@ -16,7 +16,7 @@ export function listUseManagement(query) {
})
}
// 查询使用列表分页
// 查询使用列表
export function listUseManagementAll(query) {
return request({
url: '/business/check/useListAll',
......@@ -25,5 +25,13 @@ export function listUseManagementAll(query) {
})
}
// 导出
// 检查项目
export function selectCheckItem(query) {
return request({
url: '/business/item/checkListByDept',
method: 'get',
params: query
})
}
......@@ -117,9 +117,10 @@ export const constantRoutes = [
component: () => import('@/views/equipment-management/equipment-management/equipment-management'),
name: 'EquipmentManagement',
meta: { title: '设备管理', icon: 'date' }
},
{
path: 'equipment-detail/:id',
path: 'equipment-detail/:id/:identify',
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentDetail',
......@@ -132,6 +133,7 @@ export const constantRoutes = [
name: 'EquipmentAdd',
meta: { title: '设备新增' }
},
{
path: 'use-management',
props: true,
......
......@@ -5,7 +5,7 @@
</div>
<el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>关于我们:</span>
<span>关于我们</span>
</el-col>
<el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入关于我们'" />
......@@ -104,6 +104,7 @@ export default {
.title-text {
margin-left: 10px;
font-weight: bold;
}
}
}
......
......@@ -4,10 +4,10 @@
<span class="title-text">入驻合同</span>
</div>
<!-- 入驻合同表 -->
<el-table v-loading="loading" :data="entryContract" style="width: 90%;margin: 0 0 0 60px;">
<el-table-column prop="createTime" label="入驻时间">
<el-table v-loading="entryLoading" :data="entryContract" style="width: 90%;margin: 0 0 0 60px;">
<el-table-column prop="createTime" label="入驻日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column prop="authorizationDuration" label="授权类型">
......@@ -19,7 +19,7 @@
<el-table-column prop="authorizationDuration" label="授权时长">
<template slot-scope="scope">
<span v-if="scope.row.authorizationDuration < 99">{{ scope.row.authorizationDuration }}</span>
<span v-else>永久</span>
<span v-else>长期</span>
</template>
</el-table-column>
<el-table-column prop="createByName" label="授权账号" />
......@@ -40,9 +40,9 @@
</div>
<!-- 授权合同表 -->
<el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;">
<el-table-column prop="createTime" label="授权时间">
<el-table-column prop="createTime" label="授权日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column prop="authorizationDuration" label="授权类型">
......@@ -57,7 +57,7 @@
<span v-else>长期</span>
</template>
</el-table-column>
<el-table-column prop="" label="授权截止日期">
<el-table-column prop="" label="授权到期日期">
<template slot-scope="scope">
<span>{{ addDays(scope.row.currentTime, scope.row.authorizationDuration) }}</span>
</template>
......@@ -74,12 +74,21 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getContract"
style="margin: 0 50px 0 0"
/>
</div>
</template>
<script>
import { listGetUserInfo } from '../../../api/business/hospital'
import { listHistory } from '../../../api/business/history'
import { listGetUserInfo } from '@/api/business/hospital'
import { listHistory, listNoPageHistory } from '@/api/business/history'
import { parseTime } from '@/utils/ruoyi'
export default {
name: 'EntryContract',
......@@ -93,7 +102,15 @@ export default {
entryContract: [],
// 当前登录的医院ID
currentHospitalId: '',
loading: true
loading: true,
entryLoading: true,
total: 0,
queryParams: {
pageNum: 1,
pageSize: 10,
hospitalId: null
},
id: null
}
},
mounted() {
......@@ -103,19 +120,32 @@ export default {
}, 500)
},
methods: {
getEntryContract() {
this.queryParams.hospitalId = this.currentHospitalId
listNoPageHistory(this.queryParams).then(res => {
console.log('aaaa', res)
const list = res.rows
const lastData = list.pop()
this.entryContract.push(lastData)
this.entryContract = this.entryContract.filter((obj, index, self) => index === self.findIndex((t) => (t.id === obj.id)))
this.id = this.entryContract[0].id
this.entryLoading = false
})
},
getContract() {
console.log('xxxx', this.currentHospitalId)
listHistory({ hospitalId: this.currentHospitalId }).then(res => {
this.queryParams.hospitalId = this.currentHospitalId
listHistory(this.queryParams).then(res => {
const list = res.rows
this.total = res.total - 1
console.log('授权历史312', list)
const lastData = list.pop()
console.log('---123', lastData)
this.entryContract.push(lastData)
this.authorizationHistory = list
this.authorizationHistory = this.authorizationHistory.filter((obj) => obj.id !== this.id)
console.log('授权合同', this.authorizationHistory)
console.log('入驻合同', this.entryContract)
this.loading = false
})
this.getEntryContract()
},
getCurrentHospital() {
listGetUserInfo().then(res => {
......@@ -139,12 +169,12 @@ export default {
}
const days = str.split('.')[0]
if (parseInt(days) >= 99) {
return '长期'
return '2099/12/31'
}
const result = new Date(date)
result.setDate(result.getDate() + days * 365)
const formatTime = this.formatTime(result)
return formatTime
return parseTime(formatTime, '{y}/{m}/{d}')
},
/** 格式化时间-年月日 */
formatTime(date) {
......@@ -168,8 +198,8 @@ export default {
<style scoped lang="scss">
.contract-container {
width: 1640px;
height: 880px;
width: 1720px;
height: 960px;
//margin: 0 0 0 15px;
padding: 10px 0 80px 0;
background-color: #FFFFFF;
......@@ -179,6 +209,7 @@ export default {
.title-text {
margin-left: 10px;
font-weight: bold;
}
}
}
......
......@@ -5,7 +5,7 @@
</div>
<el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>用户协议:</span>
<span>隐私政策</span>
</el-col>
<el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入隐私政策'" />
......@@ -105,6 +105,7 @@ export default {
.title-text {
margin-left: 10px;
font-weight: bold;
}
}
}
......
......@@ -5,7 +5,7 @@
</div>
<el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>用户协议:</span>
<span>用户协议</span>
</el-col>
<el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入用户协议'" />
......@@ -104,6 +104,7 @@ export default {
.title-text {
margin-left: 10px;
font-weight: bold;
}
}
}
......
......@@ -156,7 +156,7 @@
<!-- 5-->
<el-row>
<el-col :span="8">
<el-col :span="8" style="margin-left: 33.5%">
<el-form-item label="下午开始时间">
<el-time-select
style="width: 250px"
......@@ -268,8 +268,8 @@
</el-form>
<el-row>
<el-col style="display: flex;justify-content: center;margin-top: 20px">
<el-button class="queryBtn" type="primary" size="mini" @click="submitForm">确 认</el-button>
<el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
<el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
</el-col>
</el-row>
......
......@@ -160,7 +160,7 @@
<!-- 5-->
<el-row>
<el-col :span="8">
<el-col :span="8" style="margin-left: 33.5%">
<el-form-item label="下午开始时间" prop="userTime">
<el-time-select
v-model="useTime.pms"
......@@ -275,7 +275,7 @@
</el-form>
<el-row>
<el-col style="display: flex;justify-content: center;margin-top: 20px">
<el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
<el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
</el-col>
</el-row>
</el-card>
......@@ -448,7 +448,7 @@
<!-- 5-->
<el-row>
<el-col :span="8">
<el-col :span="8" style="margin-left: 33.5%">
<el-form-item label="下午开始时间" prop="userTime">
<el-time-select
style="width: 250px"
......@@ -560,8 +560,8 @@
</el-form>
<el-row>
<el-col style="display: flex;justify-content: center;margin-top: 20px">
<el-button class="queryBtn" type="primary" size="mini" @click="submitForm">确 认</el-button>
<el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
<el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
</el-col>
</el-row>
</el-card>
......
......@@ -70,7 +70,7 @@
<el-row>
<el-col :span="12" style="padding-bottom: 20px;">
<el-button
v-hasPermi="['system:device:add']"
v-hasPermi="['business:device:add']"
class="fourWordsBtn"
icon="el-icon-plus"
@click="handleAdd"
......@@ -89,14 +89,14 @@
>反向选择
</el-button>
<el-button
v-hasPermi="['system:device:import']"
v-hasPermi="['business:device:import']"
class="fourWordsBtn"
icon="el-icon-bottom-left"
@click="handleImport"
>批量导入
</el-button>
<el-button
v-hasPermi="['system:device:export']"
v-hasPermi="['business:device:export']"
class="fourWordsBtn"
icon="el-icon-top-right"
@click="handleExport"
......@@ -160,16 +160,16 @@
style="color: #DB4747;"
>{{ showStatus(scope.row.status) || '-' }}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
<!-- {{ showStatus(scope.row.status)||'-' }}-->
<!-- </span>-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
<!-- {{ showStatus(scope.row.status)||'-' }}-->
<!-- </span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:device:edit']"
v-hasPermi="['business:device:edit']"
size="mini"
type="success"
icon="el-icon-document"
......@@ -179,7 +179,7 @@
>详情
</el-button>
<el-button
v-hasPermi="['system:device:edit']"
v-hasPermi="['business:device:edit']"
plain
size="mini"
type="success"
......@@ -346,10 +346,9 @@
<script>
import { regionData, CodeToText } from 'element-china-area-data'
import { listDevice, getDevice, delDevice } from '@/api/business/device'
import { listDevice, getDevice, delDevice, listDeviceAll } from '@/api/business/device'
import { getInfo } from '@/api/login'
import { parseTime } from '@/utils/ruoyi'
import {listUseManagementAll} from "@/api/business/use";
export default {
name: 'EquipmentManagement',
......@@ -604,7 +603,6 @@ export default {
// this.deviceList.forEach(item => {
// this.$set(item, 'checkTypeArr', item.checkType.split(','))
// })
console.log('deviceList', this.deviceList)
this.total = response.total
this.loading = false
})
......@@ -699,22 +697,22 @@ export default {
name: 'EquipmentAdd'
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getDevice(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改设备'
this.serviceAreaS = this.form.serviceArea.split(';')
this.serviceArea = []
for (let i = 0; i < this.serviceAreaS.length; i++) {
this.serviceAreaS[i] = this.serviceAreaS[i].split(',')
this.serviceArea.push(this.serviceAreaS[i])
}
})
},
// /** 修改按钮操作 */
// handleUpdate(row) {
// this.reset()
// const id = row.id || this.ids
// getDevice(id).then(response => {
// this.form = response.data
// this.open = true
// this.title = '修改设备'
// this.serviceAreaS = this.form.serviceArea.split(';')
// this.serviceArea = []
// for (let i = 0; i < this.serviceAreaS.length; i++) {
// this.serviceAreaS[i] = this.serviceAreaS[i].split(',')
// this.serviceArea.push(this.serviceAreaS[i])
// }
// })
// },
// // 全部选择
// selectAll() {
// this.$refs.table.toggleAllSelection()
......@@ -731,7 +729,7 @@ export default {
* @param all 是否永远进行全选操作
*/
async selectAll(selection = [], all = true) {
if (this.userList.length !== selection.length && !all) {
if (this.deviceList.length !== selection.length && !all) {
this.effectTableSelect([])
} else {
await this.changeTableSelect()
......@@ -753,7 +751,7 @@ export default {
*/
async changeTableSelect(notIncludeIds = []) {
// 获取反选的数据
const { data } = await listUseManagementAll({ notIncludeIds })
const { data } = await listDeviceAll({ notIncludeIds })
this.effectTableSelect(data)
},
// 反向选择
......@@ -775,7 +773,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/device/export', {
this.download('business/device/export', {
...this.queryParams
}, `device_${new Date().getTime()}.xlsx`)
}
......
......@@ -12,17 +12,17 @@
<el-form-item prop="status">
<el-select v-model="queryParams.checkItemsIdList" placeholder="检查项目" multiple collapse-tags clearable>
<el-option
v-for="dict in dict.type.exam_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="(item,index) in checkList"
:key="index"
:label="item.dictName"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item prop="status">
<el-select v-model="queryParams.insureList" placeholder="宠物保险" multiple collapse-tags clearable>
<el-option
v-for="dict in dict.type.pet_insure"
v-for="dict in insureList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -88,7 +88,7 @@
</el-col>
</el-row>
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" @select-all="selectAll($event, false)">
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="设备ID" align="left" prop="deviceCode" :show-overflow-tooltip="true" />
......@@ -96,7 +96,7 @@
<el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true" />
<el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
<dict-tag :options="insureList" :value="scope.row.insure" />
</template>
</el-table-column>
<el-table-column label="宠主姓名" align="left" prop="ownerNikename" />
......@@ -153,13 +153,30 @@
</template>
<script>
import { listUseManagement, listUseManagementAll } from '@/api/business/use'
import { listUseManagement, listUseManagementAll, selectCheckItem } from '@/api/business/use'
export default {
name: 'UseManagement',
dicts: ['exam_type', 'device_status', 'pet_insure'],
data() {
return {
// 检查项目下拉框
checkList: [],
// 宠物保险下拉框
insureList: [
{
label: '全部',
value: '1'
},
{
label: '已购保险',
value: '2'
},
{
label: '未购保险',
value: '3'
}
],
// 可以使用的时间段时间范围
daterangeCreateTime: '',
// 多选框选中id
......@@ -226,8 +243,15 @@ export default {
},
created() {
this.getUseList()
this.getCheckList()
},
methods: {
// 检查项目下拉框
getCheckList() {
selectCheckItem().then(res => {
this.checkList = res
})
},
// 搜索
handleQuery() {
this.queryParams.pageNum = 1
......
<template>
<div style="background-color: #FFFFFF;">
<!-- 病历管理--宠物编辑页-->
<div class="pet-detail">
<div class="medical-edit">
<!-- 头部标题-->
<div style="padding-top:32px;text-align: center;">
<span
......@@ -425,24 +425,47 @@ color: #333333;"
</el-row>
</el-form>
<!--7--用药信息-->
<div style="display: flex">
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
class="tip-text"
>用药信息
</div>
</div>
<el-button
class="fourWordsBtn"
icon="el-icon-circle-plus-outline"
size="mini"
@click="handleAdd('petProtect')"
>新增用药
</el-button>
</div>
<!-- 内部信息 -->
<div class="pet-insurance">
<div class="table-content">
<el-form ref="drugForm" :model="drugForm" label-width="0" :rules="drugRules" class="demo-ruleForm">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="药品名称" prop="protectName">
<el-input v-model="form.petId" maxlength="20" />
<template slot-scope="scope">
<el-form-item v-if="scope.row.inputShow" :prop="'tableData.'+scope.$index+'.protectName'" :rules="drugRules.protectName">
<el-select v-model="scope.row.protectName" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in drugList"
:key="index"
:label="item.dictLabel"
:value="String(item.dictCode)"
/>
</el-select>
</el-form-item>
<span v-else>{{ scope.row.protectName === '' || scope.row.protectName === null ? '-' : scope.row.protectName }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="规格" prop="type" />
<el-table-column align="center" label="数量" prop="date" />
<el-table-column align="center" label="用法" prop="date" />
<el-table-column align="center" label="开药日期" prop="date" />
<el-table-column align="center" label="缴费状态" prop="date" />
<el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
<template slot-scope="scope">
<el-button
......@@ -462,9 +485,19 @@ color: #333333;"
size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
type="primary"
@click="handleUpdate(scope.row)"
@click="handleUpdate(scope.$index,'petProtect')"
>编辑
</el-button>
<el-button
v-hasPermi="['business:case:save']"
icon="el-icon-edit"
plain
size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
type="primary"
@click="handleSave('drugForm','petProtect', scope.$index)"
>保存
</el-button>
<el-button
v-hasPermi="['business:case:edit']"
icon="el-icon-document"
......@@ -478,6 +511,7 @@ color: #333333;"
</template>
</el-table-column>
</el-table>
</el-form>
</div>
<!--8--检查信息-->
<div style="display: flex">
......@@ -488,7 +522,7 @@ color: #333333;"
</div>
</div>
<!-- 内部信息 -->
<div class="pet-insurance">
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="检查类型" prop="protectName" />
<el-table-column align="center" label="检查项目" prop="type" />
......@@ -540,7 +574,7 @@ color: #333333;"
</div>
</div>
<!-- 内部信息 -->
<div class="pet-insurance">
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="治疗项目" prop="protectName" />
<el-table-column align="center" label="治疗类型" prop="type" />
......@@ -593,7 +627,7 @@ color: #333333;"
</div>
</div>
<!-- 内部信息 -->
<div class="pet-insurance">
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="入院日期" prop="protectName" />
<el-table-column align="center" label="住院天数" prop="type" />
......@@ -646,7 +680,7 @@ color: #333333;"
</div>
</div>
<!-- 内部信息 -->
<div class="pet-insurance">
<div class="table-content">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="收费项" prop="protectName" />
<el-table-column align="center" label="明细" prop="type" />
......@@ -678,6 +712,14 @@ export default {
},
data() {
return {
editCunt: {
petProtect: 0
},
drugList: [], // 药品列表
map: {
},
drugForm: {}, // 用药管理table编辑
drugRules: {},
form: {},
// 排序下拉框
insureList: [
......@@ -765,11 +807,13 @@ export default {
petProtect: [{
protectName: '人兽保险',
type: '意外保险',
date: '2025/04/18'
date: '2025/04/18',
inputShow: false
}, {
protectName: '平安保险',
type: '人身保险',
date: '2026/03/25'
date: '2026/03/25',
inputShow: false
}]
}
},
......@@ -777,6 +821,38 @@ export default {
},
methods: {
/** 编辑行*/
handleUpdate(index, tableData) {
// 每个表格只有一行可编辑
if (this.editCunt[tableData] === 0) {
this[tableData][index]['inputShow'] = true
this.editCunt[tableData] += 1
} else {
this.$message({
message: '只可同时编辑一行',
info: 'success'
})
}
},
/** 新增行*/
handleAdd(tableName) {
this[tableName].unshift({
protectName: '',
type: '',
date: '',
inputShow: false
})
},
/** 保存行*/
handleSave(formName, listName, index) {
this.$refs[formName].validate((valid) => {
console.log('22222222222', valid, this[formName], this[listName])
if (valid) {
this[listName][index].inputShow = false
this.editCunt[listName] -= 1
}
})
},
parseTime,
selectDictLabel,
/**
......@@ -802,7 +878,22 @@ export default {
</script>
<style lang="scss" scoped>
//整个页面整体布局
.pet-detail {
.medical-edit {
// 项目标题
.title-content{
display: flex;
justify-content: space-between;
.title-left{
display: flex;
.tip-text{
padding-left: 13px;
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
font-weight: bold;
color: #333333;
}
}
}
//最外层嵌套卡片的样式
.box-card {
margin: 20px 20px 20px 20px;
......@@ -841,7 +932,7 @@ export default {
}
//2--宠物保险--模块内信息整体样式
.pet-insurance {
.table-content {
margin: 35px 1% 20px;
}
......@@ -909,3 +1000,13 @@ export default {
color: #333333;
}
</style>
<style lang="scss">
.medical-edit {
// 表格中输入框样式
.el-table{
.el-form-item{
margin-bottom: 0;
}
}
}
</style>
......@@ -17,17 +17,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称">
<span>1</span>
<span>{{ checkDetail.petNickname }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物ID">
<span>2</span>
<span>{{ checkDetail.petsId }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种">
<span>3</span>
<span>{{ checkDetail.petBreed }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -35,17 +35,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物性别">
<span>1</span>
<span>{{ checkDetail.petSex }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物年龄">
<span>2</span>
<span>{{ checkDetail.petAge }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物体重">
<span>3</span>
<span>{{ checkDetail.petWeight + 'kg'}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -53,17 +53,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物毛色">
<span>1</span>
<span>{{ checkDetail.petColor }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绝育情况">
<span>2</span>
<span>{{ checkDetail.sterilizationStatus === '0' ? '已绝育' : '未绝育' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="疫苗情况">
<span>3</span>
<span>{{ checkDetail.vaccineSituation === '0' ? '当年已接种' : '当年未接种' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -71,7 +71,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物保险">
<span>1</span>
<span>{{ checkDetail.insure === '0' ? '未购保险' : '已购保险' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -82,17 +82,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠主姓名">
<span>1</span>
<span>{{ checkDetail.nickname }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户ID">
<span>2</span>
<span>{{ checkDetail.ownersId || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号">
<span>3</span>
<span>{{ checkDetail.phonenumber }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -101,11 +101,11 @@
</div>
<!-- 步骤条 -->
<div>
<el-steps :active="2" align-center>
<el-steps :active="schedule" align-center>
<el-step title="开具处方单" description="这是一段很长很长很长的描述性文字" />
<el-step title="缴费开票" description="这是一段很长很长很长的描述性文字" />
<el-step title="预约检查" description="这段就没那么长了" />
<el-step title="步骤 4" description="这段就没那么长了!!!" />
<el-step title="检查获取报告" description="这段就没那么长了!!!" />
</el-steps>
</div>
<div class="title-paragraph">
......@@ -115,17 +115,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="缴费金额">
<span>1</span>
<span>{{ checkDetail.payAmount }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费方式">
<span>2</span>
<span>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费时间">
<span>3</span>
<span>{{ checkDetail.payTime }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -133,41 +133,43 @@
<span class="title-text">预约信息</span>
</div>
<el-button @click="bookNow">立即预约</el-button>
<!-- 预约信息 -->
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
<span>{{ checkDetail.checkType === '0' ? '医院自有服务' : '预约外部服务' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备服务">
<span>2</span>
<el-form-item label="设备服务费用">
<span>{{ checkDetail.devicePrice }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="下单时间">
<span>3</span>
<span>{{ checkDetail.appointTime || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title-paragraph">
<span class="title-text">检查信息</span>
</div>
<!-- 1 -->
<!-- 检查信息 -->
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
<el-form-item label="检查项目">
<span>{{ checkDetail.checkItemsName || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备服务器">
<span>2</span>
<el-form-item label="检查状态">
<span v-show="checkDetail.checkSchedule < 3">未检查</span>
<span v-show="checkDetail.checkSchedule === 3">已检查</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="下单时间">
<span>3</span>
<el-form-item label="设备">
<span>{{ checkDetail.deviceName }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -175,17 +177,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="检查日期">
<span>1</span>
<span>{{ checkDetail.checkStartTime }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查时段">
<span>2</span>
<span>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报告上传时间">
<span>3</span>
<span>{{ checkDetail.reportTime }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -193,7 +195,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="影像报告">
<span>1</span>
<span>{{ checkDetail.shadowReport }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -209,14 +211,22 @@ export default {
name: 'CheckDetail',
data() {
return {
checkDetail: ''
checkDetail: {},
schedule: 1
}
},
created() {
const detail = this.$route.query.detail
this.checkDetail = detail
this.schedule = parseInt(this.checkDetail.checkSchedule) + 1
console.log('传过来的详情信息', detail)
},
methods: {
// 点击 预约信息-立即预约
bookNow() {
this.$router.push({
path: '/check-subscribe'
path: '/check-subscribe',
query: { subscribe: this.checkDetail }
})
},
// 返回上一页
......
......@@ -17,17 +17,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称">
<span>1</span>
<span>{{ subscribeMessage.petNickname }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物ID">
<span>2</span>
<span>{{ subscribeMessage.petsId }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物品种">
<span>3</span>
<span>{{ subscribeMessage.petBreed }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -35,17 +35,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物性别">
<span>1</span>
<span>{{ subscribeMessage.petSex }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物年龄">
<span>2</span>
<span>{{ subscribeMessage.petAge }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宠物体重">
<span>3</span>
<span>{{ subscribeMessage.petWeight + 'kg' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -53,17 +53,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物毛色">
<span>1</span>
<span>{{ subscribeMessage.petColor }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绝育情况">
<span>2</span>
<span>{{ subscribeMessage.sterilizationStatus === '0' ? '已绝育' : '未绝育' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="疫苗情况">
<span>3</span>
<span>{{ subscribeMessage.vaccineSituation === '0' ? '当年已接种' : '当年未接种' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -71,7 +71,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="宠物保险">
<span>1</span>
<span>{{ subscribeMessage.insure === '0' ? '未购保险' : '已购保险' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -82,17 +82,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="检查类型">
<span>1</span>
<span>{{ subscribeMessage.checkType === '0' ? '医院自有服务' : '预约外部服务' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查项目">
<span>2</span>
<span>{{ subscribeMessage.checkItemsName || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费金额">
<span>3</span>
<span>{{ subscribeMessage.payAmount }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -165,9 +165,14 @@ export default {
return {
checkDetail: {},
queryParams: {},
total: 0
total: 0,
subscribeMessage: {}
}
},
created() {
const subscribe = this.$route.query.subscribe
this.subscribeMessage = subscribe
},
methods: {
handleDelete() {
},
......
......@@ -84,22 +84,57 @@
<el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" align="center" prop="petOwnersId" />
<el-table-column label="检查类型" align="center" prop="petNickname" />
<el-table-column label="检查项目" align="center" prop="petBreed" />
<el-table-column label="宠物昵称" align="center" prop="petSex" />
<el-table-column label="宠物保险" align="center" prop="petAge" />
<el-table-column label="宠主姓名" align="center" prop="petWeight" />
<el-table-column label="联系方式" align="center" prop="petColor" />
<el-table-column label="预约兽医" align="center" prop="sterilizationStatus" />
<el-table-column label="所属科室" align="center" prop="vaccineSituation" />
<el-table-column label="缴费状态" align="center" prop="insure" />
<el-table-column label="预约状态" align="center" prop="checkSchedule" />
<el-table-column label="检查状态" align="center" prop="payAmount" />
<el-table-column label="检查日期" align="center" prop="payType" />
<el-table-column label="检查时段" align="center" prop="payTime" width="180">
<el-table-column label="序号" type="index" align="center" />
<el-table-column label="检查类型" align="center" prop="checkType" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
<dict-tag
:options="dict.type.check_type"
:value="scope.row.checkType"
/>
</template>
</el-table-column>
<el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName" />
<el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname" />
<el-table-column label="宠物保险" align="center" :show-overflow-tooltip="true" prop="insure">
<template slot-scope="scope">
<dict-tag
:options="dict.type.pet_insure"
:value="scope.row.insure"
/>
</template>
</el-table-column>
<el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname" />
<el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" />
<el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName" />
<el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName" />
<el-table-column label="缴费状态" align="center" :show-overflow-tooltip="true" prop="payType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.payment_status"
:value="scope.row.insure"
/>
</template>
</el-table-column>
<el-table-column label="预约状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 2">未预约</span>
<span v-show="scope.row.checkSchedule >= 2">已预约</span>
</template>
</el-table-column>
<el-table-column label="检查状态" align="center" :show-overflow-tooltip="true" prop="checkSchedule">
<template slot-scope="scope">
<span v-show="scope.row.checkSchedule < 3">未检查</span>
<span v-show="scope.row.checkSchedule === 3">已检查</span>
</template>
</el-table-column>
<el-table-column label="检查日期" align="center" :show-overflow-tooltip="true" prop="reportTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检查时段" align="center" :show-overflow-tooltip="true" prop="checkStartTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
......@@ -150,10 +185,10 @@
</template>
<script>
import { listManage, getManage, delManage, addManage, updateManage } from '@/api/business/manage'
import { getManage, delManage, addManage, updateManage, listCheckManage } from '@/api/business/manage'
export default {
name: 'MedicalRecordManagement',
dicts: ['exam_type'],
dicts: ['exam_type', 'check_type', 'pet_insure', 'payment_status'],
data() {
return {
options: [],
......@@ -200,11 +235,10 @@ export default {
/** 查询业务管理-检查管理列表 */
getList() {
this.loading = true
listManage(this.queryParams).then(response => {
listCheckManage(this.queryParams).then(response => {
this.manageList = response.rows
this.total = response.total
this.loading = false
this.manageList.push({})
})
},
// 取消按钮
......@@ -257,7 +291,8 @@ export default {
handleDetails(row) {
console.log('点击详情后', row)
this.$router.push({
path: '/check-detail'
path: '/check-detail',
query: { detail: row }
})
},
/** 修改按钮操作 */
......
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