From 3339fa19a6b295e827f4fc41694701490cbd3e66 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 10 四月 2025 11:20:08 +0800 Subject: [PATCH] 拆机: 允许 已领用的拆机 --- src/views/ecg/doctor/components/DevReadyPanel.vue | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue index 673d5cc..97b9a02 100644 --- a/src/views/ecg/doctor/components/DevReadyPanel.vue +++ b/src/views/ecg/doctor/components/DevReadyPanel.vue @@ -30,7 +30,7 @@ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/> </el-form-item> <el-form-item label="璁惧鎻忚堪" prop=""> - {{deviceInfo.brand + " " + deviceInfo.model + " " + deviceInfo.state}} + {{deviceInfo.brand + " " + deviceInfo.model + " " + tranlateDevState(deviceInfo.state)}} </el-form-item> <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime"> <el-date-picker @@ -54,12 +54,12 @@ </el-form> <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button> <el-checkbox style="margin-left:10px" label="鑷姩 " 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="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 @click="feeConfirm" :disabled="formLoading">纭垂</el-button> - <el-button @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</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> <!-- 鍖荤敓瑁呮満鍒楄〃 --> <ContentWrap> @@ -150,6 +150,7 @@ import {calGender, getBookBeginTime} from "@/utils"; import form from "@/components/Form/src/Form.vue"; import {DICT_TYPE} from "@/utils/dict"; +import {tranlateDevState} from "@/utils/statusFormatter"; /** 璁惧棰嗙敤 琛ㄥ崟 */ defineComponent({ name: 'DevReadyPanel' }) @@ -295,11 +296,6 @@ baseline: undefined, detachment: undefined, remark: undefined, - patDeptCode: undefined, - patDeptDesc: undefined, - patWardCode: undefined, - patWardDesc: undefined, - patBedNo: undefined, patDetails: undefined, paid: undefined, roomId: props.room.roomId, -- Gitblit v1.9.3