clinic-v2
/
web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

This commit is contained in:
ChenQiuYu 2025-05-08 15:20:36 +08:00
parent 19ba9ab94b 056428efce
commit ae598d2287
6 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/common/goods/GoodsDetail.vue
View File

@ -9,7 +9,7 @@
</el-table-column>
<el-table-column prop="number" label="数量">
<template #default="scope">
<div v-if="disabled||props.status==0">
<div v-if="props.status">
<el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange"
size="small"></el-input-number>
<el-dropdown>
@ -35,7 +35,7 @@
￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
</template>
</el-table-column>
<el-table-column label="操作" v-if="disabled||props.status==0">
<el-table-column label="操作" v-if="props.status">
<template #default="scope">
<el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
</template>
@ -44,11 +44,12 @@
<div class="bottom">
<div class="search">
<SearchInput
:disabled="!disabled"
:request-api="goodsSearchApi"
:show-config="goodsShowConfig"
:placeholder="'请输入药名或者拼音码'"
@selectedCallBack="goodsSelect"></SearchInput>
@selectedCallBack="goodsSelect"
v-if="status"
></SearchInput>
</div>
<span>合计：￥{{ getTotalPrice() }}</span>
</div>
@ -61,7 +62,7 @@ import Panel from "@/components/common/Panel.vue";
const props = defineProps({
status: {
type: Number,
type: Boolean,
default: 0
}
})

19
src/components/common/service/ServiceDetail.vue
View File

@ -9,7 +9,7 @@
</el-table-column>
<el-table-column label="数量">
<template #default="scope">
<el-input-number v-if="disabled||props.status==0" v-model="scope.row.selectedNum" min="0"
<el-input-number v-if="props.status" v-model="scope.row.selectedNum" min="0"
@change="handleNumChange" size="small"></el-input-number>
<span v-else>{{ scope.row.selectedNum }}</span>
{{ scope.row.selectedUnit }}
@ -20,7 +20,7 @@
￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
</template>
</el-table-column>
<el-table-column label="操作" v-if="disabled||props.status==0">
<el-table-column label="操作" v-if="props.status">
<template #default="scope">
<el-button type="danger" link @click="delService(scope.row)">X</el-button>
</template>
@ -32,8 +32,7 @@
:placeholder="'请输入药服务项目或拼音码'"
:request-api="serviceSearchApi"
:show-config="serviceShowConfig"
:disabled="!disabled"
@selectedCallBack="serviceSelect"></SearchInput>
@selectedCallBack="serviceSelect" v-if="status"></SearchInput>
</div>
<span>合计：￥{{ getTotalPrice() || 0 }}</span>
</div>
@ -46,7 +45,7 @@ import Panel from "@/components/common/Panel.vue";
const props = defineProps({
status: {
type: Number,
type: Boolean,
default: 0
}
})
@ -92,16 +91,8 @@ const getTotalPrice = () => {
return totalPrice;
}
const disabled = ref<any>(false)
watchEffect(() => {
if (props.status == 2 || props.status == 0) {
disabled.value = true
} else {
disabled.value = false
}
}
)
</script>
<style scoped lang="scss">
:deep(.el-table__cell) {

31
src/components/outpatient/Case.vue
View File

@ -15,12 +15,12 @@
<div class="container">
<el-form :model="formDate" label-width="auto" ref="formRef">
<el-form-item label="主诉">
<PopoverInput :disabled="disabled" v-model="formDate.mainAppeal" :list="mainAppealList" @focus="focus"/>
<PopoverInput :disabled="props.disabled" v-model="formDate.mainAppeal" :list="mainAppealList" @focus="focus"/>
</el-form-item>
<el-form-item label="诊断">
<DiagnosisSearchInput
ref="diagnosisSearchRef"
:disabled="disabled"
:disabled="props.disabled"
:request-api="diagnosisSearchApi"
:show-config="diagnosisShowConfig"
@selectedCallBack="diagnosisSelect"
@ -29,31 +29,31 @@
/>
</el-form-item>
<el-form-item label="现病史" v-if="!props.isShowFrom">
<PopoverInput :disabled="disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
<PopoverInput :disabled="props.disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
</el-form-item>
<el-form-item label="既往史" v-if="!props.isShowFrom">
<PopoverInput :disabled="disabled" v-model="formDate.beforeMedicalHistory" :list="beforeMedicalHistoryList"/>
<PopoverInput :disabled="props.disabled" v-model="formDate.beforeMedicalHistory" :list="beforeMedicalHistoryList"/>
</el-form-item>
<el-form-item label="过敏史" v-if="!props.isShowFrom">
<PopoverInput :disabled="disabled" v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
<PopoverInput :disabled="props.disabled" v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
</el-form-item>
<el-form-item label="体格检查" v-if="!props.isShowFrom">
<PhysiqueExamInuput :disabled="disabled" v-model="formDate.exam" :list="physiqueExamList"/>
<PhysiqueExamInuput :disabled="props.disabled" v-model="formDate.exam" :list="physiqueExamList"/>
</el-form-item>
<el-form-item label="望闻问切" v-if="modelType==1&&!props.isShowFrom">
<PopoverInput :disabled="disabled" v-model="formDate.chinaAdjunctCheck" :list="chinaAdjunctCheckList"/>
<PopoverInput :disabled="props.disabled" v-model="formDate.chinaAdjunctCheck" :list="chinaAdjunctCheckList"/>
</el-form-item>
<el-form-item label="治法" v-if="modelType==1&&!props.isShowFrom">
<el-input v-model="formDate.chinaDeal" :disabled="disabled"></el-input>
<el-input v-model="formDate.chinaDeal" :disabled="props.disabled"></el-input>
</el-form-item>
<el-form-item label="口腔检查" v-if="modelType==2&&!props.isShowFrom">
<el-input :disabled="disabled" v-model="formDate.mouthCheck"></el-input>
<el-input :disabled="props.disabled" v-model="formDate.mouthCheck"></el-input>
</el-form-item>
<el-form-item label="辅助检查" v-if="(modelType==2 || modelType ==0)&&!props.isShowFrom">
<el-input :disabled="disabled" v-model="formDate.adjunctCheck"></el-input>
<el-input :disabled="props.disabled" v-model="formDate.adjunctCheck"></el-input>
</el-form-item>
<el-form-item label="处置" v-if="(modelType==0 || modelType ==2)&&!props.isShowFrom">
<el-input :disabled="disabled" v-model="formDate.deal"></el-input>
<el-input :disabled="props.disabled" v-model="formDate.deal"></el-input>
</el-form-item>
</el-form>
</div>
@ -75,8 +75,8 @@ import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.v
import PhysiqueExamInuput from "@/components/outpatient/PhysiqueExamInuput.vue";
const props = defineProps({
status: {
type: Number,
disabled: {
type: Boolean,
default: 0
},
isShowFrom:{
@ -84,11 +84,6 @@ const props = defineProps({
default: false
}
})
const disabled = computed(() => {
if(props.status === 1){
return true
}
})
const formDate = defineModel<any>();
const modelType = ref(0)

7
src/components/outpatient/MedicalQueue.vue
View File

@ -105,6 +105,10 @@ const clickLi = (item: any) => {
confirmButtonText: '确定',
cancelButtonText: '取消',
callback: (action: any) => {
if (action == "cancel"){
curItem.value = null
return
}
if (action == "confirm") {
post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
curStatus.value = 2
@ -118,9 +122,7 @@ const clickLi = (item: any) => {
emit('clickItem', curItem.value)
}
const changeCurItemOrStatus = (item:any, status:any) => {
if (item !=null){
curItem.value = item
}
if (curStatus != null){
curStatus.value = status
}
@ -231,7 +233,6 @@ watch(() => curStatus.value, () => {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
.avatar {
width: 26px;

4
src/components/outpatient/Settlement.vue
View File

@ -20,8 +20,8 @@ const editItem= () => {
<div class="footer">
<div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
<div class="btn-group">
<el-button v-if="status == 2" @click="deleteItem">取消接诊</el-button>
<el-button v-if="status == 2" type="primary" @click="save">完成接诊</el-button>
<el-button v-if="status" @click="deleteItem">取消接诊</el-button>
<el-button v-if="status" type="primary" @click="save">完成接诊</el-button>
<!-- <el-button v-if="status == 3" type="primary" @click="editItem">修改</el-button>-->
</div>
</div>

10
src/views/outpatient/index.vue
View File

@ -7,17 +7,17 @@
<el-scrollbar>
<div class="case">
<CaseDetail v-if="patientRegistration.status==3" v-model="formData" ></CaseDetail>
<Case ref="caseRef" v-else v-model="formData" :isShowFrom="isShowFrom" @focus="focus"></Case>
<Case ref="caseRef" v-else v-model="formData" :disabled="curRegister?.status !=2" :isShowFrom="isShowFrom" @focus="focus"></Case>
</div>
<div class="service-items">
<ServiceDetail v-model="formData.itemDetail" @focus="focus" @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
<ServiceDetail v-model="formData.itemDetail" @focus="focus" @totalPriceChange="getOrderTotalPrice" :status="curRegister?.status ==2"></ServiceDetail>
</div>
<div class="pharmaceutical-consumables">
<GoodsDetail v-model="formData.goodsDetail" @focus="focus" @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
<GoodsDetail v-model="formData.goodsDetail" @focus="focus" @totalPriceChange="getOrderTotalPrice" :status="curRegister?.status ==2"></GoodsDetail>
</div>
</el-scrollbar>
<div class="bottom">
<Settlement v-model="totalAmount" @cancelReception="cancelReception" @save="save" :status="curRegister?.status"
<Settlement v-model="totalAmount" @cancelReception="cancelReception" @save="save" :status="curRegister?.status ==2"
@edit="edit"></Settlement>
</div>
@ -102,7 +102,7 @@ const save = () => {
}
post('medical/record/save', {data: data}).then(() => {
ElMessage.success("保存成功")
medicalQueueRef.value?.changeCurItemOrStatus(null,1);
medicalQueueRef.value?.changeCurItemOrStatus(null,3);
})