From 907bc89de0152ed695edf7c29541044e19f8e8f9 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 25 九月 2024 14:29:24 +0800 Subject: [PATCH] 设备准备-领用 --- src/views/ecg/doctor/components/DevInstallPanel.vue | 67 +++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 17 deletions(-) diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue index dcbf78c..bc456fc 100644 --- a/src/views/ecg/doctor/components/DevInstallPanel.vue +++ b/src/views/ecg/doctor/components/DevInstallPanel.vue @@ -8,7 +8,10 @@ v-loading="formLoading" > <el-form-item label="璁惧缂栧彿" prop="devId"> - <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" /> + <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/> + </el-form-item> + <el-form-item label="璁惧鎻忚堪" prop=""> + {{deviceInfo.brand + " " + deviceInfo.model}} </el-form-item> <el-form-item label="瑁呮満鏃堕棿" prop="rentTime"> <el-date-picker @@ -22,19 +25,19 @@ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" /> </el-form-item> </el-form> - <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button> + <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button> <el-button @click="resetForm()">閲� 缃�</el-button> <el-button @click="printBill()">鎵撳嵃灏忕エ</el-button> <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button> - - <!-- 鍖荤敓鎷嗘満鍒楄〃 --> + <!-- 鍖荤敓瑁呮満鍒楄〃 --> <ContentWrap> - <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" > + <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="cancelled" > + <el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" > <template #default="scope"> - {{scope.row.cancelled == 1 ? "鏀惧純" : ""}} + <span v-if="scope.row.jobType === 5">"宸查鐢�"</span> + <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span> </template> </el-table-column> <!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />--> @@ -101,11 +104,13 @@ import {isStringEmpty} from "@/utils/stringUtil"; import {dateFormatter, timeFormatter} from "@/utils/formatTime"; import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; +import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage"; +import {curDayEnd, curDayStart} from "@/utils/dateUtil"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineComponent({ name: 'DevInstallPanel' }) -const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋� +const emit = defineEmits(['success-ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋� const { t } = useI18n() // 鍥介檯鍖� const message = useMessage() // 娑堟伅寮圭獥 @@ -140,6 +145,16 @@ }) const formRef = ref() // 琛ㄥ崟 Ref +const deviceInfo = ref<DeviceVO> ({ + id: 0, + devId: '', + category: '', + brand: '', + model: '', + purchaseDate: 0, + lost: 0, +}) + /** 鎻愪氦琛ㄥ崟 */ const submitForm = async () => { // 鏍¢獙琛ㄥ崟 @@ -149,16 +164,16 @@ try { const data = formData.value as unknown as DevRentVO if (formData.value.id === null || formData.value.id === undefined) { - const result = await DevRentApi.devInstall(data) + const result = await DevRentApi.devReady(data) formData.value.id = result - message.success(t('鏂板缓鎴愬姛')) + message.success(t('鎿嶄綔瀹屾垚')) } else { - await DevRentApi.devInstall(data) - message.success(t('鏇存柊鎴愬姛')) + await DevRentApi.devReady(data) + message.success(t('鏇存柊瀹屾垚')) } dialogVisible.value = false // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 - emit('success') + emit('success-ready') resetForm() getList() } finally { @@ -177,7 +192,7 @@ message.success(t('鎿嶄綔鎴愬姛')) } // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 - emit('success') + emit('success-ready') resetForm() getList() } @@ -197,6 +212,10 @@ remark: undefined } formRef.value?.resetFields() + + deviceInfo.value.category = '' + deviceInfo.value.brand = '' + deviceInfo.value.model = '' } const setPatient = (queueVO: QueueVO | undefined) => { @@ -212,17 +231,18 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, - jobType: 0, + jobType: [5, 30], docId: undefined, docName: undefined, devId: undefined, patId: undefined, patName: undefined, - jobTime: [], + jobTime: [curDayStart(), curDayEnd()], summary: undefined, remark: undefined, createTime: [] }) + /** 鏌ヨ鍒楄〃 */ const getList = async () => { loading.value = true @@ -235,7 +255,7 @@ } } -const onCurChange = (cur) => { +const onRowClick = (cur) => { if (cur !== null) getSelectedRent( cur.rentId ) } @@ -252,6 +272,19 @@ }) } +const getDevInfo = async () => { + deviceInfo.value.category = '' + deviceInfo.value.brand = '' + deviceInfo.value.model = '' + if (isStringEmpty(formData.value.devId)) + return + + const data = await DeviceApi.getDeviceByDevId(formData.value.devId!) + console.info( data ) + if ( null !== data) + deviceInfo.value = data +} + /** 鍒濆鍖� **/ onMounted(() => { getList() -- Gitblit v1.9.3