From 9a8b438f23d9bf83d83b3cc7c6e4c25b7ac90d63 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 22 十一月 2024 11:08:31 +0800
Subject: [PATCH] 确费

---
 src/views/ecg/doctor/components/RoutinePanel.vue  |   32 ++++++++++-----
 src/api/ecg/devrent/index.ts                      |   10 +++++
 src/views/ecg/doctor/components/DevReadyPanel.vue |   56 ++++++++++++++++-----------
 3 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 7c5bb55..972c601 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -122,5 +122,15 @@
     return await request.post({ url: `/ecg/dev-rent/dev-damage`, data })
   },
 
+  // 纭垂
+  feeConfirm: async (rentId: number) => {
+    return await request.get({ url: `/ecg/dev-rent/fee-confirm?rentId=` + rentId })
+  },
+
+  // 鍙栨秷纭垂
+  feeCancel: async (rentId: number) => {
+    return await request.get({ url: `/ecg/dev-rent/fee-cancel?rentId=` + rentId })
+  },
+
 }
 
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 7188a76..63308f9 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -38,27 +38,31 @@
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
       </el-form-item>
+<!--
       <el-form-item label="缂磋垂纭" prop="paid">
         <el-radio-group v-model="formData.paid">
           <el-radio key="1" :label="1"> 宸茬即璐� </el-radio>
           <el-radio key="0" :label="0"> 鏈即璐� </el-radio>
         </el-radio-group>
       </el-form-item>
+-->
     </el-form>
     <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)">鎵撳嵃灏忕エ</el-button>
     <el-button @click="printBill(formData.patId, 8)">鎵撳嵃灏忕エ2</el-button>
-    <el-button @click="cancelInstall"  :disabled="formLoading">鏀惧純瑁呮満</el-button>
+    <el-button @click="cancelReady"  :disabled="formLoading">鏀惧純棰嗙敤</el-button>
     <el-button @click="resetForm()">閲� 缃�</el-button>
+    <el-button @click="feeConfirm"  :disabled="formLoading">纭垂</el-button>
+    <el-button @click="feeCancel"  :disabled="formLoading">鍙栨秷纭垂</el-button>
 
   <!-- 鍖荤敓瑁呮満鍒楄〃 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="缂磋垂" align="center" prop="paid">
+<!--      <el-table-column label="id" align="center" prop="id" />-->
+      <el-table-column label="纭垂" align="center" prop="paid">
         <template #default="scope">
-          {{scope.row.paid == 1 ? "宸茬即" : ""}}
+          {{scope.row.paid == 1 ? "宸茬‘璐�" : ""}}
         </template>
       </el-table-column>
       <el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
@@ -233,38 +237,32 @@
     const data = formData.value
     console.info( data )
 
-    if (formData.value.id === null || formData.value.id === undefined) {
-      const result = await DevRentApi.devReady(data)
-      formData.value.id = result
-      message.success(t('鎿嶄綔瀹屾垚'))
-      if (autoPrint.value)
-        printBill( data.patId)
-    } else {
-      await DevRentApi.devReady(data)
-      message.success(t('鏇存柊瀹屾垚'))
-    }
+    await DevRentApi.devReady(data)
+
+    if (autoPrint.value)
+      printBill( data.patId)
+
     dialogVisible.value = false
     // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
     emit('event_dev_ready')
     resetForm()
     getList()
+
+    message.success(t('鎿嶄綔瀹屾垚'))
   } finally {
     formLoading.value = false
   }
 }
 
-const cancelInstall = async () => {
+// 鏀惧純棰嗙敤
+const cancelReady = async () => {
   formData.value.roomId = props.room.roomId
   formData.value.bedNo = props.room.bedNo
   const data = formData.value as unknown as DevRentVO
-  if (formData.value.id === null || formData.value.id === undefined) {
-    const result = await DevRentApi.devReadyCancel(data)
-    formData.value.id = result
-    message.success(t('鎿嶄綔鎴愬姛'))
-  } else {
-    await DevRentApi.devReadyCancel(data)
-    message.success(t('鎿嶄綔鎴愬姛'))
-  }
+
+  await DevRentApi.devReadyCancel(data)
+  message.success(t('鎿嶄綔鎴愬姛'))
+
   // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
   emit('event_dev_ready')
   resetForm()
@@ -444,6 +442,18 @@
     deviceInfo.value = data
 }
 
+const feeConfirm = async () => {
+  const result = await DevRentApi.feeConfirm(formData.value.id)
+  if (0 == result)
+    message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+const feeCancel = async () => {
+  const result = await DevRentApi.feeCancel(formData.value.id)
+  if (0 == result)
+    message.success(t('鎿嶄綔鎴愬姛'))
+}
+
 /** 鍒濆鍖� **/
 onMounted(() => {
   getList()
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 9b363ac..6ccd881 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -37,14 +37,16 @@
       </el-row>
     </el-form>
     <el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
-    <el-button @click="resetForm()">閲� 缃�</el-button>
     <el-button @click="cancelInstall"  :disabled="formLoading">鏀惧純妫�鏌�</el-button>
+    <el-button @click="resetForm()">閲� 缃�</el-button>
+    <el-button @click="feeConfirm"  :disabled="formLoading">纭垂</el-button>
+    <el-button @click="feeCancel"  :disabled="formLoading">鍙栨秷纭垂</el-button>
 
   <!-- 鍖荤敓瑁呮満鍒楄〃 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="瑁呮満鎯呭喌" align="center" prop="lost" >
+<!--      <el-table-column label="id" align="center" prop="id" />-->
+      <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="lost" >
         <template #default="scope">
           <span v-if="scope.row.jobType === 60">宸叉鏌�</span>
           <span v-if="scope.row.jobType === 50">宸叉斁寮�</span>
@@ -264,18 +266,26 @@
   formData.value.roomId = props.room.roomId
   formData.value.bedNo = props.room.bedNo
   const data = formData.value as unknown as DevRentVO
-  if (formData.value.id === null || formData.value.id === undefined) {
-    const result = await DevRentApi.routineCheckCancel(data)
-    formData.value.id = result
-    message.success(t('鎿嶄綔鎴愬姛'))
-  } else {
-    await DevRentApi.routineCheckCancel(data)
-    message.success(t('鎿嶄綔鎴愬姛'))
-  }
+  await DevRentApi.routineCheckCancel(data)
+
   // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
   emit('event_routine')
   resetForm()
   getList()
+
+  message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+const feeConfirm = async () => {
+  const result = await DevRentApi.feeConfirm(formData.value.id)
+  if (0 == result)
+    message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+const feeCancel = async () => {
+  const result = await DevRentApi.feeCancel(formData.value.id)
+  if (0 == result)
+    message.success(t('鎿嶄綔鎴愬姛'))
 }
 
 /** 鍒濆鍖� **/

--
Gitblit v1.9.3