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/project/donatebaseinfo/index.vue | 98 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 40 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 6c29d1c..61efd61 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -10,7 +10,7 @@
>
<el-row :gutter="8">
<el-col :span="5">
- <el-form-item label="鎮ｈ�呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ鍚�"
@@ -21,7 +21,11 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="棣栬瘖鍖婚櫌" prop="treatmenthospitalname">
+<<<<<<< HEAD
+ <el-form-item label="鎶ュ憡鍖婚櫌" prop="treatmenthospitalname">
+=======
+ <el-form-item label="涓婃姤鍖婚櫌" prop="treatmenthospitalname">
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<org-selecter
ref="orgSelecter"
:org-type="'3'"
@@ -30,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="9">
- <el-form-item label="涓婃姤鏃堕棿">
+ <el-form-item label="鎶ュ憡鏃堕棿">
<el-date-picker
style="width: 100%"
v-model="selecttime"
@@ -65,7 +69,6 @@
<!-- 鎿嶄綔鎸夐挳 -->
<el-row :gutter="10" class="mb8">
-
<el-col :span="1.5">
<el-button
type="warning"
@@ -90,6 +93,7 @@
border
:default-sort="{ prop: 'donatetime', order: 'descending' }"
>
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
<el-table-column
label="妗堜緥鏃堕棿"
align="center"
@@ -101,12 +105,40 @@
</template>
</el-table-column>
<el-table-column
+ label="鎹愮尞杩涘害"
+ align="center"
+ prop="workflow"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <div v-if="!scope.row.terminationCase">
+ <dict-tag
+ :options="dict.type.sys_donornode"
+ :value="scope.row.workflow"
+ />
+ </div>
+ <div v-else><el-button type="danger" plain>浠诲姟缁堟</el-button></div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎹愮尞绫诲埆"
+ align="center"
+ prop="donationcategory"
+ width="150"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_DonationCategory"
+ :value="scope.row.donationcategory"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="200"
/>
- <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
<dict-tag
@@ -130,12 +162,16 @@
}}
</template>
</el-table-column>
+<<<<<<< HEAD
+ <el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" width="100"/>
+=======
<el-table-column
- label="棣栬瘖鍖婚櫌"
+ label="涓婃姤鍖婚櫌"
align="center"
prop="treatmenthospitalname"
/>
- <el-table-column label="GSC璇勫垎" align="center" prop="gcsScore" />
+ <el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100">
<template slot-scope="scope">
<dict-tag
@@ -145,40 +181,16 @@
</template>
</el-table-column>
<el-table-column
- label="鎹愮尞绫诲埆"
+ label="鎶ュ憡鍖婚櫌"
align="center"
- prop="donationcategory"
- width="150"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationCategory"
- :value="scope.row.donationcategory"
- />
- </template>
- </el-table-column>
+ prop="treatmenthospitalname"
+ />
<el-table-column
label="鎶ュ憡浜�"
align="center"
prop="reportername"
width="100"
/>
- <el-table-column
- label="鎹愮尞杩涘害"
- align="center"
- prop="workflow"
- width="120"
- >
- <template slot-scope="scope">
- <div v-if="!scope.row.terminationCase">
- <dict-tag
- :options="dict.type.sys_donornode"
- :value="scope.row.workflow"
- />
- </div>
- <div v-else><el-button type="danger" plain>浠诲姟缁堟</el-button></div>
- </template>
- </el-table-column>
<el-table-column
label="鎿嶄綔"
width="190"
@@ -210,7 +222,7 @@
style="color: #f56c6c;"
@click="handleTerminate(scope.row)"
v-if="
- scope.row.terminationCase === 0 && scope.row.recordstate !== '99'
+ scope.row.terminationCase == 0 && scope.row.recordstate !== '99'
"
>
缁堟
@@ -220,7 +232,7 @@
type="text"
style="color: #67c23a;"
@click="handleRestore(scope.row)"
- v-if="scope.row.terminationCase === 1"
+ v-if="scope.row.terminationCase == 1"
>
鎭㈠
</el-button>
@@ -346,7 +358,7 @@
{ required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" }
],
treatmenthospitalno: [
- { required: true, message: "璇烽�夋嫨棣栬瘖鍖婚櫌", trigger: "blur" }
+ { required: true, message: "璇烽�夋嫨涓婃姤鍖婚櫌", trigger: "blur" }
],
bloodtype: [
{ required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
@@ -535,9 +547,14 @@
},
/** 鎵撳紑缂栬緫寮圭獥 */
handleOpenEdit(row) {
- this.currentEditData = { ...row };
- console.log(this.currentEditData, "this.currentEditData");
- this.editModalVisible = true;
+ // 纭繚鍦ㄦ墦寮�寮规鍓嶉噸缃甤urrentEditData
+ this.currentEditData = {};
+
+ // 浣跨敤$nextTick纭繚DOM鏇存柊瀹屾垚
+ this.$nextTick(() => {
+ this.currentEditData = { ...row };
+ this.editModalVisible = true;
+ });
},
/** 澶勭悊缂栬緫鎴愬姛 */
@@ -549,6 +566,7 @@
/** 澶勭悊缂栬緫寮圭獥鍏抽棴 */
handleEditClosed() {
this.currentEditData = {};
+ this.editModalVisible = false;
},
handleModalVisibleChange(newVisible) {
--
Gitblit v1.9.3