From 002f765b0cc29ce75e6c6a965d2011c27bcc254b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 25 四月 2026 10:25:13 +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 |   79 ++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index f243ed9..273d268 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,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="棣栬瘖鍖婚櫌" prop="treatmenthospitalname">
+          <el-form-item label="鎶ュ憡鍖婚櫌" prop="treatmenthospitalname">
             <org-selecter
               ref="orgSelecter"
               :org-type="'3'"
@@ -30,7 +30,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"
@@ -89,6 +89,7 @@
       border
       :default-sort="{ prop: 'donatetime', order: 'descending' }"
     >
+      <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
       <el-table-column
         label="妗堜緥鏃堕棿"
         align="center"
@@ -100,12 +101,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
@@ -129,12 +158,7 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="棣栬瘖鍖婚櫌"
-        align="center"
-        prop="treatmenthospitalname"
-      />
-      <el-table-column label="GSC璇勫垎" align="center" prop="gcsScore" />
+      <el-table-column label="GCS璇勫垎" align="center" prop="gcsScore" width="100"/>
       <el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100">
         <template slot-scope="scope">
           <dict-tag
@@ -144,40 +168,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"
@@ -209,7 +209,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'
             "
           >
             缁堟
@@ -219,7 +219,7 @@
             type="text"
             style="color: #67c23a;"
             @click="handleRestore(scope.row)"
-            v-if="scope.row.terminationCase === 1"
+            v-if="scope.row.terminationCase == 1"
           >
             鎭㈠
           </el-button>
@@ -553,6 +553,7 @@
     /** 澶勭悊缂栬緫寮圭獥鍏抽棴 */
     handleEditClosed() {
       this.currentEditData = {};
+      this.editModalVisible = false;
     },
 
     handleModalVisibleChange(newVisible) {

--
Gitblit v1.9.3