diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 0cd3a80..a8fde95 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -53,10 +53,11 @@
-
-
-
+
+
+
-
+
{
saveAndCharge()
} else {
//打开追溯码详情页
- openCheckoutDetail(formData.value.goodsDetail,formData.value.patientRegistration.psnNo)
+ openCheckoutDetail(formData.value.goodsDetail, formData.value.patientRegistration.psnNo)
}
}
@@ -137,89 +138,89 @@ const checkTraceCode = (goodsList: any[]) => {
return true;
}
- const checkoutDetailRef = ref()
- const openCheckoutDetail = (goodsList: any[],psnNo:string) => {
- if (!goodsList || goodsList.length == 0) {
- ElMessage({
- message: '没有商品信息,请先选择需要售卖的商品',
- type: 'info',
- plain: true,
- });
- return
- }
+const checkoutDetailRef = ref()
+const openCheckoutDetail = (goodsList: any[], psnNo: string) => {
+ if (!goodsList || goodsList.length == 0) {
+ ElMessage({
+ message: '没有商品信息,请先选择需要售卖的商品',
+ type: 'info',
+ plain: true,
+ });
+ return
+ }
+ nextTick(() => {
+ checkoutDetailRef.value.init(goodsList, psnNo);
+ })
+}
+
+const saveAndCharge = () => {
+ post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
+ formData.value.code = res
nextTick(() => {
- checkoutDetailRef.value.init(goodsList,psnNo);
+ settlementRef.value?.init(res, formData.value.patientRegistration.psnNo)
})
+ })
+}
+const diagnosisSearchRef = ref()
+const diagnosisSearchApi = "social/diagnose/search"
+const diagnosisShowConfig = [
+ {
+ label: "诊断名称",
+ prop: "name",
+ },
+ {
+ label: "诊断编码",
+ prop: "code",
+ }
+]
+const diagnosisSelect = (list: any) => {
+ const diagnosisNames = list.map((item: any) => item.name).join(',')
+ formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
+ formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
+}
+const recordsConsumptionRef = ref("")
+const patientCardRef = ref()
+const clickItem = async (item: any, status: any) => {
+ statusDisabled.value = status
+ formData.value = await post('medical/record/getByDiagnosisCode', {diagnosisCode: item.code})
+ //添加追溯码应采字段
+ for (let i = 0; i < formData.value.goodsDetail.length; i++) {
+ let goodsItem = formData.value.goodsDetail[i]
+ if (goodsItem.packagingUnit == goodsItem.selectedUnit) {
+ goodsItem.shouldNumber = goodsItem.selectedNum;
+ } else {
+ goodsItem.shouldNumber = Math.ceil(goodsItem.selectedNum / goodsItem.minPackagingNumber);
+ }
+ goodsItem.idCode = goodsItem.idCode ? goodsItem.idCode == "" ? null : goodsItem.idCode.split(",") : null
}
- const saveAndCharge = () => {
- post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
- formData.value.code = res
- nextTick(() => {
- settlementRef.value?.init(res, formData.value.patientRegistration.psnNo)
- })
- })
+ getOrderTotalPrice()
+ nextTick(() => {
+ let list = JSON.parse(formData.value.diagnosisMedicalRecord.diagnosisDetail)
+ let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
+ diagnosisSearchRef.value?.init(list, nList);
+ recordsConsumptionRef.value?.init(formData.value.patientInfo.id);
+ patientCardRef.value?.init(formData.value.registrationId);
+ })
+}
+const dockerList = ref([])
+const getDockerList = () => {
+ let query = {
+ role: 1
}
- const diagnosisSearchRef = ref()
- const diagnosisSearchApi = "social/diagnose/search"
- const diagnosisShowConfig = [
- {
- label: "诊断名称",
- prop: "name",
- },
- {
- label: "诊断编码",
- prop: "code",
- }
- ]
- const diagnosisSelect = (list: any) => {
- const diagnosisNames = list.map((item: any) => item.name).join(',')
- formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
- formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
- }
- const recordsConsumptionRef = ref("")
- const patientCardRef = ref()
- const clickItem = async (item: any, status: any) => {
- statusDisabled.value = status
- formData.value = await post('medical/record/getByDiagnosisCode', {diagnosisCode: item.code})
- //添加追溯码应采字段
- for (let i =0;i {
- let list = JSON.parse(formData.value.diagnosisMedicalRecord.diagnosisDetail)
- let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
- diagnosisSearchRef.value?.init(list, nList);
- recordsConsumptionRef.value?.init(formData.value.patientInfo.id);
- patientCardRef.value?.init(formData.value.registrationId);
- })
- }
- const dockerList = ref([])
- const getDockerList = () => {
- let query = {
- role: 1
- }
- post('organization/member/search', {query: query}).then((res: any) => {
- dockerList.value = res
- })
- }
- const orderCompleted = () => {
- nextTick(() => {
- chargeQueueRef.value?.getOrderList()
- })
- }
- const orderCanceled = () => {
- nextTick(() => {
- chargeQueueRef.value?.getOrderList()
- })
+ post('organization/member/search', {query: query}).then((res: any) => {
+ dockerList.value = res
+ })
+}
+const orderCompleted = () => {
+ nextTick(() => {
+ chargeQueueRef.value?.getOrderList()
+ })
+}
+const orderCanceled = () => {
+ nextTick(() => {
+ chargeQueueRef.value?.getOrderList()
+ })
}
@@ -260,7 +261,7 @@ const list = () => {
doctorList.value = res
})
}
-const getStatus=(status:any)=>{
+const getStatus = (status: any) => {
statusDisabled.value = status
formData.value = {
patientInfo: {},
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index a9fc463..aceebeb 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -9,31 +9,34 @@
-
-
-
-
-
-
- -
- {{ item.name }}
- {{ item.sectionNames }}
-
-
-
+
+
+
+
+
+
+
+ -
+ {{ item.name }}
+ {{ item.sectionNames }}
+
+
+
挂号
-
+
+
-
@@ -151,8 +154,8 @@ const close = () => {
id.value = null
getPatientList()
}
-const reset=() =>{
- keyword.value=''
+const reset = () => {
+ keyword.value = ''
getPatientList()
}
@@ -183,76 +186,91 @@ const reset=() =>{
flex: 1;
min-height: 0;
margin-top: 20px;
- }
- li {
- height: 50px;
- display: flex;
- font-size: 14px;
- padding: 0 10px;
- border-radius: 5px;
- align-items: center;
-
- &:hover {
- background: rgba(#4D6DE4, 0.3);
- }
-
- .name {
- color: #999;
- width: 100px;
- }
-
- .section_name {
- flex: 1;
- color: #999;
- }
-
- .btn {
- cursor: pointer;
- padding: 5px;
- width: 78px;
- height: 32px;
- border-radius: 6px;
- background: #FFFFFF;
- border: 1px solid #4D6DE4;
- font-weight: bold;
- font-size: 14px;
- color: #4D6DE4;
- font-style: normal;
+ .panel-content {
display: flex;
- align-items: center;
- justify-content: center;
- &:hover {
- background: #4D6DE4;
- color: #FFF;
+ flex-direction: column;
+
+ .search {
+ padding: 0 24px;
+ height: 42px;
+ margin-top: 10px;
+ }
+
+ .content_list {
+ flex: 1;
+ min-height: 0;
+ margin-top: 10px;
+
+ .role_list {
+ height: 100%;
+
+ li {
+ height: 50px;
+ display: flex;
+ font-size: 14px;
+ padding: 0 10px;
+ border-radius: 5px;
+ align-items: center;
+
+ &:hover {
+ background: rgba(#4D6DE4, 0.3);
+ }
+
+ .name {
+ color: #999;
+ width: 100px;
+ }
+
+ .section_name {
+ flex: 1;
+ color: #999;
+ }
+
+ .btn {
+ cursor: pointer;
+ padding: 5px;
+ width: 78px;
+ height: 32px;
+ border-radius: 6px;
+ background: #FFFFFF;
+ border: 1px solid #4D6DE4;
+ font-weight: bold;
+ font-size: 14px;
+ color: #4D6DE4;
+ font-style: normal;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ &:hover {
+ background: #4D6DE4;
+ color: #FFF;
+ }
+ }
+
+
+ }
+
+ .active {
+ background: #4D6DE4;
+
+ .name {
+ color: #fff;
+ }
+
+ .section_name {
+ color: #fff;
+ }
+
+ .btn {
+ color: #fff;
+ }
+ }
+ }
}
}
-
- }
-
- .search {
- margin-top: 10px;
- }
-
- .content_list {
- margin-top: 10px;
- }
-
- .active {
- background: #4D6DE4;
-
- .name {
- color: #fff;
- }
-
- .section_name {
- color: #fff;
- }
-
- .btn {
- color: #fff;
- }
}
}