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

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |  125 +++++++++++++++++++++--------------------
 1 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index de70cc7..b06dfca 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)}}
+        {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
       </el-form-item>
       <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
         <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
@@ -23,14 +23,14 @@
       </el-form-item>
 
       <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
-        <dict-tag v-if="formData?.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData?.patSrc" />
+        <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
         {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
       </el-form-item>
       <el-form-item label="璁惧缂栧彿" prop="devId">
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
       </el-form-item>
       <el-form-item label="璁惧鎻忚堪" prop="">
-        {{(deviceInfo?.brand||'-') + "&nbsp;" + (deviceInfo?.model||'-') + "&nbsp;" + tranlateDevState(deviceInfo?.state)}}
+        {{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
       </el-form-item>
       <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -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,8 +166,6 @@
 const { t } = useI18n() // 鍥介檯鍖�
 const message = useMessage() // 娑堟伅寮圭獥
 
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
 const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
 
 const autoPrint = ref<boolean>(true);
@@ -176,8 +174,6 @@
 
 const formData = ref<DevRentVO>({
   id: undefined,
-  applyNo: undefined,
-  episodeId: undefined,
   devId: undefined,
   patId: undefined,
   patName: undefined,
@@ -185,14 +181,8 @@
   checkType: undefined,
   rentTime: new Date().getTime(),
   returnTime: undefined,
-  interference: undefined,
-  baseline: undefined,
-  detachment: undefined,
   remark: undefined,
   paid: undefined,
-  patSrc: undefined,
-  roomId: props.room.roomId,
-  bedNo: props.room.bedNo
 })
 
 const formRules = reactive({
@@ -203,7 +193,12 @@
 })
 const formRef = ref() // 琛ㄥ崟 Ref
 
-const deviceInfo = ref<DeviceVO> ()
+const devInfo = ref<Partial<DeviceVO>>({
+  category: undefined,
+  brand: undefined,
+  model: undefined,
+  state: undefined,
+})
 
 const displayBarCode = ref<string> ()
 
@@ -225,11 +220,10 @@
     return
 
   // formDate 瀵瑰簲  DevRent
-  // formData.value = data  //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
-  formData.value.id = data.id;   //rent id
-  formData.value.applyNo = data.applyNo;
-  formData.value.episodeId = data.episodeId;
-  formData.value.patDetails = data.patDetails
+  formData.value = data
+
+  // 棰嗙敤鏃堕棿  閲囩敤褰撳墠鏃堕棿
+  formData.value.rentTime = new Date().getTime()
 }
 
 /** 鎻愪氦琛ㄥ崟 */
@@ -241,20 +235,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
@@ -279,28 +275,24 @@
 /** 閲嶇疆琛ㄥ崟 */
 const resetForm = () => {
   formData.value = {
-    id: undefined,
-    applyNo: undefined,
-    episodeId: undefined,
     devId: undefined,
     patId: undefined,
     patName: undefined,
     checkType: undefined,
     rentTime: new Date().getTime(),
     returnTime: undefined,
-    interference: undefined,
-    baseline: undefined,
-    detachment: undefined,
     remark: undefined,
     patDetails: undefined,
     paid: undefined,
-    patSrc: undefined,
-    roomId: props.room.roomId,
-    bedNo: props.room.bedNo
   }
   formRef.value?.resetFields()
 
-  deviceInfo.value = undefined
+  devInfo.value = {
+    category: undefined,
+    brand: undefined,
+    model: undefined,
+    state: undefined,
+  }
 }
 
 const setPatient = (queueVO: QueueVO | undefined) => {
@@ -310,8 +302,7 @@
   formData.value.patId = queueVO?.patId
   formData.value.patName = queueVO?.patName
   formData.value.checkType = queueVO?.bookCheckType
-  formData.value.patSrc = queueVO?.patDetails.source
-  getFreeRentInfo(formData.value)
+  getFreeRentInfo(formData.value)  // 寰呮鏌ョ殑淇℃伅  @ dev_rent 琛�
   copyBarcode()
 }
 defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -353,13 +344,20 @@
 }
 
 const getSelectedRent = async (rentId) => {
-  formData.value = await DevRentApi.getDevRent(rentId)
+  const data = await DevRentApi.getDevRent(rentId)
+
+  formData.value = data
+
+  devInfo.value.category = data.category
+  devInfo.value.brand = data.brand
+  devInfo.value.model = data.model
+  devInfo.value.state = data.devState
 }
 
 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({
@@ -372,7 +370,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', } });
@@ -386,8 +384,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([{},{},{}]);
 }
@@ -430,56 +428,63 @@
 */
 
 const getDevInfo = async () => {
-  deviceInfo.value = undefined
-  if (isStringEmpty(formData.value.devId))
+  if (formData.value?.devId == null) {
+    devInfo.value.brand = undefined
+    devInfo.value.model = undefined
+    devInfo.value.state = undefined
     return
+  }
 
   const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
-  console.info( data )
   if ( null !== data)
-    deviceInfo.value = data
+    devInfo.value = data
 }
 
 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.patSrc == null || !displayBarcode.includes( formData.value.patSrc ))
+  if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
+      !displayBarcode.includes( formData.value.patDetails.source ))
     return ""
 
   return getBarcode()
 }
 
 const getBarcode = (): string => {
-  if (!formData.value.checkType)
+  if (formData.value.checkType == null)
     return ""
 
-  if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
+  const patSource = formData.value.patDetails?.source
+  if (patSource == null)
+    return ""
+
+  if (1 === patSource || 2 === patSource)
     return formData.value.applyNo??""
-  else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
+  else if (3 === patSource || 4 === patSource)
     return formData.value.episodeId??""
 
   return ""

--
Gitblit v1.9.3