From ded7c2154a86e2b313bbdc5e1202ce9c4f5c896f Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Fri, 28 Mar 2025 18:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A-=E5=85=AC=E4=BC=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E6=8C=89=E5=85=AC=E4=BC=9Aid=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/guildOperationManagement/guildInfo.vue | 13 ++++++++++++-
 src/views/nobleman/GuildInfo.vue                 | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/guildOperationManagement/guildInfo.vue b/src/views/guildOperationManagement/guildInfo.vue
index 609db46..d1b3eec 100644
--- a/src/views/guildOperationManagement/guildInfo.vue
+++ b/src/views/guildOperationManagement/guildInfo.vue
@@ -2,7 +2,15 @@
   <div class="box">
     <!-- 查询 -->
     <div class="inquire">
-      <span>ID</span>
+      <span>公会ID</span>
+      <el-input
+          v-model="inquire.guildId"
+          class="input"
+          type="number"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>会长ID</span>
       <el-input
         v-model="inquire.userId"
         placeholder=""
@@ -563,6 +571,7 @@ export default {
       delDialogData: null,
       //查询所需条件对象
       inquire: {
+        guildId: undefined,
         userId: "",
         referrer: "",
         time: "",
@@ -629,6 +638,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       pageFamily({
+        guildId: this.inquire.guildId,
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
@@ -779,6 +789,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       exportInfo({
+        guildId: this.inquire.guildId,
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
diff --git a/src/views/nobleman/GuildInfo.vue b/src/views/nobleman/GuildInfo.vue
index 186e3d1..a7e6940 100644
--- a/src/views/nobleman/GuildInfo.vue
+++ b/src/views/nobleman/GuildInfo.vue
@@ -2,7 +2,16 @@
   <div class="box">
     <!-- 查询 -->
     <div class="inquire">
-      <span>ID</span>
+      <span>公会ID</span>
+      <el-input
+          v-model="inquire.guildId"
+          placeholder=""
+          class="input"
+          type="number"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>会长ID</span>
       <el-input
         v-model="inquire.userId"
         placeholder=""
@@ -49,6 +58,7 @@
       border
       style="width: 100%; margin-top: 25px"
     >
+      <el-table-column prop="id" align="center" label="公会ID" />
       <el-table-column prop="referrer" align="center" label="推荐人" />
       <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
       <el-table-column prop="ownerNick" align="center" label="会长昵称" />
@@ -533,6 +543,7 @@ export default {
       delDialogData: null,
       //查询所需条件对象
       inquire: {
+        guildId: undefined,
         userId: "",
         referrer: "",
         time: "",
@@ -600,6 +611,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       pageFamily({
+        guildId: this.inquire.guildId,
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
@@ -749,6 +761,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       exportInfo({
+        guildId: this.inquire.guildId,
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,