From e5af0daca71f21317b061f174869e6ded2829071 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 09:46:03 +0800
Subject: [PATCH] Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
---
src/views/business/maintain/index.vue | 141 +++++++++++++++++++++++++++++++++-------------
1 files changed, 100 insertions(+), 41 deletions(-)
diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index 29c2bbb..a88934a 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="100px"
>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -17,25 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ尰鐤楁満鏋�" prop="treatmenthospitalname">
- <el-input
- v-model="queryParams.treatmenthospitalname"
- placeholder="璇疯緭鍏ュ尰鐤楁満鏋�"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍗忚皟鍛�" prop="coordinatorName">
- <el-input
- v-model="queryParams.coordinatorName"
- placeholder="璇疯緭鍏ュ崗璋冨憳濮撳悕"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎮ｈ�呯姸鎬�" prop="recordstate">
+ <el-form-item label="妗堜緥杩涘害" prop="recordstate">
<el-select
v-model="queryParams.recordstate"
placeholder="璇烽�夋嫨璁板綍鐘舵��"
@@ -49,10 +31,10 @@
<el-option label="鏈畬鎴愭崘鐚�" value="5" />
</el-select>
</el-form-item>
- <el-form-item label="骞撮緞鑼冨洿" prop="ageRange">
+ <el-form-item label="骞撮緞" prop="ageRange">
<el-input
v-model="queryParams.startAge"
- placeholder="鏈�灏忓勾榫�"
+ placeholder="0"
clearable
style="width: 95px"
@keyup.enter.native="handleQuery"
@@ -60,13 +42,13 @@
<span style="margin: 0 5px">-</span>
<el-input
v-model="queryParams.endAge"
- placeholder="鏈�澶у勾榫�"
+ placeholder="70"
clearable
style="width: 95px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="妗ｆ褰曞叆鏃堕棿" prop="recordTimeRange">
+ <el-form-item label="鍏ラ櫌鏃堕棿" prop="recordTimeRange">
<el-date-picker
v-model="queryParams.recordTimeRange"
type="daterange"
@@ -75,6 +57,16 @@
end-placeholder="缁撴潫鏃ユ湡"
value-format="yyyy-MM-dd"
style="width: 240px"
+ />
+ </el-form-item>
+
+ <el-form-item label="鍗忚皟鍛�" prop="coordinatorName">
+ <el-input
+ v-model="queryParams.coordinatorName"
+ placeholder="璇疯緭鍏ュ崗璋冨憳濮撳悕"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
@@ -111,23 +103,40 @@
v-loading="loading"
:data="maintenanceList"
@selection-change="handleSelectionChange"
- @row-click="handleRowClick"
>
<el-table-column type="selection" width="55" align="center" />
+<<<<<<< HEAD
+ <!--
<el-table-column
- label="浣忛櫌鍙�"
+=======
+ <!-- <el-table-column
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
+ label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="120"
+<<<<<<< HEAD
/>
+ -->
<el-table-column
- label="鎹愮尞鑰呯紪鍙�"
+ label="鎹愮尞缂栧彿"
+=======
+ /> -->
+ <el-table-column
+ label="浣忛櫌鍙�"
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
align="center"
- prop="donorno"
+ prop="inpatientno"
+ width="120"
+ />
+ <el-table-column
+ label="浣忛櫌鍙�"
+ align="center"
+ prop="inpatientno"
width="120"
/>
<el-table-column
- label="娼滃湪鎹愮尞鑰呭鍚�"
+ label="濮撳悕"
align="center"
prop="name"
width="120"
@@ -160,6 +169,9 @@
min-width="180"
show-overflow-tooltip
/>
+<<<<<<< HEAD
+
+=======
<el-table-column
label="棣栬瘖鍖荤枟鏈烘瀯"
align="center"
@@ -167,12 +179,7 @@
width="150"
show-overflow-tooltip
/>
- <el-table-column
- label="浣忛櫌鍙�"
- align="center"
- prop="inpatientno"
- width="120"
- />
+
<!-- <el-table-column
label="璁板綍鐘舵��"
align="center"
@@ -191,31 +198,83 @@
prop="coordinatorName"
width="100"
/>
- <el-table-column
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
+ <!-- <el-table-column
label="缁存姢椤圭洰"
align="center"
prop="itemName"
width="120"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
- label="缁存姢鏃堕棿"
+ label="棣栨缁存姢鏃堕棿"
align="center"
- prop="itemTime"
+ prop="updateTime"
width="140"
>
<template slot-scope="scope">
<span>{{
- scope.row.itemTime
- ? parseTime(scope.row.itemTime, "{y}-{m}-{d} {h}:{i}")
+ scope.row.updateTime
+ ? parseTime(scope.row.updateTime)
: "-"
}}</span>
</template>
</el-table-column>
<el-table-column
+ label="鏈�鏂扮淮鎶ゆ椂闂�"
+ align="center"
+ prop="updateTime"
+ width="140"
+ >
+ <template slot-scope="scope">
+ <span>{{
+ scope.row.updateTime
+ ? parseTime(scope.row.updateTime)
+ : "-"
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="缁存姢浜哄憳"
+ align="center"
+ prop="updateBy"
+ width="120"
+ /><el-table-column
+ label="鍏ラ櫌鏃堕棿"
+ align="center"
+ prop="treatmenthospitalname"
+ width="150"
+ show-overflow-tooltip
+ /><el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmenthospitalname"
+ width="150"
+ show-overflow-tooltip
+ />
+ <!-- <el-table-column
+ label="鐘舵��"
+ align="center"
+ prop="recordstate"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <el-tag :type="statusFilter(scope.row.recordstate)">
+ {{ statusTextFilter(scope.row.recordstate) }}
+ </el-tag>
+ </template>
+ </el-table-column> -->
+ <el-table-column
+ label="鍗忚皟鍛�"
+ align="center"
+ prop="coordinatorName"
+ width="100"
+ />
+ <el-table-column
label="鎿嶄綔"
align="center"
width="120"
+ fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
--
Gitblit v1.9.3