From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platform/src/components/base/BaseTable.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/src/components/base/BaseTable.vue b/platform/src/components/base/BaseTable.vue
index e738f2d..ccdafc0 100644
--- a/platform/src/components/base/BaseTable.vue
+++ b/platform/src/components/base/BaseTable.vue
@@ -135,9 +135,11 @@
     // 鍒犻櫎
     deleteById (row, childConfirm = true) {
       this.__checkApi()
-      let message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝悧?`
+      // let message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝悧?`
+      let message = `纭鍒犻櫎璇ヨ褰曞悧?`
       if (childConfirm && row.children != null && row.children.length > 0) {
-        message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝強鍏跺瓙${this.module}鍚�?`
+        // message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝強鍏跺瓙${this.module}鍚�?`
+        message = `纭鍒犻櫎璇ヨ褰曞強鍏跺瓙鏁版嵁鍚�?`
       }
       this.$dialog.deleteConfirm(message)
         .then(() => {
@@ -175,7 +177,7 @@
           }
         }
         if (containChildrenRows.length > 0) {
-          message = `鏈灏嗗垹闄�${this.module}銆�${containChildrenRows.join('銆�')}銆戝強鍏跺瓙${this.module}璁板綍锛岀‘璁ゅ垹闄ゅ悧锛焋
+          message = '鏈灏嗗垹闄よ鏁版嵁鍙婂叾瀛愭暟鎹紝纭鍒犻櫎鍚楋紵'
         }
       }
       this.$dialog.deleteConfirm(message)

--
Gitblit v1.9.3