From e89834c34e8f987cd59a167aa8c8369a731ef44c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 12:19:27 +0800
Subject: [PATCH] 根据检查类型 ， 自动确费

---
 src/views/ecg/devrent/index.vue                   |    8 ++++++++
 src/views/ecg/doctor/components/DevReadyPanel.vue |   13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index 85eb91e..5bcedd1 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -102,6 +102,11 @@
       <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
       <el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
       <el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
+      <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="checkType" width="100px">
+        <template #default="scope">
+          <span>{{checkTypeStore.getCheckTypeName(scope.row.checkType)}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="state" width="90px">
         <template #default="scope">
           <span>{{tranlateCheckState(scope.row.state)}}</span>
@@ -174,6 +179,7 @@
 import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
 import DevRentForm from './DevRentForm.vue'
 import {tranlateCheckState} from "../../../utils/statusFormatter";
+import {useCheckTypeStore} from "@/store/modules/checkType";
 
 /** 瑁呮満鎷嗘満 鍒楄〃 */
 defineOptions({ name: 'DevRent' })
@@ -181,6 +187,8 @@
 const message = useMessage() // 娑堟伅寮圭獥
 const { t } = useI18n() // 鍥介檯鍖�
 
+const checkTypeStore = useCheckTypeStore()
+
 const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
 const list = ref<DevRentVO[]>([]) // 鍒楄〃鐨勬暟鎹�
 const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁�
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 96b1d7b..043a91f 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -55,7 +55,6 @@
     <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>
@@ -243,8 +242,12 @@
 
     await DevRentApi.devReady(data)
 
-    if (autoPrint.value && data.patId && data.checkType)
-      printBill( data.patId, data.checkType)
+    if (autoPrint.value && data.patId && data.checkType) {
+      printBill(data.patId, data.checkType)
+    }
+
+    // 鑷姩纭垂
+    feeConfirm()
 
     dialogVisible.value = false
     // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -387,8 +390,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([{},{},{}]);
 }

--
Gitblit v1.9.3