Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web
This commit is contained in:
commit
188f98c590
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -64,4 +64,24 @@ defineExpose({getImageUrl})
|
|||
height: 178px;
|
||||
display: block;
|
||||
}
|
||||
.avatar-uploader .el-upload {
|
||||
border: 1px dashed var(--el-border-color);
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
transition: var(--el-transition-duration-fast);
|
||||
}
|
||||
|
||||
.avatar-uploader .el-upload:hover {
|
||||
border-color: var(--el-color-primary);
|
||||
}
|
||||
|
||||
.el-icon.avatar-uploader-icon {
|
||||
font-size: 28px;
|
||||
color: #8c939d;
|
||||
width: 178px;
|
||||
height: 178px;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
<template>
|
||||
<Panel title="收费队列">
|
||||
<template #tools>
|
||||
<el-button type="primary" plain size="small">新增患者</el-button>
|
||||
<el-button type="primary" size="small" plain @click="setDate">
|
||||
{{ selectedDateStr }}
|
||||
<el-icon class="el-icon--right">
|
||||
<CaretBottom/>
|
||||
<div @click="setDate" class="date-btn">
|
||||
<span>{{ selectedDateStr }}</span>
|
||||
<el-icon style="margin-left: 21px">
|
||||
<Calendar/>
|
||||
</el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
<el-date-picker
|
||||
v-model="selectedDate"
|
||||
type="date"
|
||||
|
|
@ -25,17 +24,20 @@
|
|||
</span>
|
||||
</div>
|
||||
<div class="search">
|
||||
<el-input
|
||||
v-model="query.keyword"
|
||||
style="height: 100%;width: 100%"
|
||||
placeholder="根据姓名搜索"
|
||||
@input="search"
|
||||
/>
|
||||
<div class="search-input">
|
||||
<el-input
|
||||
v-model="query.keyword"
|
||||
style="height: 100%;width: 100%"
|
||||
placeholder="根据姓名搜索"
|
||||
@input="search"
|
||||
/>
|
||||
</div>
|
||||
<div class="add" @click="addChargeOrder">新增患者</div>
|
||||
<!-- <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
|
||||
</div>
|
||||
<div class="list" v-loading="loading">
|
||||
<el-scrollbar>
|
||||
<ul >
|
||||
<ul>
|
||||
<li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
|
||||
v-for="(item, index) in ChargeQueueList"
|
||||
:key="index" @click="clickItem(item)">
|
||||
|
|
@ -59,18 +61,19 @@
|
|||
</div>
|
||||
</template>
|
||||
</Panel>
|
||||
|
||||
<Edit ref="editRef" @close="init"></Edit>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import {onMounted, ref, watch} from "vue";
|
||||
import {nextTick, onMounted, ref, watch} from "vue";
|
||||
import {post} from "@/utils/request.ts";
|
||||
import Panel from "@/components/common/Panel.vue";
|
||||
import {formatListTime, getCurrentDate, getEndOfDay, getToday} from "@/utils/dateUtils.ts";
|
||||
import {CaretBottom} from "@element-plus/icons-vue";
|
||||
import {formatListTime, getCurrentDate, getEndOfDay} from "@/utils/dateUtils.ts";
|
||||
import {Calendar} from "@element-plus/icons-vue";
|
||||
import {apiConfig} from "@/assets/config/apiConfig.ts";
|
||||
import Edit from "@/components/registration/Edit.vue";
|
||||
|
||||
const curItem = ref<any>({});
|
||||
const emit = defineEmits(['clickItem','getStatus'])
|
||||
const emit = defineEmits(['clickItem', 'getStatus'])
|
||||
const clickItem = (item: any) => {
|
||||
curItem.value = item
|
||||
emit('clickItem', item, query.value.status);
|
||||
|
|
@ -78,17 +81,11 @@ const clickItem = (item: any) => {
|
|||
const loading = ref(false)
|
||||
const ChargeQueueList = ref<any>([]);
|
||||
|
||||
const editRef = ref()
|
||||
const addChargeOrder = () => {
|
||||
const newOrder = {
|
||||
id: -1,
|
||||
patientName: "匿名患者",
|
||||
payType: -1,
|
||||
}
|
||||
if (ChargeQueueList.value[0]?.id == -1) {
|
||||
return
|
||||
}
|
||||
ChargeQueueList.value.unshift(newOrder)
|
||||
clickFirst()
|
||||
nextTick(() => {
|
||||
editRef.value?.init(null, null)
|
||||
})
|
||||
}
|
||||
const clickFirst = () => {
|
||||
clickItem(ChargeQueueList.value[0])
|
||||
|
|
@ -110,8 +107,7 @@ const init = async () => {
|
|||
try {
|
||||
let data: any = await post(apiConfig.RecordGetChargeQueue, {query: query.value}, {catch_error: true})
|
||||
ChargeQueueList.value = data.list
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
ChargeQueueList.value = []
|
||||
} finally {
|
||||
loading.value = false
|
||||
|
|
@ -141,7 +137,7 @@ const statusList = ref([
|
|||
])
|
||||
const tab = (item: any) => {
|
||||
query.value.status = item.value
|
||||
curItem.value={}
|
||||
curItem.value = {}
|
||||
emit('getStatus', item.value)
|
||||
init()
|
||||
}
|
||||
|
|
@ -189,7 +185,6 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
|
|||
init()
|
||||
})
|
||||
const search = (v: any) => {
|
||||
console.log(v)
|
||||
query.value.keyword = v
|
||||
init()
|
||||
}
|
||||
|
|
@ -205,7 +200,21 @@ const search = (v: any) => {
|
|||
height: 74px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
margin: 0;
|
||||
.search-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.add{
|
||||
width: 128px;
|
||||
height: 42px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background: #FFFFFF;
|
||||
border-radius: 6px;
|
||||
border: 1px solid #979797;
|
||||
margin-left: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.list {
|
||||
|
|
@ -321,6 +330,16 @@ const search = (v: any) => {
|
|||
padding-bottom: 10px;
|
||||
}
|
||||
}
|
||||
.date-btn {
|
||||
width: 98px;
|
||||
height: 32px;
|
||||
background: #FFFFFF;
|
||||
border-radius: 6px;
|
||||
border: 1px solid #EAEAEC;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
:deep(.el-input--prefix) {
|
||||
visibility: hidden;
|
||||
|
|
|
|||
|
|
@ -1,41 +1,75 @@
|
|||
<template>
|
||||
<Mask :is-show="show" :width=500 :height="500" title="个人现金部分" @close="show=false" :show-footer="true">
|
||||
<div class="container-wrapper">
|
||||
<div class="container">
|
||||
<div>
|
||||
总金额：{{ socialPayInfo.setlinfo.medfee_sumamt }}<br>
|
||||
基金支付金额：{{ socialPayInfo.setlinfo.fund_pay_sumamt }}<br>
|
||||
个人医保支付金额：{{ socialPayInfo.setlinfo.acct_pay }}<br>
|
||||
个人现金支付金额：{{ socialPayInfo.setlinfo.psn_cash_pay }}<br>
|
||||
</div>
|
||||
<div class="price-type" v-if="socialPayInfo.setlinfo.psn_cash_pay>0">
|
||||
<div
|
||||
class="price-type-item"
|
||||
:class="['btn',payType==item.type?'active':'']"
|
||||
v-for="(item,index) in priceBtnListNoSocial"
|
||||
@click="changePriceType(item.type)"
|
||||
>
|
||||
<div class="image" :style="{'background-color':item.color}">
|
||||
<img style="width: 16px;height: 16px;" :src="item.img" alt=""/>
|
||||
</div>
|
||||
<span>{{ item.name }}</span>
|
||||
</div>
|
||||
<el-input v-model="cash" placeholder="请输入收到现金的数量"></el-input>
|
||||
</div>
|
||||
|
||||
<Mask v-if="!socialPayInfo?.setlinfo.psn_cash_pay" :is-show="show" :width="348" :height="377" title="结算信息"
|
||||
@close="close" :show-footer="true">
|
||||
<div class="container" style="padding: 24px;height: 100%">
|
||||
<div
|
||||
style="background: #F9FAFC;height: 100%;padding: 24px;display: flex;flex-direction: column;justify-content: space-between">
|
||||
<div>总金额：{{ socialPayInfo.setlinfo.medfee_sumamt }}</div>
|
||||
<div>基金支付金额：{{ socialPayInfo.setlinfo.fund_pay_sumamt }}</div>
|
||||
<div> 个人医保支付金额：{{ socialPayInfo.setlinfo.acct_pay }}</div>
|
||||
<div style="color: #ff0000"> 个人现金支付金额：{{ socialPayInfo.setlinfo.psn_cash_pay }}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="bottom">
|
||||
<el-button type="primary" @click="completeSettlement">完成订单</el-button>
|
||||
<el-button @click="cecalOrder">取消订单</el-button>
|
||||
<div class="btn">
|
||||
<span @click="cecalOrder">取消支付</span>
|
||||
<span @click="completeSettlement">完成订单</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</Mask>
|
||||
<Mask v-else :is-show="show" :width="633" :height="401" title="结算信息" @close="show=false" :show-footer="true">
|
||||
<div class="container" style="width:100%;height: 100%;display: flex;padding: 24px">
|
||||
<div
|
||||
style="width:300px;background: #F9FAFC;height: 100%;padding: 24px;margin-right:24px;display: flex;flex-direction: column;justify-content: space-between">
|
||||
<div>总金额：{{ socialPayInfo.setlinfo.medfee_sumamt }}</div>
|
||||
<div>基金支付金额：{{ socialPayInfo.setlinfo.fund_pay_sumamt }}</div>
|
||||
<div> 个人医保支付金额：{{ socialPayInfo.setlinfo.acct_pay }}</div>
|
||||
<div style="color: #ff0000"> 个人现金支付金额：{{ socialPayInfo.setlinfo.psn_cash_pay }}</div>
|
||||
</div>
|
||||
<div style="flex:1;height: 100%">
|
||||
<div class="price-type" v-if="socialPayInfo.setlinfo.psn_cash_pay>0">
|
||||
<div
|
||||
class="btn"
|
||||
:style="{
|
||||
backgroundColor:
|
||||
selectedIndex == index
|
||||
? item.activeBackgroundColor
|
||||
: hoverIndex == index
|
||||
? item.activeBackgroundColor
|
||||
: item.backgrountColor,
|
||||
}"
|
||||
v-for="(item, index) in btnsList"
|
||||
:key="index"
|
||||
@click="changePriceType(item.type,index)"
|
||||
@mouseover="hoverIndex = index"
|
||||
@mouseleave="hoverIndex = null"
|
||||
>
|
||||
<img
|
||||
class="image"
|
||||
:src="selectedIndex == index || hoverIndex == index ? item.imgActive : item.img"
|
||||
alt=""
|
||||
srcset=""
|
||||
style="margin-right: 4px"
|
||||
/>
|
||||
<span class="pay-left-text" :style="{color: selectedIndex==index?'#fff':''}">{{ item.name }}</span>
|
||||
</div>
|
||||
<el-input v-model="cash" placeholder="请输入收到现金的数量" style="height: 100%"></el-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="bottom">
|
||||
<div class="btn">
|
||||
<span @click="cecalOrder">取消支付</span>
|
||||
<span @click="completeSettlement">完成订单</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</Mask>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
|
||||
import Mask from "@/components/common/Mask.vue";
|
||||
import {nextTick, ref} from "vue";
|
||||
import {priceBtnListNoSocial} from "@/assets/config/constants.ts";
|
||||
|
|
@ -46,7 +80,9 @@ import {ElMessage, ElMessageBox} from "element-plus";
|
|||
const socialPayInfo = ref<any>(null)
|
||||
|
||||
const payType = ref(null)
|
||||
const changePriceType = (type: any) => {
|
||||
const selectedIndex = ref(null)
|
||||
const changePriceType = (type: any, index: any) => {
|
||||
selectedIndex.value = index
|
||||
payType.value = type;
|
||||
}
|
||||
const orderInfo = ref<any>(null)
|
||||
|
|
@ -81,22 +117,25 @@ const completeSettlement = () => {
|
|||
|
||||
|
||||
const cecalOrder = () => {
|
||||
ElMessageBox.confirm(
|
||||
`取消后不能恢复，是否确定取消当前订单？`,
|
||||
'Warning',
|
||||
{
|
||||
confirmButtonText: '确认取消',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}
|
||||
).then(() => {
|
||||
post("retail/cancelOrder", {orderId: orderInfo.value.orderId}).then((res: any) => {
|
||||
show.value = false;
|
||||
emit('orderCancel')
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
// ElMessageBox.confirm(
|
||||
// `取消后不能恢复，是否确定取消当前订单？`,
|
||||
// 'Warning',
|
||||
// {
|
||||
// confirmButtonText: '确认取消',
|
||||
// cancelButtonText: '取消',
|
||||
// type: 'warning',
|
||||
// }
|
||||
// ).then(() => {
|
||||
// post("retail/cancelOrder", {orderId: orderInfo.value.orderId}).then((res: any) => {
|
||||
// show.value = false;
|
||||
// emit('orderCancel')
|
||||
// })
|
||||
// })
|
||||
close()
|
||||
}
|
||||
const close=() => {
|
||||
show.value = false
|
||||
cash.value =0
|
||||
}
|
||||
defineExpose({open})
|
||||
|
||||
|
|
@ -113,44 +152,71 @@ const orderCompleted = () => {
|
|||
const orderCanceled = () => {
|
||||
show.value = false;
|
||||
}
|
||||
|
||||
const hoverIndex = ref<any>(null)
|
||||
const btnsList = [
|
||||
{
|
||||
type: 1,
|
||||
name: '微信支付',
|
||||
backgrountColor: '#ecf8fe',
|
||||
activeBackgroundColor: '#80cfdb',
|
||||
img: '/static/images/slices/2.png',
|
||||
imgActive: '/static/images/slices/2-active.png',
|
||||
},
|
||||
{
|
||||
type: 2,
|
||||
name: '支付宝',
|
||||
backgrountColor: '#fff5ec',
|
||||
activeBackgroundColor: '#fdb376',
|
||||
img: '/static/images/slices/3.png',
|
||||
imgActive: '/static/images/slices/3-active.png',
|
||||
},
|
||||
{
|
||||
type: 3,
|
||||
name: '现金支付',
|
||||
backgrountColor: '#ffeeee',
|
||||
activeBackgroundColor: '#ff8686',
|
||||
img: '/static/images/slices/4.png',
|
||||
imgActive: '/static/images/slices/4-active.png',
|
||||
},
|
||||
{
|
||||
type: 4,
|
||||
name: '其他支付',
|
||||
backgrountColor: '#e5f9ff',
|
||||
activeBackgroundColor: '#30e3ca',
|
||||
img: '/static/images/slices/5.png',
|
||||
imgActive: '/static/images/slices/5-active.png',
|
||||
},
|
||||
]
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.price-type {
|
||||
display: flex;
|
||||
margin-top: 20px;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
|
||||
.btn {
|
||||
height: 45px;
|
||||
width: 95px;
|
||||
font-size: 14px;
|
||||
border-radius: 10px;
|
||||
width: 124px;
|
||||
height: 46px;
|
||||
background: #ECF8FE;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
background: #efecec;
|
||||
margin-bottom: 10px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 10px;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
|
||||
.image {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin-right: 3px;
|
||||
border-radius: 23px;
|
||||
background-color: #ffffff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
&:nth-child(3) {
|
||||
margin: 17px 0;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
//color: #fff;
|
||||
//background-color: #409EFF;
|
||||
border: 1px solid #409EFF;
|
||||
&:nth-child(4) {
|
||||
margin: 17px 0;
|
||||
}
|
||||
|
||||
.image {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -160,11 +226,36 @@ const orderCanceled = () => {
|
|||
}
|
||||
|
||||
}
|
||||
.bottom{
|
||||
|
||||
.bottom {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
padding: 0 24px;
|
||||
|
||||
.btn {
|
||||
span {
|
||||
display: inline-block;
|
||||
width: 120px;
|
||||
height: 48px;
|
||||
text-align: center;
|
||||
line-height: 48px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #D8D8D8;
|
||||
margin-left: 21px;
|
||||
cursor: pointer;
|
||||
|
||||
&:nth-child(2) {
|
||||
background: #4D6DE4;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.el-input__inner) {
|
||||
height: 68px;
|
||||
font-size: 22px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<Mask :width="696" :height="409" title="收费" :is-show="show" @close="close" :show-footer="true">
|
||||
<template #default>
|
||||
<div class="content">
|
||||
<div class="content" v-loading="loading">
|
||||
<div class="btns">
|
||||
<div
|
||||
class="btn"
|
||||
|
|
@ -68,7 +68,7 @@ const socialCard = ref<any>({
|
|||
mdtrtCertNo: null,
|
||||
payInfo: {}
|
||||
});
|
||||
|
||||
const loading = ref(false);
|
||||
const show = ref(false)
|
||||
const printReceipt = ref(false);
|
||||
const payType = ref(null);
|
||||
|
|
@ -110,6 +110,7 @@ const completeSettlement = () => {
|
|||
socialSettlement();
|
||||
} else {
|
||||
//其他结算
|
||||
loading.value = true;
|
||||
post('charge/completeOrder', {id: retailOrder.value.id, payType: payType.value}).then((res: any) => {
|
||||
orderCompleted()
|
||||
})
|
||||
|
|
@ -119,6 +120,7 @@ const completeSettlement = () => {
|
|||
|
||||
|
||||
const orderCompleted = () => {
|
||||
loading.value = false;
|
||||
show.value = false;
|
||||
ElMessage.success("保存成功")
|
||||
emit('orderCompleted', printReceipt.value)
|
||||
|
|
@ -144,6 +146,7 @@ const socialSettlement = () => {
|
|||
ElMessage.warning("请刷卡")
|
||||
return;
|
||||
}
|
||||
loading.value = true;
|
||||
const params = {
|
||||
mdtrtCertType: socialCard.value.mdtrtCertType,
|
||||
mdtrtCertNo: socialCard.value.mdtrtCertNo,
|
||||
|
|
@ -161,6 +164,7 @@ const socialSettlement = () => {
|
|||
}
|
||||
const psnPaymentRef = ref();
|
||||
const openPsnPayment = (payInfo: any, orderInfo: any) => {
|
||||
loading.value = false;
|
||||
nextTick(() => {
|
||||
psnPaymentRef.value?.open(payInfo, orderInfo);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ const openSettlement =()=>{
|
|||
<div class="footer">
|
||||
<div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
|
||||
<div class="btn-group" v-if="status">
|
||||
<el-button type="primary" @click="openCheckOut">追溯码</el-button>
|
||||
<el-button type="primary" @click="openSettlement">收费</el-button>
|
||||
<span type="primary" @click="openCheckOut">追溯码</span>
|
||||
<span type="primary" @click="openSettlement">收费</span>
|
||||
</div>
|
||||
</div>
|
||||
</Panel>
|
||||
|
|
@ -49,4 +49,18 @@ const openSettlement =()=>{
|
|||
color: #FF282E
|
||||
}
|
||||
}
|
||||
.btn-group{
|
||||
span{
|
||||
display: inline-block;
|
||||
width: 119px;
|
||||
height: 48px;
|
||||
background: #4D6DE4;
|
||||
border-radius: 8px;
|
||||
margin-left: 24px;
|
||||
color: #fff;
|
||||
line-height: 48px;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -76,7 +76,10 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="操作" v-if="props.status">
|
||||
<template #default="scope">
|
||||
<el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
|
||||
<el-button type="danger" link @click="delGoods(scope.row)">
|
||||
<el-icon style="margin-right: 3px"><Delete /></el-icon>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -103,6 +106,7 @@ import Panel from "@/components/common/Panel.vue";
|
|||
import {ref} from "vue";
|
||||
import {post} from "@/utils/request.ts";
|
||||
import {ElMessage} from "element-plus";
|
||||
import {Delete} from "@element-plus/icons-vue";
|
||||
|
||||
const props = defineProps({
|
||||
status: {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,10 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="操作" v-if="props.status">
|
||||
<template #default="scope">
|
||||
<el-button type="danger" link @click="delService(scope.row)">X</el-button>
|
||||
<el-button type="danger" link @click="delService(scope.row)">
|
||||
<el-icon style="margin-right: 3px"><Delete /></el-icon>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -66,12 +69,13 @@
|
|||
</Panel>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import {defineProps, watchEffect, ref} from "vue";
|
||||
import {defineProps, ref} from "vue";
|
||||
import SearchInput from "@/components/SearchInput.vue";
|
||||
import Panel from "@/components/common/Panel.vue";
|
||||
import {post} from "@/utils/request.ts";
|
||||
import chrgitm_lv from "@/assets/config/directory/chrgitmLv.json"
|
||||
import {ElMessage} from "element-plus";
|
||||
import {ElMessage} from "element-plus"
|
||||
import {Delete} from "@element-plus/icons-vue";
|
||||
|
||||
const props = defineProps({
|
||||
status: {
|
||||
|
|
|
|||
|
|
@ -118,7 +118,6 @@
|
|||
size="small"
|
||||
@change="checkProductionDate(scope.row)"
|
||||
style="width: 100px;"
|
||||
@input="inputProductionDate(scope.row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -214,12 +213,6 @@ const checkProductionDate = (row: any) => {
|
|||
}
|
||||
return true;
|
||||
};
|
||||
const inputProductionDate= (row: any) => {
|
||||
console.log(row)
|
||||
if (row.productionDate && row.expiryDate) {
|
||||
checkExpiryDate(row);
|
||||
}
|
||||
}
|
||||
const checkExpiryDate = (row: any) => {
|
||||
if (!row.expiryDate) {
|
||||
ElMessage.error('有效期不能为空');
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<Panel :title="'就诊队列'" style="height: 100%">
|
||||
<template #tools>
|
||||
<el-button type="primary" plain @click="setDate">
|
||||
{{ selectedDateStr }}
|
||||
<el-icon class="el-icon--right">
|
||||
<CaretBottom/>
|
||||
<div @click="setDate" class="date-btn">
|
||||
<span>{{ selectedDateStr }}</span>
|
||||
<el-icon style="margin-left: 21px">
|
||||
<Calendar/>
|
||||
</el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
<el-date-picker
|
||||
v-model="selectedDate"
|
||||
type="date"
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
<div class="search">
|
||||
<img src="/static/images/outpatient/search.png" class="search-icon" alt="搜索图标">
|
||||
<input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px" >
|
||||
<input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px">
|
||||
</div>
|
||||
<div class="list">
|
||||
<ul style="height: 100%">
|
||||
|
|
@ -57,7 +57,7 @@ import {post} from "@/utils/request.ts";
|
|||
import {formatListTime, getToday, getThisMonth, getCurrentDate, getEndOfDay} from "@/utils/dateUtils.ts";
|
||||
import {apiConfig} from "@/assets/config/apiConfig.ts";
|
||||
import {ElMessageBox} from "element-plus";
|
||||
import {CaretBottom} from '@element-plus/icons-vue'
|
||||
import {Calendar} from '@element-plus/icons-vue'
|
||||
|
||||
const curStatus = ref(1)
|
||||
const search = ref('')
|
||||
|
|
@ -118,7 +118,7 @@ const init = async () => {
|
|||
list.value = data.list
|
||||
if (itemId.value != null) {
|
||||
list.value.forEach((item: any, index: any) => {
|
||||
if (item.id == itemId.value&&curStatus.value == 2) {
|
||||
if (item.id == itemId.value && curStatus.value == 2) {
|
||||
clickLi(item, false)
|
||||
}
|
||||
})
|
||||
|
|
@ -205,6 +205,7 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
|
|||
})
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
|
||||
.tabs {
|
||||
height: 27px;
|
||||
border-bottom: 1px solid #EAEAEC;
|
||||
|
|
@ -321,6 +322,17 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
|
|||
|
||||
}
|
||||
|
||||
.date-btn {
|
||||
width: 98px;
|
||||
height: 32px;
|
||||
background: #FFFFFF;
|
||||
border-radius: 6px;
|
||||
border: 1px solid #EAEAEC;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
:deep(.el-input) {
|
||||
visibility: hidden;
|
||||
width: 0;
|
||||
|
|
@ -329,4 +341,5 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
|
|||
right: 0;
|
||||
top: 50px;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -49,10 +49,6 @@
|
|||
end-placeholder="结束时间"
|
||||
/>
|
||||
</div>
|
||||
<div class="btn">
|
||||
<el-button @click="reset">重置</el-button>
|
||||
<el-button type="primary" @click="getPatientList">搜索</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="middle">
|
||||
<List :patientList="patientList" @rowClick="rowClick"></List>
|
||||
|
|
|
|||
|
|
@ -3,57 +3,66 @@
|
|||
<Panel title="基础信息">
|
||||
<div class="form">
|
||||
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto"
|
||||
class="demo-ruleForm" status-icon>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="机构名称" prop="common_name">
|
||||
class="demo-ruleForm" status-icon label-position="top">
|
||||
<el-descriptions
|
||||
direction="vertical"
|
||||
:column="3"
|
||||
:label-width="100"
|
||||
:label-position="'top'"
|
||||
:border="false"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-descriptions-item label="机构名称">
|
||||
<el-form-item prop="common_name">
|
||||
<el-input v-model="ruleForm.common_name"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="机构简称" prop="common_sortName">
|
||||
<el-input v-model="ruleForm.common_sortName"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="机构简称">
|
||||
<el-form-item>
|
||||
<el-input v-model="ruleForm.common_sortName" style="margin: 0 24px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="定点机构编码" prop="social_fixmedinsCode">
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="定点机构编码">
|
||||
<el-form-item prop="social_fixmedinsCode">
|
||||
<el-input v-model="ruleForm.social_fixmedinsCode"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="定点机构名称" prop="social_fixmedinsName">
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="定点机构名称">
|
||||
<el-form-item prop="social_fixmedinsName">
|
||||
<el-input v-model="ruleForm.social_fixmedinsName"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="就医区域划分" prop="social_mdtrtareaAdmvs">
|
||||
<el-input v-model="ruleForm.social_mdtrtareaAdmvs"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="就医区域划分">
|
||||
<el-form-item prop="social_mdtrtareaAdmvs">
|
||||
<el-input v-model="ruleForm.social_mdtrtareaAdmvs" style="margin: 0 24px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="医保接口" prop="social_url">
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="医保接口">
|
||||
<el-form-item prop="social_url">
|
||||
<el-input v-model="ruleForm.social_url"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="电子凭证接口" prop="social_certUrl">
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="电子凭证接口">
|
||||
<el-form-item prop="social_certUrl">
|
||||
<el-input v-model="ruleForm.social_certUrl"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="上传logo">
|
||||
<UpLoad v-model="uploadURL" ref="uploadRef" @uploadSuccess="(url)=>{ruleForm.logourl=url}"></UpLoad>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item
|
||||
:rowspan="2"
|
||||
label="logo上传">
|
||||
<el-form-item>
|
||||
<UpLoad v-model="uploadURL" ref="uploadRef" @uploadSuccess="(url)=>{ruleForm.logourl=url}" style="margin-left: 24px"></UpLoad>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="数字签名">
|
||||
<el-form-item prop="social_cainfo">
|
||||
<el-input v-model="ruleForm.social_cainfo" style="margin:0 24px"/>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<el-row>
|
||||
<el-form-item label="数字签名" prop="social_cainfo">
|
||||
<el-input v-model="ruleForm.social_cainfo" type="textarea" :rows="5"/>
|
||||
</el-form-item>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
|
@ -143,4 +152,8 @@ const uploadURL = ref<any>()
|
|||
width: 100%;
|
||||
padding: 0 24px;
|
||||
}
|
||||
|
||||
:deep(.el-descriptions__label.el-descriptions__cell:not(.is-bordered-label).is-vertical-label) {
|
||||
padding-left: 24px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -26,28 +26,23 @@
|
|||
<div class="table">
|
||||
<el-table :data="tableData" style="width: 100%" @row-click="rowClick">
|
||||
<el-table-column prop="bedCnt" label="病床数量" width="80"/>
|
||||
<el-table-column prop="beginDate" label="开始日期" width="100"/>
|
||||
<el-table-column prop="caty" label="类别"></el-table-column>
|
||||
<el-table-column prop="code" label="编码" width="180"/>
|
||||
<el-table-column prop="createDatetime" label="创建日期时间" width="120">
|
||||
<template #default="scope">
|
||||
{{ scope.row.createDatetime ? formatDate(scope.row.createDatetime) : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="creationDate" label="创建日期" width="120"/>
|
||||
<el-table-column prop="beginDate" label="开始日期" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="caty" label="类别" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="code" label="编码" width="180" show-overflow-tooltip/>
|
||||
<el-table-column prop="creationDate" label="创建日期" width="120" show-overflow-tooltip/>
|
||||
<el-table-column prop="delFlag" label="删除标志"/>
|
||||
<el-table-column prop="drPsncnt" label="医生人数"/>
|
||||
<el-table-column prop="endDate" label="结束日期" width="120"/>
|
||||
<el-table-column prop="endDate" label="结束日期" width="120" show-overflow-tooltip/>
|
||||
<el-table-column prop="info" label="信息"/>
|
||||
<el-table-column prop="medServScp" label="医疗服务范围"/>
|
||||
<el-table-column prop="medServScp" label="医疗服务范围" width="150"/>
|
||||
<el-table-column prop="memo" label="备注"/>
|
||||
<el-table-column prop="name" label="内科"/>
|
||||
<el-table-column prop="nursPsncnt" label="护士人数"/>
|
||||
<el-table-column prop="pharPsncnt" label="药剂师人数"/>
|
||||
<el-table-column prop="resperName" label="负责人姓名"/>
|
||||
<el-table-column prop="resperTel" label="负责人电话"/>
|
||||
<el-table-column prop="socialBedCnt" label="社会病床数量"/>
|
||||
<el-table-column prop="tecnPsncnt" label="技术人员人数"/>
|
||||
<el-table-column prop="pharPsncnt" label="药剂师人数" width="100"/>
|
||||
<el-table-column prop="resperName" label="负责人姓名" width="100"/>
|
||||
<el-table-column prop="resperTel" label="负责人电话" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="socialBedCnt" label="社会病床数量" width="200"/>
|
||||
<el-table-column prop="tecnPsncnt" label="技术人员人数" width="200"/>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="bottom">
|
||||
|
|
|
|||
Loading…
Reference in New Issue