From 86b18b07bde4311328e930ff437a61206c638d71 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Mon, 26 May 2025 18:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=89=8D=E5=8F=B0=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bst/chatMsg.js               |  44 ++++
 src/router/index.js                  |   6 +
 src/views/bst/bindRecord/index.vue   |   1 -
 src/views/bst/changeRecord/index.vue |   1 -
 src/views/bst/chat/index.vue         |  19 +-
 src/views/bst/chatMsg/index.vue      | 341 +++++++++++++++++++++++++++
 src/views/bst/complaint/index.vue    |   1 -
 src/views/bst/lightingNum/index.vue  |   1 -
 src/views/bst/model/index.vue        |   1 -
 src/views/bst/team/TeamLink.vue      |  26 ++
 src/views/bst/team/index.vue         |  84 ++++---
 src/views/bst/team/teamDetail.vue    | 120 ++++++++++
 src/views/bst/teamUser/index.vue     |  24 +-
 13 files changed, 622 insertions(+), 47 deletions(-)
 create mode 100644 src/api/bst/chatMsg.js
 create mode 100644 src/views/bst/chatMsg/index.vue
 create mode 100644 src/views/bst/team/TeamLink.vue
 create mode 100644 src/views/bst/team/teamDetail.vue

diff --git a/src/api/bst/chatMsg.js b/src/api/bst/chatMsg.js
new file mode 100644
index 0000000..7731a0d
--- /dev/null
+++ b/src/api/bst/chatMsg.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询聊天消息列表列表
+export function listChatMsg(query) {
+  return request({
+    url: '/bst/chatMsg/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询聊天消息列表详细
+export function getChatMsg(id) {
+  return request({
+    url: '/bst/chatMsg/' + id,
+    method: 'get'
+  })
+}
+
+// 新增聊天消息列表
+export function addChatMsg(data) {
+  return request({
+    url: '/bst/chatMsg',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改聊天消息列表
+export function updateChatMsg(data) {
+  return request({
+    url: '/bst/chatMsg',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除聊天消息列表
+export function delChatMsg(id) {
+  return request({
+    url: '/bst/chatMsg/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 3b82163..6759b54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -122,6 +122,12 @@ export const constantRoutes = [
         name: 'BoothView',
         meta: { title: '卡座详情' }
       },
+      {
+        path: 'team/:id?',
+        component: () => import('@/views/bst/team/teamDetail.vue'),
+        name: 'TeamView',
+        meta: { title: '队伍详情' }
+      },
     ]
   },
   {
diff --git a/src/views/bst/bindRecord/index.vue b/src/views/bst/bindRecord/index.vue
index b5956e1..7f67d87 100644
--- a/src/views/bst/bindRecord/index.vue
+++ b/src/views/bst/bindRecord/index.vue
@@ -176,7 +176,6 @@ export default {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'recordId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'deviceName', visible: true, label: '设备名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/changeRecord/index.vue b/src/views/bst/changeRecord/index.vue
index ac2b56c..cc34099 100644
--- a/src/views/bst/changeRecord/index.vue
+++ b/src/views/bst/changeRecord/index.vue
@@ -129,7 +129,6 @@ export default {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'recordId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storeName', visible: true, label: '店铺名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'bstType', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/chat/index.vue b/src/views/bst/chat/index.vue
index d650403..66438f6 100644
--- a/src/views/bst/chat/index.vue
+++ b/src/views/bst/chat/index.vue
@@ -41,6 +41,10 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
     <el-table v-loading="loading" :data="chatList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <template v-for="column of showColumns">
@@ -180,17 +184,22 @@ export default {
   name: "Chat",
   mixins: [$showColumns],
   dicts: ['is_read', 'message_type'],
+  props: {
+    query: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   components: {UserLink, FormCol},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'teamName', visible: true, label: '队伍名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'senderName', visible: true, label: '发送人名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'receiverName', visible: true, label: '接收人名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'teamName', visible: true, label: '队伍名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'content', visible: true, label: '内容', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'content', visible: true, label: '内容', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
         {key: 'isRead', visible: true, label: '是否已读', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'type', visible: true, label: '消息类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'readTime', visible: true, label: '读取时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
@@ -256,6 +265,10 @@ export default {
     };
   },
   created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
     this.getList();
   },
   methods: {
diff --git a/src/views/bst/chatMsg/index.vue b/src/views/bst/chatMsg/index.vue
new file mode 100644
index 0000000..67a5d26
--- /dev/null
+++ b/src/views/bst/chatMsg/index.vue
@@ -0,0 +1,341 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="聊天ID" prop="chatId">
+        <el-input
+          v-model="queryParams.chatId"
+          placeholder="请输入聊天ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接收人ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入接收人ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否已读 0-未读 1-已读" prop="isRead">
+        <el-input
+          v-model="queryParams.isRead"
+          placeholder="请输入是否已读 0-未读 1-已读"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="读取时间" prop="readTime">
+        <el-date-picker clearable
+          v-model="queryParams.readTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择读取时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-has-permi="['bst:chatMsg:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-has-permi="['bst:chatMsg:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-has-permi="['bst:chatMsg:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="chatMsgList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'id'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-has-permi="['bst:chatMsg:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-has-permi="['bst:chatMsg:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改聊天消息列表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <form-col :span="span"  label="聊天ID" prop="chatId">
+            <el-input v-model="form.chatId" placeholder="请输入聊天ID" />
+          </form-col>
+          <form-col :span="span"  label="接收人ID" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入接收人ID" />
+          </form-col>
+          <form-col :span="span"  label="是否已读 0-未读 1-已读" prop="isRead">
+            <el-input v-model="form.isRead" placeholder="请输入是否已读 0-未读 1-已读" />
+          </form-col>
+          <form-col :span="span"  label="读取时间" prop="readTime">
+            <el-date-picker clearable
+              v-model="form.readTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择读取时间">
+            </el-date-picker>
+          </form-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listChatMsg, getChatMsg, delChatMsg, addChatMsg, updateChatMsg } from "@/api/bst/chatMsg";
+import { $showColumns } from '@/utils/mixins';
+import FormCol from "@/components/FormCol/index.vue";
+
+  // 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "ChatMsg",
+  mixins: [$showColumns],
+  components: {FormCol},
+  data() {
+    return {
+      span: 24,
+      // 字段列表
+      columns: [
+        {key: 'id', visible: true, label: '主键', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'chatId', visible: true, label: '聊天ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userId', visible: true, label: '接收人ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'isRead', visible: true, label: '是否已读 0-未读 1-已读', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'readTime', visible: true, label: '读取时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 聊天消息列表表格数据
+      chatMsgList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        chatId: null,
+        userId: null,
+        isRead: null,
+        readTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "接收人ID不能为空", trigger: "blur" }
+        ],
+        isRead: [
+          { required: true, message: "是否已读 0-未读 1-已读不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询聊天消息列表列表 */
+    getList() {
+      this.loading = true;
+      listChatMsg(this.queryParams).then(response => {
+        this.chatMsgList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        chatId: null,
+        userId: null,
+        isRead: null,
+        readTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加聊天消息列表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getChatMsg(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改聊天消息列表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateChatMsg(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addChatMsg(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除聊天消息列表编号为"' + ids + '"的数据项？').then(function() {
+        return delChatMsg(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('bst/chatMsg/export', {
+        ...this.queryParams
+      }, `chatMsg_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/bst/complaint/index.vue b/src/views/bst/complaint/index.vue
index 7cdcf20..14c41f5 100644
--- a/src/views/bst/complaint/index.vue
+++ b/src/views/bst/complaint/index.vue
@@ -70,7 +70,6 @@
 
     <el-table v-loading="loading" :data="complaintList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" width="40"/>
       <el-table-column label="用户" align="center" prop="userName">
         <template slot-scope="d">
           {{ d.row.userName }}
diff --git a/src/views/bst/lightingNum/index.vue b/src/views/bst/lightingNum/index.vue
index 5adb6c2..7d205af 100644
--- a/src/views/bst/lightingNum/index.vue
+++ b/src/views/bst/lightingNum/index.vue
@@ -166,7 +166,6 @@ export default {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storeName', visible: true, label: '店铺名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'number', visible: true, label: '爆灯数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/model/index.vue b/src/views/bst/model/index.vue
index 670b594..a3e8230 100644
--- a/src/views/bst/model/index.vue
+++ b/src/views/bst/model/index.vue
@@ -74,7 +74,6 @@
         >
         </el-table-column>
       </template>
-          <el-table-column label="ID" align="center" prop="modelId" width="40"/>
           <el-table-column label="型号" align="center" prop="model" />
           <el-table-column label="名称" align="center" prop="modelName" width="100" />
           <el-table-column label="产品ID" align="center" prop="productId" />
diff --git a/src/views/bst/team/TeamLink.vue b/src/views/bst/team/TeamLink.vue
new file mode 100644
index 0000000..b71f3af
--- /dev/null
+++ b/src/views/bst/team/TeamLink.vue
@@ -0,0 +1,26 @@
+<template>
+  <el-link type="primary" @click="handleClick" :disabled="id == null">{{name | defaultValue}}</el-link>
+</template>
+
+<script>
+
+export default {
+  name: 'TeamLink',
+  props: {
+    id: {
+      type: [Number,String],
+      default: null
+    },
+    name: {
+      type: String,
+      default: null,
+    },
+  },
+  methods: {
+    handleClick() {
+      this.$emit('click');
+        this.$router.push(`/view/team/${this.id}`)
+    }
+  }
+}
+</script>
diff --git a/src/views/bst/team/index.vue b/src/views/bst/team/index.vue
index 7776609..40f2580 100644
--- a/src/views/bst/team/index.vue
+++ b/src/views/bst/team/index.vue
@@ -62,6 +62,10 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
     <el-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange" :default-sort="defaultSort"
               @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center"/>
@@ -101,6 +105,23 @@
             <template v-else-if="column.key === 'bookTime'">
               <span v-if="d.row.status === TeamType.BOOK">{{ d.row.bookTime }}</span>
             </template>
+            <template v-else-if="column.key === 'name'">
+              <div v-if="d.row.name">
+                <team-link :id="d.row.id" :name="d.row.name"/>
+                <el-tag
+                  size="mini"
+                  type="success"
+                  style="margin-left: 5px"
+                >
+      <span v-if="d.row.limitNum !== null && d.row.limitNum !== undefined">
+        {{ d.row.currentNum || 0 }}/{{ d.row.limitNum }}
+      </span>
+                  <span v-else>
+                     无人数限制
+                  </span>
+                </el-tag>
+              </div>
+            </template>
             <template v-else-if="column.key === 'type'">
               <dict-tag :options="dict.type.team_type" :value="d.row[column.key]"/>
             </template>
@@ -112,6 +133,14 @@
       </template>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleSee(scope.row)"
+            v-has-permi="['bst:team:query']"
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -201,7 +230,6 @@
             <el-input v-model="form.topic" placeholder="请输入拼桌主题"/>
           </form-col>
 
-
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -222,11 +250,12 @@ import BoothLink from "@/views/bst/booth/components/BoothLink.vue";
 import UserLink from "@/views/system/user/UserLink.vue";
 import {TeamStatus, TeamType} from "@/utils/constants";
 import {listBooth} from "@/api/bst/booth";
+import TeamLink from "@/views/bst/team/TeamLink.vue";
 
 // 默认排序字段
 const defaultSort = {
-  prop: "status",
-  order: "asc"
+  prop: "createTime",
+  order: "descending"
 }
 
 export default {
@@ -241,22 +270,12 @@ export default {
   },
   mixins: [$showColumns],
   dicts: ['team_prefer', 'team_type', 'team_status'],
-  components: {UserLink, BoothLink, Booth, StoreLink, FormCol},
+  components: {TeamLink, UserLink, BoothLink, Booth, StoreLink, FormCol},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {
-          key: 'id',
-          visible: true,
-          label: 'ID',
-          minWidth: null,
-          sortable: true,
-          overflow: false,
-          align: 'center',
-          width: "80"
-        },
         {
           key: 'name',
           visible: true,
@@ -287,27 +306,6 @@ export default {
           align: 'center',
           width: "120"
         },
-        //{key: 'topic', visible: true, label: '拼桌主题', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {
-          key: 'limitNum',
-          visible: true,
-          label: '人数限制',
-          minWidth: null,
-          sortable: true,
-          overflow: false,
-          align: 'center',
-          width: "120"
-        },
-        {
-          key: 'currentNum',
-          visible: true,
-          label: '当前人数',
-          minWidth: null,
-          sortable: true,
-          overflow: false,
-          align: 'center',
-          width: "120"
-        },
         {
           key: 'type',
           visible: true,
@@ -358,6 +356,16 @@ export default {
           align: 'center',
           width: "120"
         },
+        {
+          key: 'createTime',
+          visible: true,
+          label: '创建时间',
+          minWidth: null,
+          sortable: true,
+          overflow: false,
+          align: 'center',
+          width: "120"
+        },
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -418,6 +426,10 @@ export default {
     this.getBoothList();
   },
   methods: {
+    // 查看拼桌队伍详情
+    handleSee(row) {
+      this.$router.push({path: `/view/team/${row.id}`})
+    },
     /** 当排序按钮被点击时触发 **/
     onSortChange(column) {
       if (column.order == null) {
@@ -441,7 +453,7 @@ export default {
     /** 查询卡座列表列表 */
     getBoothList(storeId) {
       this.loading = true;
-      listBooth({storeId:storeId}).then(response => {
+      listBooth({storeId: storeId}).then(response => {
         this.boothList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/bst/team/teamDetail.vue b/src/views/bst/team/teamDetail.vue
new file mode 100644
index 0000000..f25dacd
--- /dev/null
+++ b/src/views/bst/team/teamDetail.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-card class="box-card" header="队伍信息" >
+      <template slot="header">
+        <div class="card-header">
+          <span class="team-name">
+            队伍名称：{{ team.name | defaultValue }}
+            <el-tag size="mini" type="success" style="margin-left: 8px">
+              <span v-if="team.limitNum !== null && team.limitNum !== undefined">
+                {{ team.currentNum || 0 }}/{{ team.limitNum }}
+              </span>
+              <span v-else>
+                无人数限制
+              </span>
+            </el-tag>
+          </span>
+        </div>
+      </template>
+
+      <el-row type="flex">
+      <div style="flex: 1;margin-left: 2em">
+          <el-descriptions :column="3">
+            <el-descriptions-item label="发起人"><user-link  :id="team.sponsorId" :text="team.sponsorName"/></el-descriptions-item>
+            <el-descriptions-item label="卡座位置"><store-link :id="team.storeId" :name="team.storeName"/>/{{team.boothName | defaultValue}}</el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{team.createTime | defaultValue}}</el-descriptions-item>
+          </el-descriptions>
+      </div>
+      </el-row>
+    </el-card>
+
+
+    <el-card class="box-card">
+      <el-tabs>
+        <el-tab-pane label="成员列表" :lazy="true">
+          <team-user v-if="team.id != null" :query="{teamId: team.id ,status: TeamUserStatus.JOINED}"/>
+        </el-tab-pane>
+        <el-tab-pane label="聊天记录" :lazy="true">
+          <chat v-if="team.id != null" :query="{teamId: team.id}"/>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import PlaceSearchMap from '@/components/Map/PlaceSearch/PlaceSearchMap.vue'
+import {TeamUserStatus, views} from '@/utils/constants'
+import Device from "@/views/bst/device/index.vue";
+import Order from "@/views/bst/order/index.vue";
+import ChangeRecord from "@/views/bst/changeRecord/index.vue";
+
+import DeviceSelectDialog from "@/views/bst/device/components/DeviceSelectDialog.vue";
+import device from "@/views/bst/device/index.vue";
+import StoreLink from "@/views/bst/store/StoreLink.vue";
+import UserLink from "@/views/system/user/UserLink.vue";
+import {getTeam} from "@/api/bst/team";
+import TeamUser from "@/views/bst/teamUser/index.vue";
+import Chat from "@/views/bst/chat/index.vue";
+import TeamLink from "@/views/bst/team/TeamLink.vue";
+
+
+export default {
+  name: 'TeamView',
+  computed: {
+    TeamUserStatus() {
+      return TeamUserStatus
+    },
+    device() {
+      return device
+    },
+    views() {
+      return views
+    }
+  },
+  components: {
+    TeamLink,
+    Chat, TeamUser, UserLink, StoreLink, DeviceSelectDialog, ChangeRecord, Order, Device, PlaceSearchMap },
+  dicts: [],
+  data() {
+    return {
+      loading: false,
+      team: {},
+      showMap: false,
+      deviceDialogVisible: false,
+      deviceList: [],
+      selectedDevice: null,
+      deviceLoading: false,
+      bindLoading: false
+    }
+  },
+  created() {
+    this.getDetail();
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+  },
+  methods: {
+    getDetail() {
+      this.loading = true;
+      getTeam(this.$route.params.id).then(res => {
+        this.team = res.data;
+        this.showMap = true;
+      }).finally(() => {
+        this.loading = false;
+      })
+    },
+  },
+
+}
+</script>
+
+<style scoped>
+.remark-text {
+  color: #ccc;
+  margin-left: 1em;
+}
+.app-container .box-card:nth-child(n + 1) {
+  margin-top: 1em;
+}
+</style>
diff --git a/src/views/bst/teamUser/index.vue b/src/views/bst/teamUser/index.vue
index 6d32472..20d50e0 100644
--- a/src/views/bst/teamUser/index.vue
+++ b/src/views/bst/teamUser/index.vue
@@ -53,6 +53,10 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
     <el-table v-loading="loading" :data="teamUserList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <template v-for="column of showColumns">
@@ -88,6 +92,10 @@
               <i class="el-icon-user" v-if="d.row.inviterId"/>
               <user-link v-if="d.row.inviterId" :id="d.row.inviterId" :text="d.row.inviterName"/>
             </template>
+            <template v-else-if="column.key === 'teamName'">
+              <i class="el-icon-s-custom" v-if="d.row.teamId"/>
+              <team-link v-if="d.row.teamId" :id="d.row.teamId" :name="d.row.teamName"/>
+            </template>
             <template v-else-if="column.key === 'storeName'">
               <i class="el-icon-takeaway-box"/>
               <store-link :id="d.row.storeId" :name="d.row.storeName"/>
@@ -172,6 +180,7 @@ import FormCol from "@/components/FormCol/index.vue";
 import UserLink from "@/views/system/user/UserLink.vue";
 import {TeamStatus, TeamUserStatus} from "@/utils/constants";
 import StoreLink from "@/views/bst/store/StoreLink.vue";
+import TeamLink from "@/views/bst/team/TeamLink.vue";
 
   // 默认排序字段
 const defaultSort = {
@@ -190,22 +199,27 @@ export default {
     }
   },
   mixins: [$showColumns],
+  props: {
+    query: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   dicts: ['team_join_type', 'team_user_status',"team_user_role"],
-  components: {StoreLink, UserLink, FormCol},
+  components: {TeamLink, StoreLink, UserLink, FormCol},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: '主键', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'teamName', visible: true, label: '队伍名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'nickName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'joinType', visible: true, label: '加入方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'role', visible: true, label: '用户角色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'createTime', visible: true, label: '加入时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storeName', visible: true, label: '所属店铺', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'inviterName', visible: true, label: '邀请人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "120"},
+        {key: 'createTime', visible: true, label: '加入时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -256,6 +270,10 @@ export default {
     };
   },
   created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
     this.getList();
   },
   methods: {