Skip to content

P
pet-business-web
Commit 12a3f157 authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0790d7ce 4dbba44e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 797 additions and 967 deletions
src/api/business/register.js
View file @ 12a3f157
import request from '@/utils/request' import request from '@/utils/request'
import { param } from '@/utils'
// 查询挂号列表 // 查询挂号列表
export function listRegister(query) { export function listRegister(query) {
......
src/views/document-management/about-us/about-us.vue
View file @ 12a3f157
...@@ -60,21 +60,30 @@ export default { ...@@ -60,21 +60,30 @@ export default {
this.$modal.msgError('内容不能为空') this.$modal.msgError('内容不能为空')
return return
} }
if (this.isAdd) { this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
// 新增 confirmButtonText: '确定',
addManagement(this.privacyPolicy).then(response => { cancelButtonText: '取消',
if (response.code === 200) { customClass: 'box-logout',
this.$modal.msgSuccess('编辑成功') cancelButtonClass: 'resetBtn',
} confirmButtonClass: 'queryBtn',
}) type: 'warning'
} else { }).then(() => {
// 修改 if (this.isAdd) {
updateManagement(this.privacyPolicy).then(response => { // 新增
if (response.code === 200) { addManagement(this.privacyPolicy).then(response => {
this.$modal.msgSuccess('编辑成功') if (response.code === 200) {
} this.$modal.msgSuccess('编辑成功')
}) }
} })
} else {
// 修改
updateManagement(this.privacyPolicy).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess('编辑成功')
}
})
}
})
}, },
getPrivacyPolicy() { getPrivacyPolicy() {
listManagement({ type: '2' }).then(res => { listManagement({ type: '2' }).then(res => {
......
src/views/document-management/entry-contract/entry-contract.vue
View file @ 12a3f157
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="title-text">授权合同</span> <span class="title-text">授权合同</span>
</div> </div>
<!-- 授权合同表 --> <!-- 授权合同表 -->
<el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;"> <el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;overflow: auto;">
<el-table-column prop="createTime" label="授权日期"> <el-table-column prop="createTime" label="授权日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
...@@ -161,6 +161,7 @@ export default { ...@@ -161,6 +161,7 @@ export default {
}, },
downloadPdf(row) { downloadPdf(row) {
this.$download.resource(row.contract) this.$download.resource(row.contract)
this.$modal.msgSuccess('正在下载中，请稍等…')
}, },
/** 通过授权历史获取到期日期 */ /** 通过授权历史获取到期日期 */
addDays(date, str) { addDays(date, str) {
......
src/views/document-management/privacy-policy/privacy-policy.vue
View file @ 12a3f157
...@@ -60,21 +60,30 @@ export default { ...@@ -60,21 +60,30 @@ export default {
this.$modal.msgError('内容不能为空') this.$modal.msgError('内容不能为空')
return return
} }
if (this.isAdd) { this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
// 新增 confirmButtonText: '确定',
addManagement(this.privacyPolicy).then(response => { cancelButtonText: '取消',
if (response.code === 200) { customClass: 'box-logout',
this.$modal.msgSuccess('编辑成功') cancelButtonClass: 'resetBtn',
} confirmButtonClass: 'queryBtn',
}) type: 'warning'
} else { }).then(() => {
// 修改 if (this.isAdd) {
updateManagement(this.privacyPolicy).then(response => { // 新增
if (response.code === 200) { addManagement(this.privacyPolicy).then(response => {
this.$modal.msgSuccess('编辑成功') if (response.code === 200) {
} this.$modal.msgSuccess('编辑成功')
}) }
} })
} else {
// 修改
updateManagement(this.privacyPolicy).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess('编辑成功')
}
})
}
})
}, },
getPrivacyPolicy() { getPrivacyPolicy() {
listManagement({ type: '0' }).then(res => { listManagement({ type: '0' }).then(res => {
......
src/views/document-management/user-protocol/user-protocol.vue
View file @ 12a3f157
...@@ -60,21 +60,30 @@ export default { ...@@ -60,21 +60,30 @@ export default {
this.$modal.msgError('内容不能为空') this.$modal.msgError('内容不能为空')
return return
} }
if (this.isAdd) { this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
// 新增 confirmButtonText: '确定',
addManagement(this.privacyPolicy).then(response => { cancelButtonText: '取消',
if (response.code === 200) { customClass: 'box-logout',
this.$modal.msgSuccess('编辑成功') cancelButtonClass: 'resetBtn',
} confirmButtonClass: 'queryBtn',
}) type: 'warning'
} else { }).then(() => {
// 修改 if (this.isAdd) {
updateManagement(this.privacyPolicy).then(response => { // 新增
if (response.code === 200) { addManagement(this.privacyPolicy).then(response => {
this.$modal.msgSuccess('编辑成功') if (response.code === 200) {
} this.$modal.msgSuccess('编辑成功')
}) }
} })
} else {
// 修改
updateManagement(this.privacyPolicy).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess('编辑成功')
}
})
}
})
}, },
getPrivacyPolicy() { getPrivacyPolicy() {
listManagement({ type: '1' }).then(res => { listManagement({ type: '1' }).then(res => {
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ 12a3f157
...@@ -307,9 +307,9 @@ export default { ...@@ -307,9 +307,9 @@ export default {
console.log('点击立即预约', row) console.log('点击立即预约', row)
this.getDevice() this.getDevice()
}, },
/** */ /** 获取设备列表 */
getDevice() { getDevice() {
listReservationDevice().then(res => { listReservationDevice({ reservationTime: '2023-06-15' }).then(res => {
console.log('设备', res) console.log('设备', res)
}) })
}, },
......
src/views/service-management/registration-queue/components/doctor-card.vue
View file @ 12a3f157
<template> <template>
<!-- 医生卡片信息封装组件--> <div>
<div class="doctor-card"> <!-- 医生卡片信息封装组件-->
<!--标签--> <!--做单个卡片校验-->
<div class="progress-tip"> <div v-if="docList.length>0" class="doctor-card">
<div class="tip-green"/> <!--标签-->
<div <div class="progress-tip">
class="tip-content" <div class="tip-green"/>
>挂号信息 <div
class="tip-content"
>挂号信息
</div>
</div> </div>
</div> <!--进度内容-->
<!--进度内容--> <div class="card-style">
<div class="card-style"> <!--获取的当日医生数量作为循环-->
<!--获取的当日医生数量作为循环--> <el-card
<el-card v-for="(item,index) in docList"
v-for="(item,index) in docList" :key="index"
:key="index" class="boxside-card"
class="boxside-card" >
> <div class="boxside-content">
<div class="boxside-content"> <!--卡片上半部分-->
<!--卡片上半部分--> <div class="top">
<div class="top"> <!--上--左半部分-->
<!--上--左半部分--> <div class="top-left">
<div class="top-left"> <el-image
<el-image :src="baseURL+item.doctorUrl"
:src="baseURL+item.doctorUrl" class="img"
class="img" fit="cover"
fit="cover" />
/>
</div>
<!--上--右半部分-->
<div class="top-right">
<div
class="name"
>{{ item.doctorName }}
</div> </div>
<div class="content"> <!--上--右半部分-->
<div class="top-right">
<div <div
class="career" class="name"
>{{ item.doctorTitleValue }} >{{ item.doctorName }}
</div> </div>
<div <div class="content">
class="divider-inner" <div
>| class="career"
</div> >{{ item.doctorTitleValue }}
<div </div>
class="department" <div
> {{ item.departmentName }} class="divider-inner"
>|
</div>
<div
class="department"
> {{ item.departmentName }}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!--分割线-->
<!--分割线--> <div class="divider"/>
<div class="divider"/> <!--卡片中间部分-->
<!--卡片中间部分--> <div class="mid-bottom-framework">
<div class="mid-bottom-framework">
<div
v-for="(item,index) in docList"
:key="index"
class="mid-bottom"
>
<el-image
:src="baseURL+item.pictureUrl"
class="mid-bottom-inner"
fit="cover"
/>
</div>
</div>
<!--卡片下半部分-->
<div class="bottom">
<div class="inner">
<div
class="register-tip"
>当日已接挂号
</div>
<div <div
class="register-content" v-for="(item,index) in docList"
>{{ item.recordAllNum }} :key="index"
class="mid-bottom"
>
<el-image
:src="baseURL+item.pictureUrl"
class="mid-bottom-inner"
fit="cover"
/>
</div> </div>
</div> </div>
<div class="inner"> <!--卡片下半部分-->
<div <div class="bottom">
class="time-tip" <div class="inner">
>当日时段已接 <div
</div> class="register-tip"
<div >当日已接挂号
class="time-content" </div>
>{{ item.recordTimeNum }} <div
class="register-content"
>{{ item.recordAllNum }}
</div>
</div> </div>
<div class="inner">
<div
class="time-tip"
>当日时段已接
</div>
<div
class="time-content"
>{{ item.recordTimeNum }}
</div>
</div>
<div class="inner">
<div
class="remain-tip"
>时段剩余号量
</div> </div>
<div <div class="inner">
class="remain-content" <div
>{{ item.residueNum }} class="remain-tip"
>时段剩余号量
</div>
<div
class="remain-content"
>{{ item.residueNum }}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!--底部菜单-->
<!--底部菜单--> <div class="box-content-bottom">
<div class="box-content-bottom"> <div
<div class="content-bottom"
class="content-bottom" >
> <div class="detail" @click="doctorDetail(item.id)">
<div class="detail" @click="doctorDetail(item.id)"> <div class="detail-img">
<div class="detail-img"> <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/>
<el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/> </div>
<el-button
type="text"
>详情
</el-button>
</div> </div>
<el-button <!--给它传一个userId,一个类型和一个默认页数-->
type="text" <div class="register" @click="registration(item.userId,'0',item)">
>详情 <div class="register-img">
</el-button> <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')"/>
</div> </div>
<!--给它传一个userId,一个类型和一个默认页数--> <el-button type="text">挂号</el-button>
<div class="register" @click="registration(item.userId,'0',item)">
<div class="register-img">
<el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')"/>
</div> </div>
<el-button type="text">挂号</el-button> <!--给它传一个userId,一个类型和一个默认页数-->
</div> <div class="add" @click="registration(item.userId, '1',item)">
<!--给它传一个userId,一个类型和一个默认页数--> <div class="add-img">
<div class="add" @click="registration(item.userId, '1',item)"> <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/>
<div class="add-img"> </div>
<el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/> <el-button type="text">加号</el-button>
</div> </div>
<el-button type="text">加号</el-button>
</div> </div>
</div> </div>
</div> </el-card>
</el-card> </div>
</div> </div>
<div v-else>-</div>
</div> </div>
</template> </template>
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 12a3f157
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
> >
<el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small"> <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
<el-form-item label="主治兽医：" prop="petNickname"> <el-form-item label="主治兽医：" prop="petNickname">
<el-input /> <el-input v-model="queryParams.mainDoctor" />
</el-form-item> </el-form-item>
<el-form-item label="是否首诊:" prop="petSex"> <el-form-item label="是否首诊:" prop="petSex">
<el-select <el-select
v-model="queryParams.sterilizationStatus" v-model="queryParams.fristVisit"
clearable clearable
placeholder="请选择首诊情况" placeholder="请选择首诊情况"
style="width: 100%" style="width: 100%"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
icon="el-icon-document" icon="el-icon-document"
plain plain
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);" style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type="success" type="success"
@click="addReservation(scope.row)" @click="addReservation(scope.row)"
>立即预约 >立即预约
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</template> </template>
<script> <script>
import { addRegister, timeRegister } from '@/api/business/register' import { timeRegister } from '@/api/business/register'
export default { export default {
name: 'RegisterModle', name: 'RegisterModle',
...@@ -112,7 +112,11 @@ export default { ...@@ -112,7 +112,11 @@ export default {
// 宠物表格数据 // 宠物表格数据
petsList: [], petsList: [],
loading: true, loading: true,
queryParams: {}, queryParams: {
mainDoctor: '',
firstVisit: '0'
},
fristVisitOptions: [ fristVisitOptions: [
{ {
label: '是', label: '是',
...@@ -146,19 +150,68 @@ export default { ...@@ -146,19 +150,68 @@ export default {
}, },
// 新增预约接口 // 新增预约接口
addReservation(data) { addReservation(data) {
console.log('gggggg', data, this.doctorForm, this.singleDoctor) // data指这一行的信息，this.doctorForm指的是挂号页宠主宠物信息，this.singleDoctor指的是当日挂号医生列表信息
console.log('这是弹窗本身的行信息：', data)
console.log('这是宠物宠主本身的信息：', this.doctorForm)
console.log('这是当日挂号列表信息 ：', this.singleDoctor)
data.visitWay = '0'
data.visitFirstTime = ''
data.payStatus = '0'
data.petPicture = ''
// 进度
data.checkSchedule = '0'
data.payAmount = ''
data.payType = '0'
const temp = { const temp = {
petOwnersName: data.petOwnersName type: this.registrationType,
// 宠物宠主本身的信息
petsId: this.doctorForm.petsId,
petOwnersId: this.doctorForm.ownersId,
petOwnersName: this.doctorForm.nickName,
petOwnersPhone: this.doctorForm.phoneNumber,
petNickname: this.doctorForm.petNickname,
petBreed: this.doctorForm.petBreed,
petSex: this.doctorForm.petSex,
petAge: this.doctorForm.petBrithday,
petWeight: this.doctorForm.petWeight,
petColor: this.doctorForm.petColor,
sterilizationStatus: this.doctorForm.sterilizationStatus,
vaccineSituation: this.doctorForm.vaccineSituation,
insure: this.doctorForm.insure,
// 进度
checkSchedule: data.checkSchedule,
payAmount: data.payAmount,
payType: data.payType,
visitDateTime: this.doctorForm.visitDateTime,
// 这是当日挂号列表信息
doctorId: this.singleDoctor.doctorCode,
userId: this.singleDoctor.userId,
doctorName: this.singleDoctor.doctorName,
hospitalId: this.singleDoctor.deptId,
hospitalName: this.singleDoctor.deptName,
hospitalDepartmentId: this.singleDoctor.departmentId,
hospitalDepartmentName: this.singleDoctor.departmentName,
doctorPhone: this.singleDoctor.doctorPhone,
// 给传0
visitWay: data.visitWay,
// 下拉传值
firstVisit: this.queryParams.firstVisit,
visitDate: data.workDate,
visitTime: data.hours,
scheduleId: data.scheduleId,
// 拼接 (日期+时间段的第一个时间)
visitFirstTime: data.visitFirstTime,
// 默认是0代缴费
payStatus: data.payStatus,
// 给传个null
petPicture: data.petPicture,
doctorSignatureUrl: this.singleDoctor.doctorSignatureUrl,
visitLocation: this.singleDoctor.visitLocation,
doctorTitleLabel: this.singleDoctor.doctorTitleValue
} }
console.log('KKKKKKKKKKKKKKK', temp) console.log('终极大表', temp)
// 将整个界面对象传新增挂号接口
// addRegister(temp).then(response => {
// this.$message({
// type: 'success',
// message: '预约成功!'
// })
// this.$emit('registerModleClose', false)
// })
}, },
submit() { submit() {
}, },
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ 12a3f157
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);" style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
type="warning" type="warning"
@click="handleDetail(scope.row, 'enter')" @click="handleDetail(scope.row, 'enter')"
>录入诊断 >
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
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