From 2f3221b7c90d5663fdb312653a2d188bc4628370 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 10:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/cases.vue |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/business/cases.vue b/admin/src/views/business/cases.vue
index 6024fbd..469de42 100644
--- a/admin/src/views/business/cases.vue
+++ b/admin/src/views/business/cases.vue
@@ -18,7 +18,7 @@
               v-for="item in memberList"
               :key="item.id"
               :value="item.id"
-              :label="item.name"
+              :label="item.name+' 銆�'+item.code+'銆�'"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -54,7 +54,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="name" label="妗堜緥鏍囬" min-width="100px"></el-table-column>
+        <el-table-column prop="name" label="妗堜緥鏍囬" min-width="200px"></el-table-column>
         <el-table-column  prop="icon" label="鎺掕姒滃浘闆�" min-width="220px">
           <template slot-scope="{row}">
             <div style="display: flex; flex-wrap: wrap;width: 200px;"  v-if="row.fileList && row.fileList.length">
@@ -66,10 +66,14 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="memberName" label="鑰佸笀" min-width="120px"></el-table-column>
+        <el-table-column prop="memberName" label="鑰佸笀" min-width="220px">
+          <template slot-scope="{row}">
+            <span class="orange" style="margin-right: 10px"> {{row.memberCode}}</span> <span>{{row.memberName||''}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="140px"></el-table-column>
         <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="140px"></el-table-column>
-        <el-table-column prop="detail" label="妗堜緥鎻忚堪" min-width="230px" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="detail" label="妗堜緥鎻忚堪" min-width="230px" ></el-table-column>
         <el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
         <el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
         <el-table-column label="鐘舵��" fixed="right">
@@ -140,6 +144,68 @@
     })
   },
   methods: {
+    deleteById (row, childConfirm = true, call) {
+      this.__checkApi()
+      let message = `纭鍒犻櫎妗堜緥鏁版嵁鍚�?`
+      if (childConfirm && row.children != null && row.children.length > 0) {
+        message = `纭鍒犻櫎妗堜緥鏁版嵁鍚�?`
+      }
+      this.$dialog.deleteConfirm(message)
+              .then(() => {
+                this.isWorking.delete = true
+                this.api.deleteById(row[this.configData['field.id']])
+                        .then(() => {
+                          this.__afterDelete()
+                          if (call) {
+                            call()
+                          }
+                        })
+                        .catch(e => {
+                          this.$tip.apiFailed(e)
+                        })
+                        .finally(() => {
+                          this.isWorking.delete = false
+                        })
+              })
+              .catch(() => {})
+    },
+    deleteByIdInBatch (childConfirm = true, call) {
+      this.__checkApi()
+      if (this.tableData.selectedRows.length === 0) {
+        this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
+        return
+      }
+      let message = `纭鍒犻櫎妗堜緥鏁版嵁鍚�?`
+      if (childConfirm) {
+        const containChildrenRows = []
+        for (const row of this.tableData.selectedRows) {
+          if (row.children != null && row.children.length > 0) {
+            containChildrenRows.push(row[this.configData['field.main']])
+          }
+        }
+        if (containChildrenRows.length > 0) {
+          message = `纭鍒犻櫎妗堜緥鏁版嵁鍚�?`
+        }
+      }
+      this.$dialog.deleteConfirm(message)
+              .then(() => {
+                this.isWorking.delete = true
+                this.api.deleteByIdInBatch(this.tableData.selectedRows.map(row => row[this.configData['field.id']]).join(','))
+                        .then(() => {
+                          this.__afterDelete(this.tableData.selectedRows.length)
+                          if (call) {
+                            call()
+                          }
+                        })
+                        .catch(e => {
+                          this.$tip.apiFailed(e)
+                        })
+                        .finally(() => {
+                          this.isWorking.delete = false
+                        })
+              })
+              .catch(() => {})
+    },
     changeStatus (e, row) {
       this.working = true
       this.api.updateStatus({ id: row.id, status: e })

--
Gitblit v1.9.3