From 131726d427b95447df6c1ee14e1c36a0715b2033 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 12:56:20 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   71 +++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 96b1d7b..de29af4 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -11,7 +11,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="妫�鏌ラ」鐩�" prop="">
-        {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
+        {{getCheckTypeName(formData.checkType)}}
       </el-form-item>
       <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
         <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
@@ -55,11 +55,10 @@
     <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
     <el-checkbox style="margin-left:10px" label="鑷姩&nbsp;" v-model="autoPrint" />
     <el-button @click="printBill(formData.patId!, formData.checkType!)">鎵撳嵃灏忕エ</el-button>
-    <el-button @click="printBill(formData.patId!, formData.checkType!, 8)">鎵撳嵃灏忕エ2</el-button>
     <el-button @click="cancelReady"  :disabled="formLoading">鏀惧純棰嗙敤</el-button>
     <el-button @click="resetForm()">閲� 缃�</el-button>
-    <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeConfirm"  :disabled="formLoading">纭垂</el-button>
-    <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeCancel"  :disabled="formLoading">鍙栨秷纭垂</el-button>
+    <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm"  :disabled="formLoading">纭垂</el-button>
+    <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeCancel"  :disabled="formLoading">鍙栨秷纭垂</el-button>
 
   <!-- 鍖荤敓瑁呮満鍒楄〃 -->
   <ContentWrap>
@@ -150,6 +149,7 @@
 import {calGender, getBookBeginTime} from "@/utils";
 import {DICT_TYPE} from "@/utils/dict";
 import {tranlateDevState} from "@/utils/statusFormatter";
+import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
 
 /** 璁惧棰嗙敤 琛ㄥ崟 */
 defineComponent({ name: 'DevReadyPanel' })
@@ -166,15 +166,14 @@
 const { t } = useI18n() // 鍥介檯鍖�
 const message = useMessage() // 娑堟伅寮圭獥
 
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
 const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
 
 const autoPrint = ref<boolean>(true);
 
 const checkTypeStore = useCheckTypeStore()
 
-const formData = ref<Partial<DevRentVO>>({
+const formData = ref<DevRentVO>({
+  id: undefined,
   devId: undefined,
   patId: undefined,
   patName: undefined,
@@ -184,8 +183,6 @@
   returnTime: undefined,
   remark: undefined,
   paid: undefined,
-  roomId: props.room.roomId,
-  bedNo: props.room.bedNo
 })
 
 const formRules = reactive({
@@ -218,6 +215,9 @@
 
 // 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
 const getFreeRentInfo = async (devRentVO) => {
+  if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+    return
+
   const data = await DevRentApi.getFreeRent(devRentVO)
   if (null === data)
     return
@@ -238,20 +238,22 @@
   try {
     formData.value.roomId = props.room.roomId
     formData.value.bedNo = props.room.bedNo
-    const data = formData.value
-    console.info( data )
+    await DevRentApi.devReady(formData.value)
 
-    await DevRentApi.devReady(data)
+    if (autoPrint.value && formData.value.patId && formData.value.checkType) {
+      printBill(formData.value.patId, formData.value.checkType)
+    }
 
-    if (autoPrint.value && data.patId && data.checkType)
-      printBill( data.patId, data.checkType)
+    // 鑷姩纭垂
+    if (needAutoFeeConfirm(formData.value.checkType)) {
+      feeConfirm()
+    }
 
-    dialogVisible.value = false
-    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
-    emit('event_dev_ready')
     resetForm()
     getList()
 
+    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+    emit('event_dev_ready')
     message.success(t('鎿嶄綔瀹屾垚'))
   } finally {
     formLoading.value = false
@@ -285,8 +287,6 @@
     remark: undefined,
     patDetails: undefined,
     paid: undefined,
-    roomId: props.room.roomId,
-    bedNo: props.room.bedNo
   }
   formRef.value?.resetFields()
 
@@ -305,7 +305,7 @@
   formData.value.patId = queueVO?.patId
   formData.value.patName = queueVO?.patName
   formData.value.checkType = queueVO?.bookCheckType
-  getFreeRentInfo(formData.value)
+  getFreeRentInfo(formData.value)  // 寰呮鏌ョ殑淇℃伅  @ dev_rent 琛�
   copyBarcode()
 }
 defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -360,7 +360,7 @@
 const printBill = async (patId: string, checkType: number, printMode?: number) => {
 
   const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
-  console.info( curAppointment )
+  //console.info( curAppointment )
 
 // 寮曞叆鍚庝娇鐢ㄧず渚�
   hiprint.init({
@@ -373,7 +373,7 @@
   //var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); 瀵艰嚧璧颁笁椤�
   var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
 //鏂囨湰
-  const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType)
+  const checkTypeName = getCheckTypeName(curAppointment.bookCheckType)
   panel.addPrintText({ options: { width: 140, height: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 10, fontFamily: '寰蒋闆呴粦',  fontWeight: '700', } });
   const patientBaisc = curAppointment.patName + "  " + calGender(curAppointment.patGender) + "  " + calculateAge(curAppointment.patBirthday) + "宀�"
   panel.addPrintText({ options: { width: 140, height: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 10, fontFamily: '寰蒋闆呴粦',  fontWeight: '700', } });
@@ -387,8 +387,8 @@
   panel.addPrintText({ options: { width: 140, height: 22, top: 86, left: 20, title: curAppointment.episodeId, textType: 'barcode' } });
 
 //鎵撳嵃
-  if (undefined === printMode)
-    hiprintTemplate.print2([{},{},{}]); // 鍙互浼� [瀹氫綅鍙傛暟]  http://https://ccsimple.github.io/sv-print-docs/config/template.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E8%AE%BE%E8%AE%A1%E4%BD%BF%E7%94%A8%E7%A4%BA%E4%BE%8B
+  if (printMode == null)
+    hiprintTemplate.print2([{},{},{}]); // 棰勮鏂瑰紡 鍙互浼� [瀹氫綅鍙傛暟]  http://https://ccsimple.github.io/sv-print-docs/config/template.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E8%AE%BE%E8%AE%A1%E4%BD%BF%E7%94%A8%E7%A4%BA%E4%BE%8B
   else
     hiprintTemplate.print([{},{},{}]);
 }
@@ -444,41 +444,46 @@
 }
 
 const feeConfirm = async () => {
-  if (formData.value?.id === undefined) {
+  if (formData.value.id == null) {
     message.error(t('璇峰厛棰嗙敤'))
     return
   }
 
   const result = await DevRentApi.feeConfirm(formData.value.id)
-  if (0 == result)
+  if (0 === result)
     message.success(t('纭垂鎿嶄綔鎴愬姛'))
 }
 
 const feeCancel = async () => {
-  if (formData.value?.id === undefined) {
+  if (formData.value.id == null) {
     message.error(t('璇峰厛棰嗙敤'))
     return
   }
 
   const result = await DevRentApi.feeCancel(formData.value.id)
-  if (0 == result)
+  if (0 === result)
     message.success(t('鎿嶄綔鎴愬姛'))
 }
 
 const getDisplayBarcode = (): string => {
-  if (!formData.value.checkType)
+  if (formData.value.checkType == null)
     return ""
 
-  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
-  if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
-      !displayBarcode.includes( formData.value.patDetails.source ))
+  if (formData.value.patDetails?.source == null)
+    return ""
+
+  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType)
+  if (displayBarcode == null || displayBarcode.length === 0)
+    return ""
+
+  if (!displayBarcode.includes( formData.value.patDetails.source ))
     return ""
 
   return getBarcode()
 }
 
 const getBarcode = (): string => {
-  if (!formData.value.checkType)
+  if (formData.value.checkType == null)
     return ""
 
   const patSource = formData.value.patDetails?.source

--
Gitblit v1.9.3