src/api/ecg/common/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/api/ecg/devrent/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/api/ecg/queue/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/ecg/devmanage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/ecg/doctor/components/DevReadyPanel.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/ecg/common/index.ts
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ export interface PatDetailsVO { bedNo: string mobile: string deptDesc: string wardCode: string deptCode: string wardDesc: string } src/api/ecg/devrent/index.ts
@@ -1,21 +1,23 @@ import request from '@/config/axios' import {PatDetailsVO} from "@/api/ecg/common"; // è£ æºææº VO export interface DevRentVO { id: number | null // id devId: string // 设å¤ç¼å· patId: string // æ£è ç¼å· patName: string // æ£è åç§° checkType: number rentTime: Date // è£ æºæ¶é´ returnTime: Date // ææºæ¶é´ interference: number // å¹²æ°æ° baseline: string // åºçº¿ç² detachment: string // è±è½ remark: string // 夿³¨ roomId: number bedNo: string id: number | undefined // id devId: string | undefined // 设å¤ç¼å· patId: string | undefined// æ£è ç¼å· patName: string | undefined // æ£è åç§° patDetails: PatDetailsVO | undefined checkType: number | undefined rentTime: Date | undefined // è£ æºæ¶é´ returnTime: Date | undefined // ææºæ¶é´ interference: number | undefined // å¹²æ°æ° baseline: string | undefined // åºçº¿ç² detachment: string | undefined // è±è½ remark: string | undefined // 夿³¨ paid: number | undefined roomId: number | undefined bedNo: string | undefined } // è£ æºææº API src/api/ecg/queue/index.ts
@@ -1,4 +1,5 @@ import request from '@/config/axios' import {PatDetailsVO} from "@/api/ecg/common"; // æé VO export interface QueueVO { @@ -18,6 +19,7 @@ roomId: number // è¯å®¤ç¼å· roomName: string // è¯å®¤åç§° bedNo: string // è¯çåºç¼å· patDetails: PatDetailsVO } // æé API src/views/ecg/devmanage/index.vue
@@ -120,7 +120,7 @@ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <!-- <el-table-column label="id" align="center" prop="id" />--> <el-table-column label="设å¤ç¼å·" align="center" prop="devId" width="100px" /> <el-table-column label="åç±»å" align="center" prop="category"> <el-table-column label="åç±»" align="center" prop="category" width="60px"> <template #default="scope"> <dict-tag :type="DICT_TYPE.ECG_DEV_CATEGORY" :value="scope.row.category" /> </template> @@ -130,14 +130,22 @@ <dict-tag :type="DICT_TYPE.ECG_DEV_BRAND" :value="scope.row.brand" /> </template> </el-table-column> <el-table-column label="åå·" align="center" prop="model" /> <el-table-column label="ç¶æ" align="center" prop="lost" > <el-table-column label="åå·" align="center" prop="model" width="100px"/> <el-table-column label="ç¶æ" align="center" prop="lost" width="80px"> <template #default="scope"> <span>{{tranlateDevState(scope.row.state)}}</span> </template> </el-table-column> <el-table-column label="éè´æ¥æ" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/> <el-table-column label="æ£è " align="center" prop="patDetails" :formatter="dateFormatter2" width="400px"> <template #default="scope"> <span>{{scope.row.patDetails?.name}} {{scope.row.patDetails?.mobile}} {{scope.row.patDetails?.wardDesc}} {{scope.row.patDetails?.bedNo}}</span> </template> </el-table-column> <el-table-column label="ç¶ææ¥æ" align="center" prop="stateDate" :formatter="dateFormatter2" width="120px"/> <el-table-column label="éè´æ¥æ" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/> <!-- <el-table-column label="å建æ¶é´" src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -19,7 +19,7 @@ </el-form-item> <el-form-item label="æ£è æè¿°" prop="patDeptDesc"> {{formData.patDetails}} {{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"/> @@ -159,16 +159,11 @@ const checkTypeStore = useCheckTypeStoreWithOut() const formData = ref({ const formData = ref<DevRentVO>({ id: undefined, devId: undefined, patId: undefined, patName: undefined, patDeptCode: undefined, patDeptDesc: undefined, patWardCode: undefined, patWardDesc: undefined, patBedNo: undefined, patDetails: undefined, checkType: undefined, rentTime: new Date().getTime(), @@ -181,6 +176,7 @@ roomId: props.room.roomId, bedNo: props.room.bedNo }) const formRules = reactive({ devId: [{ required: true, message: '设å¤ç¼å·ä¸è½ä¸ºç©º', trigger: 'blur' }], rentTime: [{ required: true, message: 'è¯·éæ©è£ æºæ¥æ', trigger: 'blur' }], @@ -215,6 +211,8 @@ if (null === data) return console.info("dev rent : " + data) // formDate å¯¹åº DevRent // formData.value = data //ä¸è½æ´ä¸ªèµå¼ï¼ é»è®¤é¢ç¨æ¶é´è¢«æ¸ 空 formData.value.id = data.id; //rent id @@ -230,7 +228,7 @@ try { formData.value.roomId = props.room.roomId formData.value.bedNo = props.room.bedNo const data = formData.value as unknown as DevRentVO const data = formData.value console.info( data ) if (formData.value.id === null || formData.value.id === undefined) {