From 4c9fdc87987140e8b2c3f0dfc2f6608cdb6be774 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 21 十月 2026 17:39:24 +0800
Subject: [PATCH] 青岛维护

---
 src/views/business/allocation/index.vue |  114 ++++++++++++++++++++++++--------------------------------
 1 files changed, 49 insertions(+), 65 deletions(-)

diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index 8061001..cd3328a 100644
--- a/src/views/business/allocation/index.vue
+++ b/src/views/business/allocation/index.vue
@@ -26,7 +26,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        
+
         <el-form-item label="妗堜緥缂栧彿" prop="caseNo">
           <el-input
             v-model="queryParams.caseNo"
@@ -36,7 +36,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-       
+
         <el-form-item label="鍒嗛厤鐘舵��" prop="allocationStatus">
           <el-select
             v-model="queryParams.allocationStatus"
@@ -111,50 +111,7 @@
         @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="鎹愮尞鑰呯紪鍙�"
-          align="center"
-          prop="donorno"
-          width="120"
-        />
-        <el-table-column
-          label="璇佷欢鍙风爜"
-          align="center"
-          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"
@@ -170,14 +127,40 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="骞撮緞" align="center" prop="age" width="80" />        
+        <el-table-column label="骞撮緞" align="center" prop="age" width="80" />
+        <el-table-column
+          label="琛�鍨�"
+          align="center"
+          prop="bloodtype"
+          width="80"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.sys_BloodType"
+              :value="scope.row.bloodtype"
+            />
+          </template>
+        </el-table-column>
         <el-table-column
           label="鐤剧梾璇婃柇"
           align="center"
           prop="diagnosisname"
-          min-width="180"
+          width="200"
           show-overflow-tooltip
         />
+        <el-table-column
+          label="鎹愮尞绫诲瀷"
+          align="center"
+          prop="donationcategory"
+          width="180"
+        >
+          <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"
@@ -218,10 +201,10 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+         <el-table-column
           label="鎿嶄綔"
           align="center"
-          width="210"
+          min-width="180"
           fixed="right"
           class-name="small-padding fixed-width"
         >
@@ -230,24 +213,15 @@
               size="mini"
               type="text"
               icon="el-icon-view"
-              @click="handleView(scope.row)"
-              >璇︽儏</el-button
+              @click.stop="handleView(scope.row)"
+              >鏌ョ湅</el-button
             >
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              >淇敼</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              style="color: #F56C6C"
-              @click="handleDelete(scope.row)"
-              :disabled="scope.row.allocationStatus === '2'"
-              >鍒犻櫎</el-button
+              @click.stop="handleUpdate(scope.row)"
+              >缂栬緫</el-button
             >
           </template>
         </el-table-column>
@@ -272,7 +246,7 @@
 export default {
   name: "OrganAllocationList",
   components: { Pagination },
-  dicts: ["sys_user_sex", "allocation_Status"],
+  dicts: ["sys_user_sex", "organ_allocation_status", "sys_BloodType", "sys_DonationCategory"],
   data() {
     return {
       // 閬僵灞�
@@ -365,7 +339,7 @@
     handleView(row) {
       this.$router.push({
         path: "/case/allocationInfo",
-        query: { id: row.id, infoid: row.infoid }
+        query: { id: row.id, infoid: row.infoid, mode: "view" }
       });
     },
     // 鏂板鎸夐挳鎿嶄綔
@@ -374,9 +348,19 @@
     },
     // 淇敼鎸夐挳鎿嶄綔
     handleUpdate(row) {
+      const selectedRow =
+        row || (this.selectedRows.length === 1 ? this.selectedRows[0] : null);
+      if (!selectedRow) {
+        this.$message.warning("璇烽�夋嫨涓�鏉¤褰�");
+        return;
+      }
       this.$router.push({
         path: "/case/allocationInfo",
-        query: { id: row.id, infoid: row.infoid }
+        query: {
+          id: selectedRow.id,
+          infoid: selectedRow.infoid,
+          mode: "edit"
+        }
       });
     },
     // 鍒犻櫎鎸夐挳鎿嶄綔

--
Gitblit v1.9.3