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/EditCaseModal.vue | 22 ++++++++---
src/views/business/assess/index.vue | 12 +++---
src/views/business/allocation/index.vue | 10 +++++
src/views/project/donatebaseinfo/index.vue | 15 +++++++
src/views/business/affirm/index.vue | 2
src/views/business/maintain/index.vue | 41 ++++++++++++++++++++
6 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/views/business/affirm/index.vue b/src/views/business/affirm/index.vue
index a3cc04a..a7ede48 100644
--- a/src/views/business/affirm/index.vue
+++ b/src/views/business/affirm/index.vue
@@ -114,7 +114,7 @@
<el-table-column
label="妗堜緥缂栧彿"
align="center"
- prop="caseNo"
+ prop="inpatientno"
width="120"
/>
<el-table-column
diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index 3aa78ad..8061001 100644
--- a/src/views/business/allocation/index.vue
+++ b/src/views/business/allocation/index.vue
@@ -111,12 +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="鎹愮尞鑰呯紪鍙�"
@@ -145,6 +150,11 @@
show-overflow-tooltip
/>
-->
+=======
+ /> -->
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<el-table-column
label="浣忛櫌鍙�"
align="center"
diff --git a/src/views/business/assess/index.vue b/src/views/business/assess/index.vue
index e756a18..bbe6a36 100644
--- a/src/views/business/assess/index.vue
+++ b/src/views/business/assess/index.vue
@@ -123,10 +123,10 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <el-table-column
label="浣忛櫌鍙�"
align="center"
- prop="caseNo"
+ prop="inpatientno"
width="120"
/>
<el-table-column
@@ -378,19 +378,19 @@
if (Array.isArray(response.data)) {
// 濡傛灉杩斿洖鐨勬槸鏁扮粍
this.assessmentList = response.data;
- this.total = response.data.length;
+ this.total = response.total;
} else if (response.data.rows) {
// 濡傛灉杩斿洖鐨勬槸鍒嗛〉鏁版嵁缁撴瀯
this.assessmentList = response.data.rows;
- this.total = response.data.total;
+ this.total = response.total;
} else if (Array.isArray(response.data.list)) {
// 濡傛灉杩斿洖鐨勬槸list瀛楁
this.assessmentList = response.data.list;
- this.total = response.data.total || response.data.list.length;
+ this.total = response.total || response.data.list.length;
} else {
// 鍏朵粬鏁版嵁缁撴瀯锛屽皾璇曠洿鎺ヤ娇鐢╠ata
this.assessmentList = response.data;
- this.total = response.total || response.data.length;
+ this.total = response.total || response.total;
}
} else {
// 濡傛灉data涓虹┖锛屼娇鐢ㄦ牴绾у埆鐨剅ows鎴杔ist
diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index 9021261..a88934a 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -105,18 +105,28 @@
@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="鎹愮尞缂栧彿"
+=======
+ /> -->
+ <el-table-column
+ label="浣忛櫌鍙�"
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
align="center"
- prop="donorno"
+ prop="inpatientno"
width="120"
/>
<el-table-column
@@ -159,7 +169,36 @@
min-width="180"
show-overflow-tooltip
/>
+<<<<<<< HEAD
+=======
+ <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"
+ />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<!-- <el-table-column
label="缁存姢椤圭洰"
align="center"
diff --git a/src/views/project/donatebaseinfo/EditCaseModal.vue b/src/views/project/donatebaseinfo/EditCaseModal.vue
index a37af4b..e68692d 100644
--- a/src/views/project/donatebaseinfo/EditCaseModal.vue
+++ b/src/views/project/donatebaseinfo/EditCaseModal.vue
@@ -164,22 +164,32 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="20">
+ <el-col :span="8">
+ <el-form-item label="涓婃姤鍖婚櫌" prop="treatmenthospitalname">
+ <el-input
+ v-model="formData.treatmenthospitalname"
+ placeholder="璇疯緭鍏ヤ笂鎶ュ尰闄�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-card>
<!-- 鍖荤枟淇℃伅閮ㄥ垎 -->
<el-card header="鍖荤枟淇℃伅" class="form-section">
<el-row :gutter="20">
<el-col :span="8">
- <el-form-item label="棣栬瘖鍖婚櫌" prop="treatmenthospitalno">
- <org-selecter
- :org-type="'3'"
- v-model="formData.treatmenthospitalno"
- @change="handleHospitalChange"
+ <el-form-item label="褰撳墠鍖婚櫌" prop="Reporttothehospital">
+ <el-input
+ v-model="formData.Reporttothehospital"
+ placeholder="璇疯緭鍏ヤ笂鎶ュ尰闄�"
/>
+
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="绉戝" prop="treatmentdeptname">
+ <el-form-item label="鍏ラ櫌绉戝" prop="treatmentdeptname">
<el-input
v-model="formData.treatmentdeptname"
placeholder="璇疯緭鍏ョ瀹�"
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 273d268..61efd61 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -21,7 +21,11 @@
</el-form-item>
</el-col>
<el-col :span="5">
+<<<<<<< HEAD
<el-form-item label="鎶ュ憡鍖婚櫌" prop="treatmenthospitalname">
+=======
+ <el-form-item label="涓婃姤鍖婚櫌" prop="treatmenthospitalname">
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<org-selecter
ref="orgSelecter"
:org-type="'3'"
@@ -158,7 +162,16 @@
}}
</template>
</el-table-column>
+<<<<<<< HEAD
<el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" width="100"/>
+=======
+ <el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmenthospitalname"
+ />
+ <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
@@ -345,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" }
--
Gitblit v1.9.3