From 8ce35ee72e52f51f93e61d2dec6084c3cfd397b6 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 18 十二月 2024 15:31:36 +0800 Subject: [PATCH] 设备查询完善 --- src/views/ecg/devmanage/index.vue | 96 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 66 insertions(+), 30 deletions(-) diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue index 67ce8cd..2a1998d 100644 --- a/src/views/ecg/devmanage/index.vue +++ b/src/views/ecg/devmanage/index.vue @@ -6,28 +6,36 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="68px" + label-width="100px" > - <el-form-item label="閲囪喘鏃ユ湡" prop="purchaseDate"> - <el-date-picker - v-model="queryParams.purchaseDate" - value-format="YYYY-MM-DD HH:mm:ss" - type="daterange" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" - :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" - class="!w-220px" - /> - </el-form-item> - <el-form-item label="璁惧缂栧彿" prop="devId"> + <el-form-item label="璁惧閮ㄩ棬缂栧彿" prop="devId"> <el-input - v-model="queryParams.devId" - placeholder="璇疯緭鍏ヨ澶囩紪鍙�" + v-model="queryParams.devCodeDept" + placeholder="璇疯緭鍏ヨ澶囬儴闂ㄧ紪鍙�" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> + <el-form-item label="璁惧鍖婚櫌缂栧彿" prop="devId"> + <el-input + v-model="queryParams.devCodeHosp" + placeholder="璇疯緭鍏ヨ澶囧尰闄㈢紪鍙�" + clearable + @keyup.enter="handleQuery" + class="!w-240px" + /> + </el-form-item> + <el-form-item label="璁惧鍥烘湁缂栧彿" prop="devId"> + <el-input + v-model="queryParams.devCodeIntrinsic" + placeholder="璇疯緭鍏ヨ澶囧浐鏈夌紪鍙�" + clearable + @keyup.enter="handleQuery" + class="!w-240px" + /> + </el-form-item> + <el-form-item label="鐘舵��" prop="state"> <el-select v-model="queryParams.state" @@ -91,6 +99,19 @@ /> </el-select> </el-form-item> + + <el-form-item label="閲囪喘鏃ユ湡" prop="purchaseDate"> + <el-date-picker + v-model="queryParams.purchaseDate" + value-format="YYYY-MM-DD HH:mm:ss" + type="daterange" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" + class="!w-220px" + /> + </el-form-item> + <el-form-item> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button> @@ -120,7 +141,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,23 +151,33 @@ <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="鎮h��" align="center" prop="patDetails" 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="createTime" - :formatter="dateFormatter2" - width="180px" - /> ---> + <el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/> + + <el-table-column label="澶囨敞" align="center" prop="comment" width="100px" /> + + <!-- + <el-table-column + label="鍒涘缓鏃堕棿" + align="center" + prop="createTime" + :formatter="dateFormatter2" + width="180px" + /> + --> <el-table-column label="鎿嶄綔" align="center" min-width="120px"> <template #default="scope"> <el-button @@ -223,6 +254,9 @@ purchaseDate: [], createTime: [], devId: undefined, + devCodeIntrinsic: undefined, + devCodeHosp: undefined, + devCodeDept: undefined, state: [], category: undefined, brand: undefined, @@ -301,7 +335,7 @@ } const categoryChanged = async () => { - const data = await DevModelApi.getBrandOption(queryParams.category!) + const data = await DevModelApi.getBrandOption(queryParams.category??'') brandOptions.value = data queryParams.brand = '' @@ -312,7 +346,7 @@ } const brandChanged = async () => { - const data = await DevModelApi.getModelOption(queryParams.category!, queryParams.brand!) + const data = await DevModelApi.getModelOption(queryParams.category??'', queryParams.brand??'') modelOptions.value = data queryParams.model = '' @@ -325,6 +359,8 @@ const data = await getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY) categoryOptions.value = data + categoryChanged() + getList() }) </script> \ No newline at end of file -- Gitblit v1.9.3