From e25465c223a2e63422acfb58414597ca8fc4df09 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 13 十一月 2025 18:01:55 +0800
Subject: [PATCH] 排队异常、小屏适配问题
---
src/views/ecg/devrent/index.vue | 81 ++++++++++++++--------------------------
1 files changed, 28 insertions(+), 53 deletions(-)
diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index 356ee1a..ae84885 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -1,3 +1,4 @@
+<!--妫�鏌ヨ褰曠晫闈�-->
<template>
<ContentWrap>
<!-- 鎼滅储宸ヤ綔鏍� -->
@@ -6,7 +7,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
- label-width="68px"
+ label-width="120px"
>
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input
@@ -35,7 +36,7 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
+ <el-form-item label="妫�鏌�&瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
v-model="queryParams.rentTime"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -57,42 +58,7 @@
class="!w-220px"
/>
</el-form-item>
- <el-form-item label="骞叉壈鏁�" prop="interference">
- <el-input
- v-model="queryParams.interference"
- placeholder="璇疯緭鍏ュ共鎵版暟"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input
- v-model="queryParams.baseline"
- placeholder="璇疯緭鍏ュ熀绾跨矖"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
- <el-input
- v-model="queryParams.detachment"
- placeholder="璇疯緭鍏ヨ劚绂�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input
- v-model="queryParams.remark"
- placeholder="璇疯緭鍏ュ娉�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
+<!--
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
@@ -104,17 +70,10 @@
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>
- <el-button
- type="primary"
- plain
- @click="openForm('create')"
- v-hasPermi="['ecg:dev-rent:create']"
- >
- <Icon icon="ep:plus" class="mr-5px" /> 鏂板
- </el-button>
<el-button
type="success"
plain
@@ -135,8 +94,18 @@
<el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
- <el-table-column
- label="瑁呮満鏃堕棿"
+ <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="checkType" width="100px">
+ <template #default="scope">
+ <span>{{getCheckTypeName(scope.row.checkType)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="state" width="90px">
+ <template #default="scope">
+ <span>{{tranlateCheckState(scope.row.state)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="妫�鏌�&瑁呮満鏃堕棿"
align="center"
prop="rentTime"
:formatter="dateFormatter"
@@ -151,8 +120,9 @@
/>
<el-table-column label="骞叉壈鏁�" align="center" prop="interference" />
<el-table-column label="鍩虹嚎绮�" align="center" prop="baseline" />
- <el-table-column label="鑴辩" align="center" prop="detachment" />
+ <el-table-column label="鑴辫惤" align="center" prop="detachment" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+<!--
<el-table-column
label="鍒涘缓鏃堕棿"
align="center"
@@ -160,6 +130,8 @@
:formatter="dateFormatter"
width="180px"
/>
+-->
+<!--
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
@@ -180,6 +152,7 @@
</el-button>
</template>
</el-table-column>
+-->
</el-table>
<!-- 鍒嗛〉 -->
<Pagination
@@ -199,6 +172,8 @@
import download from '@/utils/download'
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import DevRentForm from './DevRentForm.vue'
+import {tranlateCheckState} from "../../../utils/statusFormatter";
+import {getCheckTypeName} from "../../../utils/checkTypeFormatter";
/** 瑁呮満鎷嗘満 鍒楄〃 */
defineOptions({ name: 'DevRent' })
@@ -217,9 +192,9 @@
patName: undefined,
rentTime: [],
returnTime: [],
- interference: undefined,
- baseline: undefined,
- detachment: undefined,
+ // interference: undefined,
+ // baseline: undefined,
+ // detachment: undefined,
remark: undefined,
createTime: []
})
@@ -288,4 +263,4 @@
onMounted(() => {
getList()
})
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3