diff --git a/src/components/charge/CheckoutDetail.vue b/src/components/charge/CheckoutDetail.vue index a6903cc..86c7e36 100644 --- a/src/components/charge/CheckoutDetail.vue +++ b/src/components/charge/CheckoutDetail.vue @@ -110,6 +110,14 @@ const checkTraceCode = () => { const inputIdCode = ref() const associationIdCodeRef = ref() const openAssociationIdCode = () => { + if(!inputIdCode.value || inputIdCode.value.length <20){ + ElMessage({ + message: '追溯码长度不足20位', + type: 'info', + }) + return + } + if (addTraceAbilityCode()) { return } @@ -136,6 +144,13 @@ const addTraceabilityCodeDo = (item: any, inputStr: any) => { item.traceAbilityCodeList = [] } let traceAbilityCodeListList = item.traceAbilityCodeList.length + if(!inputStr || inputStr.length <20){ + ElMessage({ + message: '追溯码长度不足20位', + type: 'info', + }) + return + } if (traceAbilityCodeListList == item.shouldNumber) { ElMessage({ diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue index b26a183..032a08f 100644 --- a/src/components/charge/Settlement.vue +++ b/src/components/charge/Settlement.vue @@ -68,11 +68,13 @@ const show = ref(false) const printReceipt = ref(false); const payType = ref(null); const retailOrder = ref(null); -const init = (code: any) => { - post('charge/getByCode', {code: code}).then((res: any) => { - retailOrder.value = res; - show.value = true; - }) +const init = async (code: any, psnNo: any) => { + retailOrder.value = await post("charge/getByCode", {code: code}); + if (psnNo != null){ + socialCard.value = await post("social/person/getSocialInfoByPsnNo", {psnNo: psnNo}); + } + + show.value = true; } defineExpose({init}) diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue index d6e2b23..2aa07c4 100644 --- a/src/components/outpatient/DiagnosisSearchInput.vue +++ b/src/components/outpatient/DiagnosisSearchInput.vue @@ -18,6 +18,7 @@