From b745457acd3bb8f40c145df34dce5729463377ab Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 09 五月 2026 18:22:37 +0800
Subject: [PATCH] Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
---
src/views/business/allocation/index.vue | 90 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index 17bbc59..8061001 100644
--- a/src/views/business/allocation/index.vue
+++ b/src/views/business/allocation/index.vue
@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎹愮尞鑰呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
@@ -26,6 +26,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="妗堜緥缂栧彿" prop="caseNo">
<el-input
v-model="queryParams.caseNo"
@@ -35,6 +36,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鍒嗛厤鐘舵��" prop="allocationStatus">
<el-select
v-model="queryParams.allocationStatus"
@@ -44,7 +46,7 @@
>
<el-option label="鍏ㄩ儴" value="" />
<el-option
- v-for="dict in dict.type.allocation_Status"
+ v-for="dict in dict.type.organ_allocation_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -109,11 +111,17 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
+<<<<<<< HEAD
+ <!--
<el-table-column
+=======
+ <!-- <el-table-column
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="120"
+<<<<<<< HEAD
/>
<el-table-column
label="鎹愮尞鑰呯紪鍙�"
@@ -122,17 +130,38 @@
width="120"
/>
<el-table-column
- label="濮撳悕"
+ label="璇佷欢鍙风爜"
align="center"
- prop="name"
- width="100"
+ prop="idcardno"
+ width="180"
/>
+ <el-table-column
+ label="琛�鍨�"
+ align="center"
+ prop="bloodtype"
+ width="80"
+ />
+
+ <el-table-column
+ label="鍖荤枟鏈烘瀯"
+ align="center"
+ prop="treatmenthospitalname"
+ min-width="150"
+ show-overflow-tooltip
+ />
+ -->
+=======
+ /> -->
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<el-table-column
label="浣忛櫌鍙�"
align="center"
prop="inpatientno"
width="120"
/>
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="80">
<template slot-scope="scope">
<dict-tag
@@ -141,31 +170,12 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="80" />
- <el-table-column
- label="琛�鍨�"
- align="center"
- prop="bloodtype"
- width="80"
- />
- <el-table-column
- label="璇佷欢鍙风爜"
- align="center"
- prop="idcardno"
- width="180"
- />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="80" />
<el-table-column
label="鐤剧梾璇婃柇"
align="center"
prop="diagnosisname"
min-width="180"
- show-overflow-tooltip
- />
- <el-table-column
- label="鍖荤枟鏈烘瀯"
- align="center"
- prop="treatmenthospitalname"
- min-width="150"
show-overflow-tooltip
/>
<el-table-column
@@ -176,7 +186,7 @@
>
<template slot-scope="scope">
<dict-tag
- :options="dict.type.allocation_Status"
+ :options="dict.type.organ_allocation_status"
:value="scope.row.allocationStatus"
/>
</template>
@@ -187,13 +197,6 @@
prop="allocationTime"
width="160"
>
- <template slot-scope="scope">
- <span>{{
- scope.row.allocationTime
- ? parseTime(scope.row.allocationTime, "{y}-{m}-{d} {h}:{i}")
- : "-"
- }}</span>
- </template>
</el-table-column>
<el-table-column
label="鐧昏浜�"
@@ -263,7 +266,7 @@
</template>
<script>
-import { allocationList, } from "@/api/businessApi";
+import { allocationList } from "@/api/businessApi";
import Pagination from "@/components/Pagination";
export default {
@@ -315,9 +318,14 @@
delete params.allocationTimeRange;
// 濡傛灉鏈夋椂闂磋寖鍥村弬鏁�
- if (this.queryParams.allocationTimeRange && this.queryParams.allocationTimeRange.length === 2) {
- params.allocationTimeStart = this.queryParams.allocationTimeRange[0] + ' 00:00:00';
- params.allocationTimeEnd = this.queryParams.allocationTimeRange[1] + ' 23:59:59';
+ if (
+ this.queryParams.allocationTimeRange &&
+ this.queryParams.allocationTimeRange.length === 2
+ ) {
+ params.allocationTimeStart =
+ this.queryParams.allocationTimeRange[0] + " 00:00:00";
+ params.allocationTimeEnd =
+ this.queryParams.allocationTimeRange[1] + " 23:59:59";
}
allocationList(params)
@@ -357,7 +365,7 @@
handleView(row) {
this.$router.push({
path: "/case/allocationInfo",
- query: { id: row.infoid }
+ query: { id: row.id, infoid: row.infoid }
});
},
// 鏂板鎸夐挳鎿嶄綔
@@ -366,15 +374,15 @@
},
// 淇敼鎸夐挳鎿嶄綔
handleUpdate(row) {
- const id = row.infoid || this.ids[0];
this.$router.push({
path: "/case/allocationInfo",
- query: { id: id }
+ query: { id: row.id, infoid: row.infoid }
});
},
// 鍒犻櫎鎸夐挳鎿嶄綔
handleDelete(row) {
- const selectedRow = row || (this.selectedRows.length === 1 ? this.selectedRows[0] : null);
+ const selectedRow =
+ row || (this.selectedRows.length === 1 ? this.selectedRows[0] : null);
if (!selectedRow) {
this.$message.warning("璇烽�夋嫨涓�鏉¤褰�");
return;
--
Gitblit v1.9.3