From 26d075953ed24d6a1cca4b136b911edd6912e4ab Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Wed, 13 Aug 2025 17:34:45 +0800
Subject: [PATCH 1/8] =?UTF-8?q?style:=20ui=E7=95=8C=E9=9D=A2=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2,=E8=A1=A8=E6=A0=BC=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |   2 +-
 src/views/school/index.vue             |   8 +-
 src/views/testxb/index.vue             |  11 +
 src/views/toschoolinfomanage/index.vue | 288 +++++++++++++++++++++++++
 4 files changed, 305 insertions(+), 4 deletions(-)
 create mode 100644 src/views/testxb/index.vue
 create mode 100644 src/views/toschoolinfomanage/index.vue

diff --git a/.env.development b/.env.development
index 17faa14..ab8609f 100644
--- a/.env.development
+++ b/.env.development
@@ -7,4 +7,4 @@ VITE_PUBLIC_PATH = /
 # 开发环境路由历史模式（Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"）
 VITE_ROUTER_HISTORY = "hash"
 
-VITE_API_BASEURL = "http://localhost:5199/api"
+VITE_API_BASEURL = "http://192.168.2.33:5199/api"
diff --git a/src/views/school/index.vue b/src/views/school/index.vue
index c1d3d24..967f5de 100644
--- a/src/views/school/index.vue
+++ b/src/views/school/index.vue
@@ -95,8 +95,8 @@ const tableData: TableConfig = {
       edit: true, // 字段允许修改
       setting: {
         datasource: [
-          { Value: "true", Text: "√" },
-          { Value: "false", Text: "X" }
+          { value: "true", text: "√" },
+          { value: "false", text: "X" }
         ]
       }
     }
@@ -110,5 +110,7 @@ const tableData: TableConfig = {
 </script>
 
 <template>
-  <div><ahTable ref="table" :tableConfig="tableData" /></div>
+  <div>
+    <ahTable ref="table" :tableConfig="tableData" />
+  </div>
 </template>
diff --git a/src/views/testxb/index.vue b/src/views/testxb/index.vue
new file mode 100644
index 0000000..268449f
--- /dev/null
+++ b/src/views/testxb/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts" name="Testxb">
+import { ref } from "vue";
+// defineOptions({
+//   name: "Testxb"
+// });
+let name = ref("nihao");
+</script>
+
+<template>
+  <div>测试菜单</div>
+</template>
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
new file mode 100644
index 0000000..4aea880
--- /dev/null
+++ b/src/views/toschoolinfomanage/index.vue
@@ -0,0 +1,288 @@
+<template>
+  <div>
+    <!-- 搜索区域 -->
+    <el-form :model="query" inline label-width="80px" class="search-form">
+      <el-form-item label="学校">
+        <el-select
+          v-model="query.school"
+          placeholder="请选择学校"
+          clearable
+          filterable
+          style="width: 180px"
+        >
+          <el-option
+            v-for="s in schoolOptions"
+            :key="s.value"
+            :label="s.label"
+            :value="s.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="年级">
+        <el-select
+          v-model="query.grade"
+          placeholder="请选择年级"
+          clearable
+          style="width: 140px"
+        >
+          <el-option
+            v-for="g in gradeOptions"
+            :key="g.value"
+            :label="g.label"
+            :value="g.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="赴校人员">
+        <el-input
+          v-model="query.people"
+          placeholder="请输入人员"
+          clearable
+          style="width: 180px"
+        />
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select
+          v-model="query.status"
+          placeholder="请选择状态"
+          clearable
+          style="width: 140px"
+        >
+          <el-option label="已完结" :value="1" />
+          <el-option label="跟进中" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="赴校时间">
+        <el-date-picker
+          v-model="query.times"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="YYYY-MM-DD"
+          unlink-panels
+          style="width: 300px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 表格区域 -->
+    <el-table :data="pagedData" border style="width: 100%">
+      <el-table-column prop="school" label="学校" min-width="140" />
+      <el-table-column prop="grade" label="年级" min-width="100" />
+      <el-table-column prop="people" label="赴校人员" min-width="120" />
+      <el-table-column prop="times" label="赴校时间" min-width="140" />
+      <el-table-column
+        prop="feedbackTotals"
+        label="反馈问题数量"
+        min-width="140"
+      />
+      <el-table-column
+        prop="solveTotals"
+        label="解决问题数量"
+        min-width="140"
+      />
+      <el-table-column label="状态" min-width="110">
+        <template #default="{ row }">
+          <el-tag :type="row.status === 1 ? 'success' : 'warning'">
+            {{ row.status === 1 ? "已完结" : "跟进中" }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="lastTime" label="最后跟进时间" min-width="160" />
+      <el-table-column label="操作" fixed="right" min-width="220">
+        <template #default="{ row }">
+          <el-button size="small" type="danger" plain @click="onDelete(row)"
+            >删除</el-button
+          >
+          <el-button size="small" type="primary" plain @click="onDetail(row)"
+            >详情</el-button
+          >
+          <el-button size="small" type="success" plain @click="onFollow(row)"
+            >跟进</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <div class="pager">
+      <el-pagination
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="filteredList.length"
+        :current-page="page"
+        :page-size="pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        @current-change="handlePageChange"
+        @size-change="handleSizeChange"
+      />
+    </div>
+  </div>
+</template>
+<!-- 赴校信息管理菜单 -->
+<script setup lang="ts" name="Toschoolinfomanage">
+import { ref, reactive, computed } from "vue";
+import dayjs from "dayjs";
+import { ElMessage } from "element-plus";
+
+interface TableItem {
+  id: number;
+  school: string;
+  grade: string;
+  people: string;
+  times: string; // YYYY-MM-DD
+  feedbackTotals: number;
+  solveTotals: number;
+  status: 1 | 2; // 1: 已完结, 2: 跟进中
+  lastTime: string; // YYYY-MM-DD
+}
+
+const schoolOptions = [
+  { label: "第一中学", value: "第一中学" },
+  { label: "第二中学", value: "第二中学" },
+  { label: "实验中学", value: "实验中学" },
+  { label: "外国语学校", value: "外国语学校" }
+];
+
+const gradeOptions = [
+  { label: "高一", value: "高一" },
+  { label: "高二", value: "高二" },
+  { label: "高三", value: "高三" },
+  { label: "初三", value: "初三" }
+];
+
+const query = reactive({
+  school: "" as string | undefined,
+  grade: "" as string | undefined,
+  people: "",
+  status: undefined as 1 | 2 | undefined,
+  times: [] as string[]
+});
+
+// 点击查询后生效的条件，避免输入框每次输入都触发筛选
+const appliedQuery = ref({ ...query });
+
+const page = ref(1);
+const pageSize = ref(10);
+
+function rand(min: number, max: number) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+function randomDate(start: string, end: string) {
+  const startTs = dayjs(start).valueOf();
+  const endTs = dayjs(end).valueOf();
+  const v = rand(startTs, endTs);
+  return dayjs(v).format("YYYY-MM-DD");
+}
+
+function createMockList(len = 87): TableItem[] {
+  const peoplePool = ["张三", "李四", "王五", "赵六", "陈七", "刘八", "黄九"];
+  const list: TableItem[] = [];
+  for (let i = 1; i <= len; i++) {
+    const school = schoolOptions[rand(0, schoolOptions.length - 1)].value;
+    const grade = gradeOptions[rand(0, gradeOptions.length - 1)].value;
+    const times = randomDate("2024-01-01", "2025-12-31");
+    const lastTime = dayjs(times).add(rand(0, 120), "day").format("YYYY-MM-DD");
+    const feedbackTotals = rand(0, 20);
+    const solveTotals = rand(0, feedbackTotals);
+    const status = rand(1, 2) as 1 | 2;
+    list.push({
+      id: i,
+      school,
+      grade,
+      people: peoplePool[rand(0, peoplePool.length - 1)],
+      times,
+      feedbackTotals,
+      solveTotals,
+      status,
+      lastTime
+    });
+  }
+  return list;
+}
+
+const allData = ref<TableItem[]>(createMockList());
+
+const filteredList = computed(() => {
+  const q = appliedQuery.value;
+  return allData.value.filter(item => {
+    const matchSchool = q.school ? item.school === q.school : true;
+    const matchGrade = q.grade ? item.grade === q.grade : true;
+    const matchPeople = q.people ? item.people.includes(q.people.trim()) : true;
+    const matchStatus = q.status ? item.status === q.status : true;
+    let matchTimes = true;
+    if (Array.isArray(q.times) && q.times.length === 2) {
+      const [start, end] = q.times;
+      const d = dayjs(item.times);
+      matchTimes =
+        d.isAfter(dayjs(start).subtract(1, "day")) &&
+        d.isBefore(dayjs(end).add(1, "day"));
+    }
+    return (
+      matchSchool && matchGrade && matchPeople && matchStatus && matchTimes
+    );
+  });
+});
+
+const pagedData = computed(() => {
+  const start = (page.value - 1) * pageSize.value;
+  return filteredList.value.slice(start, start + pageSize.value);
+});
+
+function handleSearch() {
+  appliedQuery.value = { ...query } as any;
+  page.value = 1;
+}
+
+function handleReset() {
+  query.school = "";
+  query.grade = "";
+  query.people = "";
+  query.status = undefined;
+  query.times = [];
+  appliedQuery.value = { ...query } as any;
+  page.value = 1;
+}
+
+function handlePageChange(p: number) {
+  page.value = p;
+}
+
+function handleSizeChange(s: number) {
+  pageSize.value = s;
+  page.value = 1;
+}
+
+function onDelete(row: TableItem) {
+  console.log(`删除：${row.school} - ${row.people}`);
+  ElMessage.success(`已删除：${row.school} - ${row.people}`);
+}
+
+function onDetail(row: TableItem) {
+  console.log(`详情：${row.school} - ${row.people}`);
+  ElMessage.info(`详情：${row.school} - ${row.people}`);
+}
+
+function onFollow(row: TableItem) {
+  console.log(`跟进：${row.school} - ${row.people}`);
+  ElMessage.success(`跟进：${row.school} - ${row.people}`);
+}
+</script>
+
+<style lang="scss" scoped>
+.search-form {
+  margin-bottom: 12px;
+}
+
+.pager {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+</style>

From fbac2ef72b490297dfb236a01d46fdfa63c46dfb Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Fri, 15 Aug 2025 14:06:52 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E5=87=86=E5=A4=87=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/toschoolinfomanage.ts          | 23 +++++++++++
 src/views/toschoolinfomanage/index.vue | 53 ++++++++++++++++++++------
 2 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/api/toschoolinfomanage.ts

diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts
new file mode 100644
index 0000000..8d48758
--- /dev/null
+++ b/src/api/toschoolinfomanage.ts
@@ -0,0 +1,23 @@
+import { http } from "@/utils/http";
+import type { Res } from "@/utils/http/types";
+
+/**
+ * @description 获取学校枚举下拉
+ * @param {string} type 枚举类型 type=StatusEnum
+ * @return {object}
+ */
+export function getenum(data) {
+  return http.request<Res<any>>("post", `/back/schools/QueryCombo`, {
+    data
+  });
+}
+/**
+ * @description 获取学校枚举下拉
+ * @param {string} type 枚举类型 type=StatusEnum
+ * @return {object}
+ */
+export function getPageList(data) {
+  return http.request<Res<any>>("post", `/SchoolBusiness/PageList`, {
+    data
+  });
+}
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index 4aea880..a44f29a 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -69,7 +69,12 @@
         <el-button @click="handleReset">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <!-- 操作按钮区域 -->
+    <div style="margin-bottom: 10px">
+      <el-button type="primary" @click="handleAdd">新建</el-button>
+      <el-button type="success" @click="handleImport">批量导入</el-button>
+      <el-button type="info" @click="handleExport">导出</el-button>
+    </div>
     <!-- 表格区域 -->
     <el-table :data="pagedData" border style="width: 100%">
       <el-table-column prop="school" label="学校" min-width="140" />
@@ -126,7 +131,8 @@
 </template>
 <!-- 赴校信息管理菜单 -->
 <script setup lang="ts" name="Toschoolinfomanage">
-import { ref, reactive, computed } from "vue";
+import { getenum, getPageList } from "@/api/toschoolinfomanage";
+import { ref, reactive, computed, onMounted } from "vue";
 import dayjs from "dayjs";
 import { ElMessage } from "element-plus";
 
@@ -142,12 +148,29 @@ interface TableItem {
   lastTime: string; // YYYY-MM-DD
 }
 
-const schoolOptions = [
+const schoolOptions = ref([
   { label: "第一中学", value: "第一中学" },
   { label: "第二中学", value: "第二中学" },
   { label: "实验中学", value: "实验中学" },
   { label: "外国语学校", value: "外国语学校" }
-];
+]);
+
+onMounted(() => {
+  getenum({ TextName: "Name", ValueName: "Id" }).then(res => {
+    if (res.code === 200) {
+      schoolOptions.value = res.data.map(i => ({
+        label: i.text,
+        value: i.value
+      }));
+    }
+  });
+  getPageList({
+    orderBy: "string",
+    // orderByType: 0,
+    pageIndex: 1,
+    pageSize: 10
+  });
+});
 
 const gradeOptions = [
   { label: "高一", value: "高一" },
@@ -185,7 +208,8 @@ function createMockList(len = 87): TableItem[] {
   const peoplePool = ["张三", "李四", "王五", "赵六", "陈七", "刘八", "黄九"];
   const list: TableItem[] = [];
   for (let i = 1; i <= len; i++) {
-    const school = schoolOptions[rand(0, schoolOptions.length - 1)].value;
+    const school =
+      schoolOptions.value[rand(0, schoolOptions.value.length - 1)].value;
     const grade = gradeOptions[rand(0, gradeOptions.length - 1)].value;
     const times = randomDate("2024-01-01", "2025-12-31");
     const lastTime = dayjs(times).add(rand(0, 120), "day").format("YYYY-MM-DD");
@@ -260,18 +284,25 @@ function handleSizeChange(s: number) {
 }
 
 function onDelete(row: TableItem) {
-  console.log(`删除：${row.school} - ${row.people}`);
-  ElMessage.success(`已删除：${row.school} - ${row.people}`);
+  console.log(`删除`);
 }
 
 function onDetail(row: TableItem) {
-  console.log(`详情：${row.school} - ${row.people}`);
-  ElMessage.info(`详情：${row.school} - ${row.people}`);
+  console.log(`详情`);
 }
 
 function onFollow(row: TableItem) {
-  console.log(`跟进：${row.school} - ${row.people}`);
-  ElMessage.success(`跟进：${row.school} - ${row.people}`);
+  console.log(`跟进`);
+}
+
+function handleAdd() {
+  console.log("新建");
+}
+function handleImport() {
+  console.log("批量导入");
+}
+function handleExport() {
+  console.log("导出");
 }
 </script>
 

From 4b06c403a7fcf6bc80ac2e61ebd3df8b0d87a0ee Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Fri, 15 Aug 2025 15:18:25 +0800
Subject: [PATCH 3/8] feat: save code

---
 src/components/hTable/index.vue | 46 +++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue
index 3f7d273..9ad6ee4 100644
--- a/src/components/hTable/index.vue
+++ b/src/components/hTable/index.vue
@@ -20,6 +20,9 @@ import { Dialog, TableColumn, TableConfig } from "./hTable";
 import hTableEdit from "./hTableEdit.vue";
 import { hTableAPI } from "@/api/hTable";
 import { getenum } from "@/api/enum";
+//按钮权限
+import { hasPerms } from "@/utils/auth";
+
 const props = defineProps({
   //** 传入的表单数据 */
   Row: {
@@ -278,7 +281,7 @@ function handleReloadPaged(reload = true) {
       data.ConditionalType = "Like";
     }
     data.FieldName = name.charAt(0).toUpperCase() + name.slice(1);
-    data.FieldValue = table.value.column[name].value;
+    data.FieldValue = table.value.column[name].value.toString();
 
     if (table.value.column[name].searchType != undefined) {
       data.ConditionalType = table.value.column[name].searchType || 0;
@@ -300,11 +303,10 @@ async function fetchInitData() {
     const element = table.value.column[key];
     if (element.type === "dropdown") {
       if (!element.setting.datasource) {
-        // 存在值就不处理
-
-        let rdata = await eval(element.setting.datasourceStr);
-        element.setting.datasource = rdata.data;
-        console.log(key + " " + element.setting.datasourceStr, rdata);
+        // 不安全取消 存在值就不处理
+        // let rdata = await eval(element.setting.datasourceStr);
+        // element.setting.datasource = rdata.data;
+        // console.log(key + " " + element.setting.datasourceStr, rdata);
       }
     }
     if (
@@ -380,9 +382,9 @@ function fetchPagedData() {
           <el-date-picker
             v-if="o.type.trim() == 'datetime'"
             v-model="o.value as Date"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
             type="date"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
             :placeholder="o.label"
             style="width: 100%"
           />
@@ -397,7 +399,7 @@ function fetchPagedData() {
           >
             <el-option
               v-for="item in o.setting.datasource"
-              :key="item.Value"
+              :key="item.value"
               autocomplete="off"
               :label="item[o.setting.maplabel]"
               :value="item[o.setting.mapValue]"
@@ -464,7 +466,9 @@ function fetchPagedData() {
     <div v-if="table.operationTop" class="toolbar-container">
       <!-- 头部按钮组 -->
       <el-button
-        v-for="(e, i) in table.operationColumnData.filter(s => s.topBtn)"
+        v-for="(e, i) in table.operationColumnData.filter(
+          s => s.topBtn && hasPerms(s.perms)
+        )"
         v-show="execute(e['show'], {}, e)"
         :key="i"
         :type="e.btnStyle || 'info'"
@@ -495,7 +499,9 @@ function fetchPagedData() {
         <template v-slot="scope">
           <div class="columnTemplate">
             <el-button
-              v-for="(e, i) in table.operationColumnData.filter(s => !s.topBtn)"
+              v-for="(e, i) in table.operationColumnData.filter(
+                s => !s.topBtn && hasPerms(s.perms)
+              )"
               v-show="execute(e['show'], scope, e)"
               :key="i"
               class="btn"
@@ -571,26 +577,28 @@ function fetchPagedData() {
 .columnTemplate .btn {
   margin-left: 0 !important;
 }
+
 .columnTemplate {
   display: flex;
+  flex-direction: row;
+  flex-flow: row wrap;
   gap: 5px;
+  place-content: flex-start flex-start;
+  align-items: center;
   -webkit-box-orient: horizontal;
   -webkit-box-direction: normal;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: flex-start;
-  align-content: flex-start;
 }
+
 .sty .tab_tip {
-  white-space: nowrap;
-  text-overflow: ellipsis;
   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
+
 .toolbar-container {
   padding-bottom: 5px;
 }
+
 .maxWidth600px {
   max-width: 600px;
 }

From 9d647f8645ee3ca5e2f328a6b7f154496005a68f Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Fri, 15 Aug 2025 16:41:42 +0800
Subject: [PATCH 4/8] feat: save code1

---
 src/api/toschoolinfomanage.ts             |   2 +-
 src/views/toschoolinfomanage/addModal.vue | 354 ++++++++++++++++++++++
 src/views/toschoolinfomanage/index.vue    | 144 ++++-----
 3 files changed, 428 insertions(+), 72 deletions(-)
 create mode 100644 src/views/toschoolinfomanage/addModal.vue

diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts
index 8d48758..1806bf9 100644
--- a/src/api/toschoolinfomanage.ts
+++ b/src/api/toschoolinfomanage.ts
@@ -17,7 +17,7 @@ export function getenum(data) {
  * @return {object}
  */
 export function getPageList(data) {
-  return http.request<Res<any>>("post", `/SchoolBusiness/PageList`, {
+  return http.request<Res<any>>("post", `/SchoolBusiness/QueryPageList`, {
     data
   });
 }
diff --git a/src/views/toschoolinfomanage/addModal.vue b/src/views/toschoolinfomanage/addModal.vue
new file mode 100644
index 0000000..cd211da
--- /dev/null
+++ b/src/views/toschoolinfomanage/addModal.vue
@@ -0,0 +1,354 @@
+<!-- 新建赴校信息 -->
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="新建赴校信息"
+    width="800px"
+    align-center
+  >
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+      <el-divider>基础信息</el-divider>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <el-form-item label="学校" prop="baseInfo.school">
+            <el-select
+              v-model="form.baseInfo.school"
+              placeholder="请选择学校"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="s in schoolOptions"
+                :key="s.value"
+                :label="s.label"
+                :value="s.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="年级" prop="baseInfo.grade">
+            <el-select
+              v-model="form.baseInfo.grade"
+              placeholder="请选择年级"
+              clearable
+            >
+              <el-option
+                v-for="g in gradeOptions"
+                :key="g.value"
+                :label="g.label"
+                :value="g.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="赴校时间" prop="baseInfo.date">
+            <el-date-picker
+              v-model="form.baseInfo.date"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择日期"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="赴校人员" prop="baseInfo.people">
+            <el-input
+              v-model="form.baseInfo.people"
+              placeholder="请输入人员姓名，逗号分隔"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>基础工作</el-divider>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <el-form-item label="开展座谈" prop="work.talk">
+            <el-radio-group v-model="form.work.talk">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="座谈情况">
+            <el-input
+              v-model="form.work.talkDetail"
+              :disabled="!form.work.talk"
+              placeholder="请输入座谈情况"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开展班会" prop="work.classMeeting">
+            <el-radio-group v-model="form.work.classMeeting">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="班会情况">
+            <el-input
+              v-model="form.work.classMeetingDetail"
+              :disabled="!form.work.classMeeting"
+              placeholder="请输入班会情况"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>反馈问题</el-divider>
+      <div style="height: 370px; overflow-y: auto">
+        <div
+          v-for="group in feedbackGroups"
+          :key="group.key"
+          class="feedback-group"
+        >
+          <div class="feedback-header">
+            <span class="group-title">{{ group.name }}</span>
+            <el-button type="primary" link @click="addProblem(group.key)"
+              >添加问题</el-button
+            >
+          </div>
+          <div
+            v-if="form.feedback[group.key].length === 0"
+            class="feedback-empty"
+          >
+            暂无问题
+          </div>
+          <div
+            v-for="(item, idx) in form.feedback[group.key]"
+            :key="item.id"
+            class="feedback-item"
+          >
+            <el-input
+              v-model="item.text"
+              :placeholder="`请输入${group.name}问题描述`"
+            />
+            <el-button type="danger" text @click="removeProblem(group.key, idx)"
+              >删除</el-button
+            >
+          </div>
+          <el-divider />
+        </div>
+      </div>
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="onCancel">取 消</el-button>
+        <el-button type="primary" :loading="submitting" @click="onSubmit"
+          >确 定</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="AddModal">
+import { ref, reactive, computed } from "vue";
+import type { FormInstance, FormRules } from "element-plus";
+import { ElMessage } from "element-plus";
+
+const props = defineProps<{ visible: boolean }>();
+const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>();
+const dialogVisible = computed({
+  get: () => props.visible,
+  set: v => emit("update:visible", v)
+});
+
+const formRef = ref<FormInstance>();
+function uid() {
+  return Math.random().toString(36).slice(2) + Date.now().toString(36);
+}
+
+const schoolOptions = ref([
+  { label: "第一中学", value: "第一中学" },
+  { label: "第二中学", value: "第二中学" },
+  { label: "实验中学", value: "实验中学" },
+  { label: "外国语学校", value: "外国语学校" }
+]);
+const gradeOptions = [
+  { label: "高一", value: "高一" },
+  { label: "高二", value: "高二" },
+  { label: "高三", value: "高三" },
+  { label: "初三", value: "初三" }
+];
+
+type FeedbackKey =
+  | "leaders"
+  | "classroom"
+  | "equipment"
+  | "students"
+  | "others";
+interface FeedbackItem {
+  id: string;
+  text: string;
+}
+interface FormModel {
+  baseInfo: {
+    school?: string;
+    grade?: string;
+    date?: string;
+    people: string;
+  };
+  work: {
+    talk: boolean;
+    talkDetail: string;
+    classMeeting: boolean;
+    classMeetingDetail: string;
+  };
+  feedback: Record<FeedbackKey, FeedbackItem[]>;
+}
+
+const form = reactive<FormModel>({
+  baseInfo: {
+    school: undefined,
+    grade: undefined,
+    date: undefined,
+    people: ""
+  },
+  work: {
+    talk: false,
+    talkDetail: "",
+    classMeeting: false,
+    classMeetingDetail: ""
+  },
+  feedback: {
+    leaders: [],
+    classroom: [],
+    equipment: [],
+    students: [],
+    others: []
+  }
+});
+
+const rules: FormRules = {
+  "baseInfo.school": [
+    { required: true, message: "请选择学校", trigger: "change" }
+  ],
+  "baseInfo.grade": [
+    { required: true, message: "请选择年级", trigger: "change" }
+  ],
+  "baseInfo.date": [
+    { required: true, message: "请选择赴校时间", trigger: "change" }
+  ],
+  "baseInfo.people": [
+    { required: true, message: "请输入赴校人员", trigger: "blur" }
+  ]
+};
+
+const feedbackGroups = [
+  { key: "leaders", name: "学校领导班子" },
+  { key: "classroom", name: "双师课堂" },
+  { key: "equipment", name: "设备" },
+  { key: "students", name: "学生" },
+  { key: "others", name: "其他" }
+] as { key: FeedbackKey; name: string }[];
+
+function addProblem(key: FeedbackKey) {
+  form.feedback[key].push({ id: uid(), text: "" });
+}
+
+function removeProblem(key: FeedbackKey, index: number) {
+  form.feedback[key].splice(index, 1);
+}
+
+// 新增：反馈问题非空校验
+const feedbackGroupNameMap: Record<FeedbackKey, string> = {
+  leaders: "学校领导班子",
+  classroom: "双师课堂",
+  equipment: "设备",
+  students: "学生",
+  others: "其他"
+};
+function validateFeedbackNotEmpty() {
+  for (const g of feedbackGroups) {
+    const items = form.feedback[g.key] || [];
+    if (items.length === 0) continue; // 允许为 0
+    for (const it of items) {
+      if (!it.text || !it.text.trim()) {
+        ElMessage.error(`${feedbackGroupNameMap[g.key]} 的问题内容不能为空`);
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+const submitting = ref(false);
+
+function onCancel() {
+  dialogVisible.value = false;
+}
+
+async function onSubmit() {
+  if (!formRef.value) return;
+  await formRef.value.validate(valid => {
+    if (!valid) return;
+    // 新增：校验反馈问题不为空
+    if (!validateFeedbackNotEmpty()) return;
+    submitting.value = true;
+    setTimeout(() => {
+      submitting.value = false;
+      console.log("Submit payload:", JSON.parse(JSON.stringify(form)));
+      ElMessage.success("提交成功（已使用假数据）");
+      dialogVisible.value = false;
+      resetForm();
+    }, 600);
+  });
+}
+
+function resetForm() {
+  form.baseInfo.school = undefined;
+  form.baseInfo.grade = undefined;
+  form.baseInfo.date = undefined;
+  form.baseInfo.people = "";
+  form.work.talk = false;
+  form.work.talkDetail = "";
+  form.work.classMeeting = false;
+  form.work.classMeetingDetail = "";
+  (Object.keys(form.feedback) as FeedbackKey[]).forEach(k => {
+    form.feedback[k] = [];
+  });
+}
+</script>
+
+<style scoped lang="scss">
+.feedback-group {
+  margin-bottom: 8px;
+}
+
+.feedback-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 6px 0;
+}
+
+.group-title {
+  font-weight: 600;
+}
+
+.feedback-item {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  margin-bottom: 6px;
+}
+
+.feedback-empty {
+  margin: 4px 0 8px;
+  font-size: 13px;
+  color: #999;
+}
+
+:deep(.el-dialog__body) {
+  max-height: 70vh;
+  overflow-y: auto;
+}
+</style>
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index a44f29a..f4ddc9c 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px">
     <!-- 搜索区域 -->
     <el-form :model="query" inline label-width="80px" class="search-form">
       <el-form-item label="学校">
@@ -76,7 +76,7 @@
       <el-button type="info" @click="handleExport">导出</el-button>
     </div>
     <!-- 表格区域 -->
-    <el-table :data="pagedData" border style="width: 100%">
+    <el-table :data="listData" border style="width: 100%">
       <el-table-column prop="school" label="学校" min-width="140" />
       <el-table-column prop="grade" label="年级" min-width="100" />
       <el-table-column prop="people" label="赴校人员" min-width="120" />
@@ -119,7 +119,7 @@
       <el-pagination
         background
         layout="total, sizes, prev, pager, next, jumper"
-        :total="filteredList.length"
+        :total="total"
         :current-page="page"
         :page-size="pageSize"
         :page-sizes="[10, 20, 50, 100]"
@@ -128,6 +128,7 @@
       />
     </div>
   </div>
+  <AddModal v-model:visible="isShowAddModal" />
 </template>
 <!-- 赴校信息管理菜单 -->
 <script setup lang="ts" name="Toschoolinfomanage">
@@ -135,7 +136,7 @@ import { getenum, getPageList } from "@/api/toschoolinfomanage";
 import { ref, reactive, computed, onMounted } from "vue";
 import dayjs from "dayjs";
 import { ElMessage } from "element-plus";
-
+import AddModal from "./addModal.vue";
 interface TableItem {
   id: number;
   school: string;
@@ -154,7 +155,7 @@ const schoolOptions = ref([
   { label: "实验中学", value: "实验中学" },
   { label: "外国语学校", value: "外国语学校" }
 ]);
-
+const isShowAddModal = ref(false);
 onMounted(() => {
   getenum({ TextName: "Name", ValueName: "Id" }).then(res => {
     if (res.code === 200) {
@@ -164,12 +165,7 @@ onMounted(() => {
       }));
     }
   });
-  getPageList({
-    orderBy: "string",
-    // orderByType: 0,
-    pageIndex: 1,
-    pageSize: 10
-  });
+  loadList();
 });
 
 const gradeOptions = [
@@ -187,11 +183,69 @@ const query = reactive({
   times: [] as string[]
 });
 
-// 点击查询后生效的条件，避免输入框每次输入都触发筛选
-const appliedQuery = ref({ ...query });
-
 const page = ref(1);
 const pageSize = ref(10);
+const total = ref(0);
+const listData = ref<TableItem[]>([]);
+
+function mapApiItemToRow(item: any): TableItem {
+  const peopleArr = Array.isArray(item.schoolBusinessUser)
+    ? item.schoolBusinessUser
+    : [];
+  const start = item.startTime
+    ? dayjs(item.startTime).format("YYYY-MM-DD")
+    : "";
+  let last = start;
+  const rec = item.solutionRecord?.record || [];
+  if (Array.isArray(rec) && rec.length > 0) {
+    const maxTs = rec
+      .map((r: any) => r.executionTime)
+      .filter(Boolean)
+      .map((t: string) => dayjs(t).valueOf())
+      .reduce((a: number, b: number) => Math.max(a, b), 0);
+    if (maxTs) last = dayjs(maxTs).format("YYYY-MM-DD");
+  }
+  return {
+    id: item.id,
+    school: item.schoolName || "",
+    grade: item.grade || "",
+    people: peopleArr.join("，"),
+    times: start,
+    feedbackTotals: Number(item.feedbackCount) || 0,
+    solveTotals: Number(item.solveFeedbackCount) || 0,
+    status: item.solutionEnd ? 1 : 2,
+    lastTime: last
+  };
+}
+
+async function loadList() {
+  const payload: any = {
+    pageIndex: page.value,
+    pageSize: pageSize.value,
+    orderBy: "startTime"
+  };
+  if (query.school) payload.schoolId = query.school;
+  if (query.grade) payload.grade = query.grade;
+  if (query.people) payload.people = query.people.trim();
+  if (typeof query.status !== "undefined")
+    payload.solutionEnd = query.status === 1;
+  if (Array.isArray(query.times) && query.times.length === 2) {
+    payload.startTimeBegin = query.times[0];
+    payload.startTimeEnd = query.times[1];
+  }
+  try {
+    const res = await getPageList(payload);
+    if (res.code === 200) {
+      const rows = Array.isArray(res.data?.data) ? res.data.data : [];
+      listData.value = rows.map(mapApiItemToRow);
+      total.value = Number(res.data?.total) || rows.length;
+    } else {
+      ElMessage.error(res.message || "加载失败");
+    }
+  } catch (e) {
+    ElMessage.error("列表加载失败");
+  }
+}
 
 function rand(min: number, max: number) {
   return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -204,64 +258,9 @@ function randomDate(start: string, end: string) {
   return dayjs(v).format("YYYY-MM-DD");
 }
 
-function createMockList(len = 87): TableItem[] {
-  const peoplePool = ["张三", "李四", "王五", "赵六", "陈七", "刘八", "黄九"];
-  const list: TableItem[] = [];
-  for (let i = 1; i <= len; i++) {
-    const school =
-      schoolOptions.value[rand(0, schoolOptions.value.length - 1)].value;
-    const grade = gradeOptions[rand(0, gradeOptions.length - 1)].value;
-    const times = randomDate("2024-01-01", "2025-12-31");
-    const lastTime = dayjs(times).add(rand(0, 120), "day").format("YYYY-MM-DD");
-    const feedbackTotals = rand(0, 20);
-    const solveTotals = rand(0, feedbackTotals);
-    const status = rand(1, 2) as 1 | 2;
-    list.push({
-      id: i,
-      school,
-      grade,
-      people: peoplePool[rand(0, peoplePool.length - 1)],
-      times,
-      feedbackTotals,
-      solveTotals,
-      status,
-      lastTime
-    });
-  }
-  return list;
-}
-
-const allData = ref<TableItem[]>(createMockList());
-
-const filteredList = computed(() => {
-  const q = appliedQuery.value;
-  return allData.value.filter(item => {
-    const matchSchool = q.school ? item.school === q.school : true;
-    const matchGrade = q.grade ? item.grade === q.grade : true;
-    const matchPeople = q.people ? item.people.includes(q.people.trim()) : true;
-    const matchStatus = q.status ? item.status === q.status : true;
-    let matchTimes = true;
-    if (Array.isArray(q.times) && q.times.length === 2) {
-      const [start, end] = q.times;
-      const d = dayjs(item.times);
-      matchTimes =
-        d.isAfter(dayjs(start).subtract(1, "day")) &&
-        d.isBefore(dayjs(end).add(1, "day"));
-    }
-    return (
-      matchSchool && matchGrade && matchPeople && matchStatus && matchTimes
-    );
-  });
-});
-
-const pagedData = computed(() => {
-  const start = (page.value - 1) * pageSize.value;
-  return filteredList.value.slice(start, start + pageSize.value);
-});
-
 function handleSearch() {
-  appliedQuery.value = { ...query } as any;
   page.value = 1;
+  loadList();
 }
 
 function handleReset() {
@@ -270,17 +269,19 @@ function handleReset() {
   query.people = "";
   query.status = undefined;
   query.times = [];
-  appliedQuery.value = { ...query } as any;
   page.value = 1;
+  loadList();
 }
 
 function handlePageChange(p: number) {
   page.value = p;
+  loadList();
 }
 
 function handleSizeChange(s: number) {
   pageSize.value = s;
   page.value = 1;
+  loadList();
 }
 
 function onDelete(row: TableItem) {
@@ -297,6 +298,7 @@ function onFollow(row: TableItem) {
 
 function handleAdd() {
   console.log("新建");
+  isShowAddModal.value = true;
 }
 function handleImport() {
   console.log("批量导入");

From 3aaebcb3cf4b6e1cc8dff10aa01e82b2b50f255f Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Mon, 18 Aug 2025 18:03:15 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E8=B5=B4?=
 =?UTF-8?q?=E6=A0=A1=E4=BF=A1=E6=81=AF=E5=BC=80=E5=8F=91=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/toschoolinfomanage.ts          | 32 ++++++++-
 src/views/toschoolinfomanage/index.vue | 89 ++++++++++++++++++++++++--
 2 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts
index 1806bf9..af81b17 100644
--- a/src/api/toschoolinfomanage.ts
+++ b/src/api/toschoolinfomanage.ts
@@ -6,8 +6,8 @@ import type { Res } from "@/utils/http/types";
  * @param {string} type 枚举类型 type=StatusEnum
  * @return {object}
  */
-export function getenum(data) {
-  return http.request<Res<any>>("post", `/back/schools/QueryCombo`, {
+export function getenumApi(data) {
+  return http.request<Res<any>>("post", `/SchoolBusiness/QueryCombo`, {
     data
   });
 }
@@ -16,8 +16,34 @@ export function getenum(data) {
  * @param {string} type 枚举类型 type=StatusEnum
  * @return {object}
  */
-export function getPageList(data) {
+export function getPageListApi(data) {
   return http.request<Res<any>>("post", `/SchoolBusiness/QueryPageList`, {
     data
   });
 }
+/**
+ * @description 新增赴校信息或者编辑 id:0(新增)，其他（编辑）
+ * @return {object}
+ */
+export function addOrEditApi(data: any) {
+  return http.request<Res<any>>("post", `/SchoolBusiness/Edit`, {
+    data
+  });
+}
+/**
+ * @description 获取赴校信息详情
+ * @param {string} type 枚举类型 type=StatusEnum
+ * @return {object}
+ */
+export function getSchoolBusinessDetailApi(id: string | number) {
+  return http.request<Res<any>>("get", `/SchoolBusiness/${id}`);
+}
+/**
+ * @description 删除赴校信息
+ * @return {object}
+ */
+export function deleteSchoolBusinessApi(data: Array<string | number>) {
+  return http.request<Res<any>>("post", `/SchoolBusiness/Del`, {
+    data
+  });
+}
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index f4ddc9c..354d55f 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -98,7 +98,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="lastTime" label="最后跟进时间" min-width="160" />
+      <!-- <el-table-column prop="lastTime" label="最后跟进时间" min-width="160" /> -->
       <el-table-column label="操作" fixed="right" min-width="220">
         <template #default="{ row }">
           <el-button size="small" type="danger" plain @click="onDelete(row)"
@@ -132,11 +132,18 @@
 </template>
 <!-- 赴校信息管理菜单 -->
 <script setup lang="ts" name="Toschoolinfomanage">
-import { getenum, getPageList } from "@/api/toschoolinfomanage";
+import {
+  addOrEditApi,
+  getenumApi,
+  getPageListApi,
+  getSchoolBusinessDetailApi,
+  deleteSchoolBusinessApi
+} from "@/api/toschoolinfomanage";
 import { ref, reactive, computed, onMounted } from "vue";
 import dayjs from "dayjs";
 import { ElMessage } from "element-plus";
 import AddModal from "./addModal.vue";
+import { message } from "@/utils/message";
 interface TableItem {
   id: number;
   school: string;
@@ -157,7 +164,7 @@ const schoolOptions = ref([
 ]);
 const isShowAddModal = ref(false);
 onMounted(() => {
-  getenum({ TextName: "Name", ValueName: "Id" }).then(res => {
+  getenumApi({ TextName: "Name", ValueName: "Id" }).then(res => {
     if (res.code === 200) {
       schoolOptions.value = res.data.map(i => ({
         label: i.text,
@@ -165,6 +172,7 @@ onMounted(() => {
       }));
     }
   });
+  // addOrEdit();
   loadList();
 });
 
@@ -174,6 +182,60 @@ const gradeOptions = [
   { label: "高三", value: "高三" },
   { label: "初三", value: "初三" }
 ];
+/**
+ * 新建赴校信息提交
+ */
+const addOrEdit = () => {
+  addOrEditApi(
+    addOrEditApi({
+      id: 0,
+      schoolId: 708490619039814,
+      schoolName: "重庆测试学校",
+      grade: "初二",
+      schoolBusinessUser: ["向波4"],
+      startTime: "2025-08-20T07:28:38",
+      // remark: "string",
+      feedbackQuestions: [
+        {
+          endTime: null,
+          question: "xb测试反馈问题1（双师课堂）",
+          questionType: 10,
+          solution: "xb测试反馈问题1建议",
+          sort: "1"
+        }
+        // {
+        //   endTime: null,
+        //   question: "xb测试反馈问题2（设备）",
+        //   questionType: 15,
+        //   solution: "xb测试反馈问题2建议",
+        //   sort: "2"
+        // },
+        // {
+        //   endTime: null,
+        //   question: "xb测试反馈问题2（学生）",
+        //   questionType: 20,
+        //   solution: "xb测试反馈问题3建议",
+        //   sort: "3"
+        // }
+      ],
+      // solutionRecord: {
+      //   solution: "string",
+      //   endRecord: "string",
+      //   record: [
+      //     {
+      //       executionRecords: "string",
+      //       executionTime: "2025-08-18T08:31:52.716Z"
+      //     }
+      //   ]
+      // },
+      // solutionEnd: true,
+      isDiscussion: false,
+      discussion: "开展座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈",
+      isClassMeeting: false,
+      classMeeting: "班会情况班会情况班会情况班会情况班会情况班会情况班会情况"
+    })
+  );
+};
 
 const query = reactive({
   school: "" as string | undefined,
@@ -234,7 +296,7 @@ async function loadList() {
     payload.startTimeEnd = query.times[1];
   }
   try {
-    const res = await getPageList(payload);
+    const res = await getPageListApi(payload);
     if (res.code === 200) {
       const rows = Array.isArray(res.data?.data) ? res.data.data : [];
       listData.value = rows.map(mapApiItemToRow);
@@ -285,11 +347,24 @@ function handleSizeChange(s: number) {
 }
 
 function onDelete(row: TableItem) {
-  console.log(`删除`);
+  console.log(`删除`, row);
+  deleteSchoolBusinessApi([row.id]).then(res => {
+    if (res.code === 200) {
+      message("删除成功", { type: "success" });
+      loadList();
+    }
+  });
 }
-
+/**
+ * 获取详情
+ * @param row
+ */
 function onDetail(row: TableItem) {
-  console.log(`详情`);
+  getSchoolBusinessDetailApi(row.id).then(res => {
+    if (res.code === 200) {
+      console.log("详情信息", res.data);
+    }
+  });
 }
 
 function onFollow(row: TableItem) {

From 73bd653e9dd0fc193d493628e2245cba3684d127 Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Tue, 19 Aug 2025 18:24:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E8=B7=9F=E8=BF=9B=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/toschoolinfomanage.ts              |   9 +
 src/views/toschoolinfomanage/addModal.vue  | 224 ++++++++++++++++++---
 src/views/toschoolinfomanage/editModal.vue | 224 +++++++++++++++++++++
 src/views/toschoolinfomanage/index.vue     | 212 +++++++++++--------
 4 files changed, 556 insertions(+), 113 deletions(-)
 create mode 100644 src/views/toschoolinfomanage/editModal.vue

diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts
index af81b17..7ff18ec 100644
--- a/src/api/toschoolinfomanage.ts
+++ b/src/api/toschoolinfomanage.ts
@@ -47,3 +47,12 @@ export function deleteSchoolBusinessApi(data: Array<string | number>) {
     data
   });
 }
+/**
+ * @description 获取赴校人员下拉数据
+ * @return {object}
+ */
+export function getSchoolBusinessPeopleListApi(data: object) {
+  return http.request<Res<any>>("post", `/Admin/QueryCombo`, {
+    data
+  });
+}
\ No newline at end of file
diff --git a/src/views/toschoolinfomanage/addModal.vue b/src/views/toschoolinfomanage/addModal.vue
index cd211da..ef9f9c7 100644
--- a/src/views/toschoolinfomanage/addModal.vue
+++ b/src/views/toschoolinfomanage/addModal.vue
@@ -4,6 +4,7 @@
     v-model="dialogVisible"
     title="新建赴校信息"
     width="800px"
+    @close="onCancel"
     align-center
   >
     <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
@@ -55,10 +56,21 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="赴校人员" prop="baseInfo.people">
-            <el-input
+            <el-select
               v-model="form.baseInfo.people"
-              placeholder="请输入人员姓名，逗号分隔"
-            />
+              placeholder="请选择赴校人员"
+              clearable
+              multiple
+              filterable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="p in peopleOptions"
+                :key="p.value"
+                :label="p.text"
+                :value="p.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -150,12 +162,20 @@
 </template>
 
 <script setup lang="ts" name="AddModal">
-import { ref, reactive, computed } from "vue";
+import { ref, reactive, computed, defineProps, defineEmits, watch } from "vue";
 import type { FormInstance, FormRules } from "element-plus";
 import { ElMessage } from "element-plus";
-
+import { getSchoolData } from "@/api/userCenter";
+import {
+  getSchoolBusinessPeopleListApi,
+  addOrEditApi
+} from "@/api/toschoolinfomanage";
 const props = defineProps<{ visible: boolean }>();
-const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>();
+// const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>();
+const emit = defineEmits<{
+  (e: "update:visible", value: boolean): void;
+  (e: "handleReset"): void;
+}>();
 const dialogVisible = computed({
   get: () => props.visible,
   set: v => emit("update:visible", v)
@@ -166,17 +186,40 @@ function uid() {
   return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }
 
-const schoolOptions = ref([
-  { label: "第一中学", value: "第一中学" },
-  { label: "第二中学", value: "第二中学" },
-  { label: "实验中学", value: "实验中学" },
-  { label: "外国语学校", value: "外国语学校" }
-]);
+const schoolOptions = ref([]);
+const peopleOptions = ref([]);
+const getSchoolDataFn = () => {
+  getSchoolData().then(res => {
+    if (res.code == 200) {
+      schoolOptions.value = res.data.map((i: any) => ({
+        label: i.text,
+        value: i.value
+      }));
+    }
+  });
+};
+/**
+ * 获取赴校人员下拉数据
+ */
+const getSchoolBusinessPeopleList = () => {
+  getSchoolBusinessPeopleListApi({}).then((res: any) => {
+    if (res.code == 200) {
+      peopleOptions.value = (res.data || []).map(i => ({
+        label: i.text,
+        value: i.text
+      }));
+    }
+  });
+};
+getSchoolDataFn();
+getSchoolBusinessPeopleList();
 const gradeOptions = [
+  { label: "初一", value: "初一" },
+  { label: "初二", value: "初二" },
+  { label: "初三", value: "初三" },
   { label: "高一", value: "高一" },
   { label: "高二", value: "高二" },
-  { label: "高三", value: "高三" },
-  { label: "初三", value: "初三" }
+  { label: "高三", value: "高三" }
 ];
 
 type FeedbackKey =
@@ -194,7 +237,7 @@ interface FormModel {
     school?: string;
     grade?: string;
     date?: string;
-    people: string;
+    people: string[];
   };
   work: {
     talk: boolean;
@@ -210,7 +253,7 @@ const form = reactive<FormModel>({
     school: undefined,
     grade: undefined,
     date: undefined,
-    people: ""
+    people: []
   },
   work: {
     talk: false,
@@ -226,7 +269,18 @@ const form = reactive<FormModel>({
     others: []
   }
 });
-
+watch(
+  () => form.work.talk,
+  val => {
+    !val ? (form.work.talkDetail = "") : "";
+  }
+);
+watch(
+  () => form.work.classMeeting,
+  val => {
+    !val ? (form.work.classMeetingDetail = "") : "";
+  }
+);
 const rules: FormRules = {
   "baseInfo.school": [
     { required: true, message: "请选择学校", trigger: "change" }
@@ -238,7 +292,13 @@ const rules: FormRules = {
     { required: true, message: "请选择赴校时间", trigger: "change" }
   ],
   "baseInfo.people": [
-    { required: true, message: "请输入赴校人员", trigger: "blur" }
+    { required: true, message: "请选择赴校人员", trigger: "change" },
+    {
+      type: "array",
+      min: 1,
+      message: "请至少选择一名赴校人员",
+      trigger: "change"
+    }
   ]
 };
 
@@ -284,8 +344,86 @@ const submitting = ref(false);
 
 function onCancel() {
   dialogVisible.value = false;
+  formRef.value.resetFields();
 }
+/**
+ * 把表单数据处理成接口需要的结构
+ * @param data
+ */
+const handleFeedback = (data: any) => {
+  const processData = (items: any[], questionType: number) => {
+    return items.map((item, idx) => ({
+      question: item.text,
+      questionType,
+      sort: (idx + 1).toString()
+    }));
+  };
 
+  let handledData = [];
+
+  if (data.leaders.length > 0)
+    handledData.push(...processData(data.leaders, 1));
+  if (data.classroom.length > 0)
+    handledData.push(...processData(data.classroom, 10));
+  if (data.equipment.length > 0)
+    handledData.push(...processData(data.equipment, 15));
+  if (data.students.length > 0)
+    handledData.push(...processData(data.students, 20));
+  if (data.others.length > 0)
+    handledData.push(...processData(data.others, 999));
+
+  return handledData;
+};
+let editParams = {
+  id: 0,
+  schoolId: 0,
+  schoolName: "string",
+  grade: "string",
+  gradeYear: 0,
+  gradeLevel: "string",
+  // 赴校人员
+  schoolBusinessUser: ["string"],
+  // 赴校时间
+  startTime: "2025-08-19T07:20:29.292Z",
+  // 备注
+  remark: "string",
+  // 反馈问题
+  feedbackQuestions: [
+    {
+      // 问题类型
+      questionType: 1,
+      // 排序
+      sort: "string",
+      // 问题描述
+      question: "string",
+      // 解决情况
+      solution: "string",
+      // 解决时间
+      endTime: "2025-08-19T07:20:29.292Z"
+    }
+  ],
+  // 解决方案记录
+  solutionRecord: {
+    // 解决方案
+    solution: "string",
+    // 完结情况
+    endRecord: "string",
+    // 完结时间
+    endRecordTime: "string",
+    record: [
+      {
+        // 执行记录
+        executionRecords: "string",
+        // 执行时间
+        executionTime: "2025-08-19T07:20:29.292Z"
+      }
+    ]
+  },
+  // 座谈情况
+  discussion: "string",
+  // 班会情况
+  classMeeting: "string"
+};
 async function onSubmit() {
   if (!formRef.value) return;
   await formRef.value.validate(valid => {
@@ -293,13 +431,47 @@ async function onSubmit() {
     // 新增：校验反馈问题不为空
     if (!validateFeedbackNotEmpty()) return;
     submitting.value = true;
-    setTimeout(() => {
-      submitting.value = false;
-      console.log("Submit payload:", JSON.parse(JSON.stringify(form)));
-      ElMessage.success("提交成功（已使用假数据）");
-      dialogVisible.value = false;
-      resetForm();
-    }, 600);
+    console.log("Submit payload:", form);
+    // enum FeedbackQuestionTypeEnum {
+    //   学校领导班子 = 1,
+    //   双师课堂 = 10,
+    //   设备 = 15,
+    //   学生 = 20,
+    //   其他 = 999
+    // }
+    let reqParams = {
+      id: 0, //id传0代表新增
+      schoolId: form.baseInfo.school,
+      schoolName: schoolOptions.value.find(i => i.value == form.baseInfo.school)
+        .label,
+      grade: form.baseInfo.grade,
+      // 固定传空字符串
+      gradeLevel: "",
+      schoolBusinessUser: form.baseInfo.people,
+      startTime: form.baseInfo.date,
+      isDiscussion: form.work.talk,
+      discussion: form.work.talkDetail,
+      isClassMeeting: form.work.classMeeting,
+      classMeeting: form.work.classMeetingDetail,
+      feedbackQuestions: handleFeedback(form.feedback)
+    };
+    // return;
+    console.log("提交数据", reqParams);
+    addOrEditApi(reqParams)
+      .then(res => {
+        if (res.code === 200) {
+          ElMessage.success("提交成功");
+          dialogVisible.value = false;
+          resetForm();
+          formRef.value.resetFields();
+          emit("handleReset");
+        }
+      })
+      .finally(() => {
+        submitting.value = false;
+      });
+
+    // }, 600);
   });
 }
 
@@ -307,7 +479,7 @@ function resetForm() {
   form.baseInfo.school = undefined;
   form.baseInfo.grade = undefined;
   form.baseInfo.date = undefined;
-  form.baseInfo.people = "";
+  form.baseInfo.people = [];
   form.work.talk = false;
   form.work.talkDetail = "";
   form.work.classMeeting = false;
diff --git a/src/views/toschoolinfomanage/editModal.vue b/src/views/toschoolinfomanage/editModal.vue
new file mode 100644
index 0000000..c066fd2
--- /dev/null
+++ b/src/views/toschoolinfomanage/editModal.vue
@@ -0,0 +1,224 @@
+<!-- 跟进 -->
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="跟进赴校信息"
+    width="800px"
+    @close="closeModal"
+    align-center
+  >
+    <div class="modal-header">
+      <div class="status-box">
+        <span>当前状态：</span>
+        <el-tag :type="statusType">{{ statusText }}</el-tag>
+      </div>
+      <div class="action-box">
+        <el-button @click="onClickCancel">取消</el-button>
+        <el-button type="primary" @click="onClickSave">保存</el-button>
+      </div>
+    </div>
+
+    <el-divider />
+
+    <el-descriptions title="基础信息" :column="2" border>
+      <el-descriptions-item label="学校">
+        {{ safeDetail.schoolName || safeDetail.school || "-" }}
+      </el-descriptions-item>
+      <el-descriptions-item label="年级">
+        {{ safeDetail.grade || safeDetail.gradeLevel || "-" }}
+      </el-descriptions-item>
+      <el-descriptions-item label="赴校人员">
+        {{
+          Array.isArray(safeDetail.schoolBusinessUser)
+            ? safeDetail.schoolBusinessUser.join("，")
+            : safeDetail.schoolBusinessUser || "-"
+        }}
+      </el-descriptions-item>
+      <el-descriptions-item label="赴校时间">
+        {{ safeDetail.startTime?.split("T")[0] }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-divider />
+
+    <el-descriptions title="基础工作" :column="1" border>
+      <el-descriptions-item label="座谈">
+        <el-tag
+          :type="safeDetail.isDiscussion ? 'success' : 'info'"
+          style="margin-right: 8px"
+        >
+          {{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
+        </el-tag>
+        <span>{{ safeDetail.discussion || "-" }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="班会">
+        <el-tag
+          :type="safeDetail.isClassMeeting ? 'success' : 'info'"
+          style="margin-right: 8px"
+        >
+          {{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
+        </el-tag>
+        <span>{{ safeDetail.classMeeting || "-" }}</span>
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider />
+    <el-descriptions title="反馈问题" :column="1" border> </el-descriptions>
+    <div style="display: flex; gap: 40px; margin-bottom: 5px">
+      <span> 问题总数：{{ safeDetail.feedbackQuestions?.length }} </span>
+      <span>
+        未解决问题：{{ handleUnHandleQust(safeDetail.feedbackQuestions) }}
+      </span>
+    </div>
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane
+        v-for="(i, idx) in sortData(safeDetail.feedbackQuestions)"
+        :key="idx"
+        :label="'问题' + (idx + 1) + (i.solution ? '(已解决)' : '(未解决)')"
+        :name="idx"
+      >
+        <div style="font-size: 12px; margin-bottom: 4px">
+          <span>问题类型：</span> <span>{{ queType[i.questionType] }}</span>
+        </div>
+        <div style="padding: 10px; background-color: #f3f3f3">
+          {{ i.question }}
+        </div>
+        <div v-if="i.solution">
+          <span> 解决情况 </span>
+          <div style="padding: 10px; background-color: #f3f3f3">
+            解决情况描述111111111111111
+          </div>
+        </div>
+        <div
+          v-else
+          style="margin-top: 5px; font-size: 12px"
+          class="markTitle"
+          @click="markTitle"
+        >
+          标记已解决
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+    <el-divider />
+
+    <!-- {{ safeDetail.feedbackQuestions }} -->
+    <!-- .............................................................. -->
+    <el-descriptions title="备注" :column="1" border> </el-descriptions>
+    <el-input
+      v-model="safeDetail.remark"
+      :rows="4"
+      type="textarea"
+      maxlength="1000"
+      :show-word-limit="true"
+    />
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="EditModal">
+import { ref, reactive, computed, defineProps, defineEmits, watch } from "vue";
+import type { FormInstance, FormRules, TabsPaneContext } from "element-plus";
+import { ElMessage } from "element-plus";
+import { getSchoolData } from "@/api/userCenter";
+import {
+  getSchoolBusinessPeopleListApi,
+  addOrEditApi
+} from "@/api/toschoolinfomanage";
+import { setFips } from "crypto";
+
+const activeName = ref(0);
+
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+  console.log(tab, event);
+};
+const props = defineProps<{ visible: boolean; detailData: any }>();
+const emit = defineEmits<{
+  (e: "update:visible", value: boolean): void;
+}>();
+
+const dialogVisible = computed({
+  get: () => props.visible,
+  set: v => emit("update:visible", v)
+});
+
+const closeModal = () => {
+  emit("update:visible", false);
+};
+const queType = {
+  1: "学校领导班子",
+  10: "双师课堂",
+  15: "设备",
+  20: "学生",
+  999: "其他"
+};
+/**
+ * 获取未解决问题数量
+ * @param data
+ */
+const handleUnHandleQust = (data: Array<any>) => {
+  return (data || []).map(i => {
+    // 利用solution为空判断为未解决问题
+    return !i.solution;
+  }).length;
+};
+const sortData = (data: Array<any>) => {
+  const categorizedData = [
+    ...data
+      .filter(item => item.questionType === 1)
+      .sort((a, b) => a.sort.localeCompare(b.sort)),
+    ...data
+      .filter(item => item.questionType === 10)
+      .sort((a, b) => a.sort.localeCompare(b.sort)),
+    ...data
+      .filter(item => item.questionType === 15)
+      .sort((a, b) => a.sort.localeCompare(b.sort)),
+    ...data
+      .filter(item => item.questionType === 20)
+      .sort((a, b) => a.sort.localeCompare(b.sort)),
+    ...data
+      .filter(item => item.questionType === 999)
+      .sort((a, b) => a.sort.localeCompare(b.sort))
+  ];
+  return categorizedData;
+};
+const safeDetail = computed(() => props.detailData || {});
+const statusText = computed(() =>
+  safeDetail.value?.solutionEnd ? "已完结" : "跟进中"
+);
+const statusType = computed(() =>
+  safeDetail.value?.solutionEnd ? "success" : "warning"
+);
+const markTitle = () => {
+  console.log("标记已解决");
+};
+function onClickCancel() {
+  console.log("取消");
+}
+function onClickSave() {
+  console.log("保存");
+}
+</script>
+
+<style scoped lang="scss">
+.modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.status-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.action-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.markTitle {
+  color: #409eff;
+}
+.markTitle:hover {
+  text-decoration: underline;
+  cursor: pointer;
+  user-select: none;
+}
+</style>
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index 354d55f..5b8873e 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -34,22 +34,31 @@
         </el-select>
       </el-form-item>
       <el-form-item label="赴校人员">
-        <el-input
+        <el-select
           v-model="query.people"
-          placeholder="请输入人员"
+          placeholder="请选择赴校人员"
           clearable
-          style="width: 180px"
-        />
+          multiple
+          filterable
+          style="width: 300px"
+        >
+          <el-option
+            v-for="p in peopleOptions"
+            :key="p.value"
+            :label="p.text"
+            :value="p.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="状态">
         <el-select
-          v-model="query.status"
+          v-model="query.solutionEnd"
           placeholder="请选择状态"
           clearable
           style="width: 140px"
         >
-          <el-option label="已完结" :value="1" />
-          <el-option label="跟进中" :value="2" />
+          <el-option label="已完结" :value="true" />
+          <el-option label="跟进中" :value="false" />
         </el-select>
       </el-form-item>
       <el-form-item label="赴校时间">
@@ -93,21 +102,38 @@
       />
       <el-table-column label="状态" min-width="110">
         <template #default="{ row }">
-          <el-tag :type="row.status === 1 ? 'success' : 'warning'">
-            {{ row.status === 1 ? "已完结" : "跟进中" }}
+          <el-tag :type="row.solutionEnd ? 'success' : 'warning'">
+            {{ row.solutionEnd ? "已完结" : "跟进中" }}
           </el-tag>
         </template>
       </el-table-column>
       <!-- <el-table-column prop="lastTime" label="最后跟进时间" min-width="160" /> -->
       <el-table-column label="操作" fixed="right" min-width="220">
         <template #default="{ row }">
-          <el-button size="small" type="danger" plain @click="onDelete(row)"
+          <!-- <el-button size="small" type="danger" plain @click="onDelete(row)"
             >删除</el-button
+          > -->
+          <el-popconfirm
+            confirm-button-text="确定"
+            cancel-button-text="取消"
+            icon-color="#626AEF"
+            title="确定删除吗?"
+            @confirm="onDelete(row)"
           >
+            <template #reference>
+              <el-button type="danger" size="small">删除</el-button>
+            </template>
+          </el-popconfirm>
+
           <el-button size="small" type="primary" plain @click="onDetail(row)"
             >详情</el-button
           >
-          <el-button size="small" type="success" plain @click="onFollow(row)"
+          <el-button
+            v-if="!row.solutionEnd"
+            size="small"
+            type="success"
+            plain
+            @click="onFollow(row)"
             >跟进</el-button
           >
         </template>
@@ -128,21 +154,26 @@
       />
     </div>
   </div>
-  <AddModal v-model:visible="isShowAddModal" />
+  <!-- 新建 -->
+  <AddModal v-model:visible="isShowAddModal" @handleReset="handleReset" />
+  <!-- 跟进 -->
+  <EditModal v-model:visible="isShowEditModal" :detailData="detailData" />
 </template>
 <!-- 赴校信息管理菜单 -->
 <script setup lang="ts" name="Toschoolinfomanage">
 import {
   addOrEditApi,
-  getenumApi,
   getPageListApi,
   getSchoolBusinessDetailApi,
-  deleteSchoolBusinessApi
+  deleteSchoolBusinessApi,
+  getSchoolBusinessPeopleListApi
 } from "@/api/toschoolinfomanage";
+import { getSchoolData } from "@/api/userCenter";
 import { ref, reactive, computed, onMounted } from "vue";
 import dayjs from "dayjs";
 import { ElMessage } from "element-plus";
 import AddModal from "./addModal.vue";
+import EditModal from "./editModal.vue";
 import { message } from "@/utils/message";
 interface TableItem {
   id: number;
@@ -152,99 +183,97 @@ interface TableItem {
   times: string; // YYYY-MM-DD
   feedbackTotals: number;
   solveTotals: number;
-  status: 1 | 2; // 1: 已完结, 2: 跟进中
+  solutionEnd: boolean; // true: 已完结, false: 跟进中
   lastTime: string; // YYYY-MM-DD
 }
 
-const schoolOptions = ref([
-  { label: "第一中学", value: "第一中学" },
-  { label: "第二中学", value: "第二中学" },
-  { label: "实验中学", value: "实验中学" },
-  { label: "外国语学校", value: "外国语学校" }
-]);
-const isShowAddModal = ref(false);
-onMounted(() => {
-  getenumApi({ TextName: "Name", ValueName: "Id" }).then(res => {
-    if (res.code === 200) {
-      schoolOptions.value = res.data.map(i => ({
+const schoolOptions = ref([]);
+const peopleOptions = ref([]);
+/**
+ * 获取学校下拉数据
+ */
+const getSchoolDataFn = () => {
+  getSchoolData().then(res => {
+    if (res.code == 200) {
+      schoolOptions.value = res.data.map((i: any) => ({
         label: i.text,
         value: i.value
       }));
     }
   });
+};
+/**
+ * 获取赴校人员下拉数据
+ */
+const getSchoolBusinessPeopleList = () => {
+  getSchoolBusinessPeopleListApi({}).then((res: any) => {
+    if (res.code == 200) {
+      peopleOptions.value = res.data || [];
+    }
+  });
+};
+const isShowAddModal = ref(false);
+const isShowEditModal = ref(false);
+const detailData = ref({});
+onMounted(() => {
   // addOrEdit();
   loadList();
+  getSchoolDataFn();
+  getSchoolBusinessPeopleList();
 });
 
 const gradeOptions = [
+  { label: "初一", value: "初一" },
+  { label: "初二", value: "初二" },
+  { label: "初三", value: "初三" },
   { label: "高一", value: "高一" },
   { label: "高二", value: "高二" },
-  { label: "高三", value: "高三" },
-  { label: "初三", value: "初三" }
+  { label: "高三", value: "高三" }
 ];
 /**
  * 新建赴校信息提交
  */
 const addOrEdit = () => {
-  addOrEditApi(
-    addOrEditApi({
-      id: 0,
-      schoolId: 708490619039814,
-      schoolName: "重庆测试学校",
-      grade: "初二",
-      schoolBusinessUser: ["向波4"],
-      startTime: "2025-08-20T07:28:38",
-      // remark: "string",
-      feedbackQuestions: [
-        {
-          endTime: null,
-          question: "xb测试反馈问题1（双师课堂）",
-          questionType: 10,
-          solution: "xb测试反馈问题1建议",
-          sort: "1"
-        }
-        // {
-        //   endTime: null,
-        //   question: "xb测试反馈问题2（设备）",
-        //   questionType: 15,
-        //   solution: "xb测试反馈问题2建议",
-        //   sort: "2"
-        // },
-        // {
-        //   endTime: null,
-        //   question: "xb测试反馈问题2（学生）",
-        //   questionType: 20,
-        //   solution: "xb测试反馈问题3建议",
-        //   sort: "3"
-        // }
-      ],
-      // solutionRecord: {
-      //   solution: "string",
-      //   endRecord: "string",
-      //   record: [
-      //     {
-      //       executionRecords: "string",
-      //       executionTime: "2025-08-18T08:31:52.716Z"
-      //     }
-      //   ]
+  addOrEditApi({
+    id: 0, //id传0代表新增
+    schoolId: 10079,
+    schoolName: "系统测试学校",
+    grade: "初二",
+    gradeLevel: "",
+    schoolBusinessUser: ["刘德华123"],
+    startTime: "2025-07-24T07:28:38",
+    // remark: "string",
+    feedbackQuestions: [
+      {
+        question: "xb测试反馈问题1（双师课堂）",
+        questionType: 10,
+        sort: "1111111111"
+      }
+      // {
+      //   question: "xb测试反馈问题2（设备）",
+      //   questionType: 15,
+      //   sort: "2"
       // },
-      // solutionEnd: true,
-      isDiscussion: false,
-      discussion: "开展座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈",
-      isClassMeeting: false,
-      classMeeting: "班会情况班会情况班会情况班会情况班会情况班会情况班会情况"
-    })
-  );
+      // {
+      //   question: "xb测试反馈问题2（学生）",
+      //   questionType: 20,
+      //   sort: "3"
+      // }
+    ],
+    isDiscussion: true,
+    discussion: "开展座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈",
+    isClassMeeting: true,
+    classMeeting: "班会情况班会情况班会情况班会情况班会情况班会情况班会情况"
+  });
 };
 
 const query = reactive({
   school: "" as string | undefined,
   grade: "" as string | undefined,
-  people: "",
-  status: undefined as 1 | 2 | undefined,
+  people: [] as number[],
+  solutionEnd: undefined,
   times: [] as string[]
 });
-
 const page = ref(1);
 const pageSize = ref(10);
 const total = ref(0);
@@ -275,7 +304,7 @@ function mapApiItemToRow(item: any): TableItem {
     times: start,
     feedbackTotals: Number(item.feedbackCount) || 0,
     solveTotals: Number(item.solveFeedbackCount) || 0,
-    status: item.solutionEnd ? 1 : 2,
+    solutionEnd: item.solutionEnd,
     lastTime: last
   };
 }
@@ -288,12 +317,14 @@ async function loadList() {
   };
   if (query.school) payload.schoolId = query.school;
   if (query.grade) payload.grade = query.grade;
-  if (query.people) payload.people = query.people.trim();
-  if (typeof query.status !== "undefined")
-    payload.solutionEnd = query.status === 1;
+  if (query.people && query.people.length > 0) {
+    payload.people = query.people.join(",");
+  }
+  if (typeof query.solutionEnd !== "undefined")
+    payload.solutionEnd = query.solutionEnd;
   if (Array.isArray(query.times) && query.times.length === 2) {
-    payload.startTimeBegin = query.times[0];
-    payload.startTimeEnd = query.times[1];
+    payload.startTime = query.times[0];
+    payload.endTime = query.times[1];
   }
   try {
     const res = await getPageListApi(payload);
@@ -328,8 +359,8 @@ function handleSearch() {
 function handleReset() {
   query.school = "";
   query.grade = "";
-  query.people = "";
-  query.status = undefined;
+  query.people = [];
+  query.solutionEnd = undefined;
   query.times = [];
   page.value = 1;
   loadList();
@@ -369,6 +400,13 @@ function onDetail(row: TableItem) {
 
 function onFollow(row: TableItem) {
   console.log(`跟进`);
+  isShowEditModal.value = true;
+  detailData;
+  getSchoolBusinessDetailApi(row.id).then(res => {
+    if (res.code === 200) {
+      detailData.value = res.data;
+    }
+  });
 }
 
 function handleAdd() {

From c54cebe31e27d345bdebf333967cbb49c3a0dfb4 Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Wed, 20 Aug 2025 16:32:32 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E5=89=A9=E4=BD=99=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/toschoolinfomanage/addModal.vue  |   2 +-
 src/views/toschoolinfomanage/editModal.vue | 532 +++++++++++++++++----
 src/views/toschoolinfomanage/index.vue     |  84 ++--
 3 files changed, 494 insertions(+), 124 deletions(-)

diff --git a/src/views/toschoolinfomanage/addModal.vue b/src/views/toschoolinfomanage/addModal.vue
index ef9f9c7..421c2a3 100644
--- a/src/views/toschoolinfomanage/addModal.vue
+++ b/src/views/toschoolinfomanage/addModal.vue
@@ -2,7 +2,7 @@
 <template>
   <el-dialog
     v-model="dialogVisible"
-    title="新建赴校信息"
+    title="新建"
     width="800px"
     @close="onCancel"
     align-center
diff --git a/src/views/toschoolinfomanage/editModal.vue b/src/views/toschoolinfomanage/editModal.vue
index c066fd2..6e271e1 100644
--- a/src/views/toschoolinfomanage/editModal.vue
+++ b/src/views/toschoolinfomanage/editModal.vue
@@ -2,11 +2,12 @@
 <template>
   <el-dialog
     v-model="dialogVisible"
-    title="跟进赴校信息"
+    :title="isDetail ? '详情' : '跟进'"
     width="800px"
     @close="closeModal"
     align-center
   >
+    <!-- {{ isDetail }} -->
     <div class="modal-header">
       <div class="status-box">
         <span>当前状态：</span>
@@ -14,102 +15,222 @@
       </div>
       <div class="action-box">
         <el-button @click="onClickCancel">取消</el-button>
-        <el-button type="primary" @click="onClickSave">保存</el-button>
+        <el-button :disabled="isDetail" type="primary" @click="onClickSave"
+          >保存</el-button
+        >
       </div>
     </div>
+    <div
+      style="height: 80vh; overflow-y: auto; padding-right: 22px"
+      v-loading="editModalLoading"
+    >
+      <!-- <el-divider /> -->
 
-    <el-divider />
+      <el-descriptions title="基础信息" :column="2" border>
+        <el-descriptions-item label="学校">
+          {{ safeDetail.schoolName || safeDetail.school || "-" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="年级">
+          {{ safeDetail.grade || safeDetail.gradeLevel || "-" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="赴校人员">
+          {{
+            Array.isArray(safeDetail.schoolBusinessUser)
+              ? safeDetail.schoolBusinessUser.join("，")
+              : safeDetail.schoolBusinessUser || "-"
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item label="赴校时间">
+          {{ safeDetail.startTime?.split("T")[0] }}
+        </el-descriptions-item>
+      </el-descriptions>
 
-    <el-descriptions title="基础信息" :column="2" border>
-      <el-descriptions-item label="学校">
-        {{ safeDetail.schoolName || safeDetail.school || "-" }}
-      </el-descriptions-item>
-      <el-descriptions-item label="年级">
-        {{ safeDetail.grade || safeDetail.gradeLevel || "-" }}
-      </el-descriptions-item>
-      <el-descriptions-item label="赴校人员">
-        {{
-          Array.isArray(safeDetail.schoolBusinessUser)
-            ? safeDetail.schoolBusinessUser.join("，")
-            : safeDetail.schoolBusinessUser || "-"
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="赴校时间">
-        {{ safeDetail.startTime?.split("T")[0] }}
-      </el-descriptions-item>
-    </el-descriptions>
+      <el-divider />
 
-    <el-divider />
-
-    <el-descriptions title="基础工作" :column="1" border>
-      <el-descriptions-item label="座谈">
-        <el-tag
-          :type="safeDetail.isDiscussion ? 'success' : 'info'"
-          style="margin-right: 8px"
+      <el-descriptions title="基础工作" :column="1" border>
+        <el-descriptions-item label="座谈">
+          <el-tag
+            :type="safeDetail.isDiscussion ? 'success' : 'info'"
+            style="margin-right: 8px"
+          >
+            {{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
+          </el-tag>
+          <span>{{ safeDetail.discussion || "-" }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="班会">
+          <el-tag
+            :type="safeDetail.isClassMeeting ? 'success' : 'info'"
+            style="margin-right: 8px"
+          >
+            {{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
+          </el-tag>
+          <span>{{ safeDetail.classMeeting || "-" }}</span>
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-divider />
+      <el-descriptions title="反馈问题" :column="1" border> </el-descriptions>
+      <div style="display: flex; gap: 40px; margin-bottom: 5px">
+        <span> 问题总数：{{ safeDetail.feedbackQuestions?.length }} </span>
+        <span> 未解决问题：{{ unresolvedCount }} </span>
+      </div>
+      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="(i, idx) in sortData(safeDetail.feedbackQuestions || [])"
+          :key="idx"
+          :label="'问题' + (idx + 1) + (i.solution ? '(已解决)' : '(未解决)')"
+          :name="idx"
         >
-          {{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
-        </el-tag>
-        <span>{{ safeDetail.discussion || "-" }}</span>
-      </el-descriptions-item>
-      <el-descriptions-item label="班会">
-        <el-tag
-          :type="safeDetail.isClassMeeting ? 'success' : 'info'"
-          style="margin-right: 8px"
-        >
-          {{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
-        </el-tag>
-        <span>{{ safeDetail.classMeeting || "-" }}</span>
-      </el-descriptions-item>
-    </el-descriptions>
-    <el-divider />
-    <el-descriptions title="反馈问题" :column="1" border> </el-descriptions>
-    <div style="display: flex; gap: 40px; margin-bottom: 5px">
-      <span> 问题总数：{{ safeDetail.feedbackQuestions?.length }} </span>
-      <span>
-        未解决问题：{{ handleUnHandleQust(safeDetail.feedbackQuestions) }}
-      </span>
-    </div>
-    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane
-        v-for="(i, idx) in sortData(safeDetail.feedbackQuestions)"
-        :key="idx"
-        :label="'问题' + (idx + 1) + (i.solution ? '(已解决)' : '(未解决)')"
-        :name="idx"
-      >
-        <div style="font-size: 12px; margin-bottom: 4px">
-          <span>问题类型：</span> <span>{{ queType[i.questionType] }}</span>
-        </div>
-        <div style="padding: 10px; background-color: #f3f3f3">
-          {{ i.question }}
-        </div>
-        <div v-if="i.solution">
-          <span> 解决情况 </span>
-          <div style="padding: 10px; background-color: #f3f3f3">
-            解决情况描述111111111111111
+          <div style="font-size: 12px; margin-bottom: 4px">
+            <span>问题类型：</span> <span>{{ queType[i.questionType] }}</span>
           </div>
-        </div>
-        <div
-          v-else
+          <div style="padding: 10px; background-color: #f3f3f3">
+            {{ i.question }}
+          </div>
+          <div v-if="i.solution" style="font-size: 12px; margin-top: 10px">
+            <span> 解决时间：{{ i.endTime.split("T")[0] }} </span>
+            <div style="padding: 10px; background-color: #f3f3f3">
+              {{ i.solution }}
+            </div>
+          </div>
+          <el-button
+            type="text"
+            v-else
+            style="margin-top: 5px; font-size: 12px"
+            class="markTitle"
+            :disabled="isDetail"
+            @click="markTitle(i)"
+          >
+            标记已解决
+          </el-button>
+        </el-tab-pane>
+      </el-tabs>
+      <el-divider />
+
+      <!-- {{ safeDetail.feedbackQuestions }} -->
+      <!-- .............................................................. -->
+      <el-descriptions title="备注" :column="1" border> </el-descriptions>
+      <el-input
+        v-model="safeDetail.remark"
+        :rows="4"
+        type="textarea"
+        :disabled="isDetail"
+      />
+      <el-divider />
+
+      <el-descriptions title="解决方案执行跟踪记录" :column="1" border>
+      </el-descriptions>
+      <span>需求+解决方案</span>
+      <el-input
+        v-model="solutionText"
+        :rows="4"
+        type="textarea"
+        :disabled="isDetail"
+      />
+
+      <!-- 添加按钮区域 -->
+      <div style="margin-top: 5px; display: flex; gap: 20px">
+        <el-button
+          type="text"
           style="margin-top: 5px; font-size: 12px"
           class="markTitle"
-          @click="markTitle"
+          :disabled="isDetail"
+          @click="addRecord"
         >
-          标记已解决
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <el-divider />
+          添加执行记录
+        </el-button>
+        <el-button
+          style="margin-top: 5px; font-size: 12px"
+          class="markTitle"
+          type="text"
+          :disabled="isDetail"
+          @click="addFinish"
+        >
+          {{ finishRecord ? "修改完结情况" : "添加完结情况" }}
+        </el-button>
+      </div>
 
-    <!-- {{ safeDetail.feedbackQuestions }} -->
-    <!-- .............................................................. -->
-    <el-descriptions title="备注" :column="1" border> </el-descriptions>
-    <el-input
-      v-model="safeDetail.remark"
-      :rows="4"
-      type="textarea"
-      maxlength="1000"
-      :show-word-limit="true"
-    />
+      <!-- 执行记录列表 -->
+      <div v-if="executionRecords.length > 0" style="margin-top: 15px">
+        <!-- <div style="font-weight: bold; margin-bottom: 8px">执行记录：</div> -->
+        <div
+          v-for="(record, index) in executionRecords"
+          :key="index"
+          style="
+            margin-bottom: 10px;
+            padding: 10px;
+            background-color: #f5f5f5;
+            border-radius: 4px;
+          "
+        >
+          <div style="font-weight: bold; color: #409eff">
+            执行记录{{ index + 1 }}：{{ record.time.split("T")[0] }}
+          </div>
+          <div style="margin-top: 5px; white-space: pre-wrap">
+            {{ record.content }}
+          </div>
+        </div>
+      </div>
+
+      <!-- 完结情况 -->
+      <div v-if="finishRecord" style="margin-top: 15px">
+        <!-- <div style="font-weight: bold; margin-bottom: 8px">完结情况：</div> -->
+        <div
+          style="
+            padding: 10px;
+            background-color: #f0f9ff;
+            border-radius: 4px;
+            border: 1px solid #b3d8ff;
+          "
+        >
+          <div style="font-weight: bold; color: #a69400">
+            完结情况：{{ finishRecord.time.split("T")[0] }}
+          </div>
+          <div style="margin-top: 5px; white-space: pre-wrap">
+            {{ finishRecord.content }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+
+  <!-- 操作弹窗 -->
+  <el-dialog
+    v-model="operationDialogVisible"
+    title="操作"
+    width="500px"
+    align-center
+  >
+    <el-form
+      ref="operationFormRef"
+      :model="operationForm"
+      :rules="operationRules"
+      label-width="80px"
+    >
+      <el-form-item label="操作时间" prop="operationTime">
+        <el-date-picker
+          v-model="operationForm.operationTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择操作时间"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item :label="operationContentLabel" prop="operationContent">
+        <el-input
+          v-model="operationForm.operationContent"
+          type="textarea"
+          :rows="4"
+          :placeholder="`请输入${operationContentLabel}`"
+        />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeOperationDialog">取消</el-button>
+        <el-button type="primary" @click="confirmOperation">确认</el-button>
+      </span>
+    </template>
   </el-dialog>
 </template>
 
@@ -124,16 +245,91 @@ import {
 } from "@/api/toschoolinfomanage";
 import { setFips } from "crypto";
 
-const activeName = ref(0);
+const activeName = ref<any>(0);
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  console.log(tab, event);
+  console.log(tab.props.name, event);
+  activeName.value = tab.props.name;
 };
-const props = defineProps<{ visible: boolean; detailData: any }>();
+const props = defineProps<{
+  visible: boolean;
+  detailData: any;
+  editModalLoading: boolean;
+  isDetail: boolean;
+}>();
 const emit = defineEmits<{
   (e: "update:visible", value: boolean): void;
+  (e: "handleReset"): void;
 }>();
 
+// 操作弹窗相关数据
+const operationDialogVisible = ref(false);
+const operationType = ref(""); // 操作类型：markSolved, addRecord, addFinish
+const operationForm = reactive({
+  operationTime: "",
+  operationContent: ""
+});
+const operationFormRef = ref<FormInstance>();
+
+// 执行记录和完结情况数据
+const executionRecords = ref<Array<{ time: string; content: string }>>([]);
+const finishRecord = ref<{ time: string; content: string } | null>(null);
+
+// 从父级 detailData.solutionRecord 回显本地显示数据
+watch(
+  () => props.detailData,
+  val => {
+    const sr = (val as any)?.solutionRecord || {};
+    // 执行记录回显
+    const recs = Array.isArray(sr?.record) ? sr.record : [];
+    executionRecords.value = recs.map((r: any) => ({
+      time: r?.executionTime || "",
+      content: r?.executionRecords || ""
+    }));
+    // 完结情况回显
+    if (sr?.endRecordTime || sr?.endRecord) {
+      finishRecord.value = {
+        time: sr?.endRecordTime || "",
+        content: sr?.endRecord || ""
+      };
+    } else {
+      finishRecord.value = null;
+    }
+  },
+  { immediate: true, deep: true }
+);
+
+// 当前标记“已解决”的问题项
+const currentMarkedQuestion = ref<any | null>(null);
+
+// 根据操作类型动态显示文案
+const operationContentLabel = computed(() => {
+  switch (operationType.value) {
+    case "markSolved":
+      return "解决情况";
+    case "addRecord":
+      return "执行记录";
+    case "addFinish":
+      return "完结情况";
+    default:
+      return "操作内容";
+  }
+});
+
+// 表单验证规则
+const operationRules: FormRules = {
+  operationTime: [
+    { required: true, message: "请选择操作时间", trigger: "change" }
+  ],
+  operationContent: [
+    {
+      required: true,
+      message: `请输入${operationContentLabel.value}`,
+      trigger: "blur"
+    }
+  ]
+};
+
 const dialogVisible = computed({
   get: () => props.visible,
   set: v => emit("update:visible", v)
@@ -141,6 +337,7 @@ const dialogVisible = computed({
 
 const closeModal = () => {
   emit("update:visible", false);
+  activeName.value = 0;
 };
 const queType = {
   1: "学校领导班子",
@@ -154,10 +351,7 @@ const queType = {
  * @param data
  */
 const handleUnHandleQust = (data: Array<any>) => {
-  return (data || []).map(i => {
-    // 利用solution为空判断为未解决问题
-    return !i.solution;
-  }).length;
+  return (data || []).filter(i => !i?.solution).length;
 };
 const sortData = (data: Array<any>) => {
   const categorizedData = [
@@ -186,14 +380,157 @@ const statusText = computed(() =>
 const statusType = computed(() =>
   safeDetail.value?.solutionEnd ? "success" : "warning"
 );
-const markTitle = () => {
-  console.log("标记已解决");
+const solutionText = computed({
+  get: () => safeDetail.value?.solutionRecord?.solution || "",
+  set: (value: string) => {
+    if (!safeDetail.value.solutionRecord) {
+      safeDetail.value.solutionRecord = {};
+    }
+    safeDetail.value.solutionRecord.solution = value;
+  }
+});
+
+// 未解决问题数量（依赖每个问题项的 solution 字段，确保标记已解决后自动更新）
+const unresolvedCount = computed(() => {
+  const list = (safeDetail.value?.feedbackQuestions as any[]) || [];
+  return list.filter(item => !item?.solution).length;
+});
+const markTitle = (data: any) => {
+  console.log("标记已解决", data);
+  operationType.value = "markSolved";
+  currentMarkedQuestion.value = data;
+  // 预填已有值
+  operationForm.operationTime = data?.endTime || "";
+  operationForm.operationContent = data?.solution || "";
+  operationFormRef.value?.clearValidate();
+  operationDialogVisible.value = true;
+};
+const addRecord = () => {
+  console.log("添加执行记录");
+  operationType.value = "addRecord";
+  operationDialogVisible.value = true;
+};
+const addFinish = () => {
+  console.log("添加完结情况");
+  operationType.value = "addFinish";
+  const sr = (props.detailData as any)?.solutionRecord;
+  // 优先从父级已有完结情况预填，其次使用本地 finishRecord
+  if (sr && (sr.endRecordTime || sr.endRecord)) {
+    operationForm.operationTime = sr.endRecordTime || "";
+    operationForm.operationContent = sr.endRecord || "";
+  } else if (finishRecord.value) {
+    operationForm.operationTime = finishRecord.value.time;
+    operationForm.operationContent = finishRecord.value.content;
+  } else {
+    // 重置表单
+    operationForm.operationTime = "";
+    operationForm.operationContent = "";
+  }
+  operationDialogVisible.value = true;
+};
+
+// 操作弹窗相关方法
+const closeOperationDialog = () => {
+  operationDialogVisible.value = false;
+  // 重置表单
+  operationForm.operationTime = "";
+  operationForm.operationContent = "";
+  // 清除表单验证状态
+  operationFormRef.value?.clearValidate();
+  // 重置当前标记项
+  currentMarkedQuestion.value = null;
+};
+
+const confirmOperation = async () => {
+  if (!operationFormRef.value) return;
+
+  try {
+    await operationFormRef.value.validate();
+
+    const { operationTime, operationContent } = operationForm;
+
+    // 根据操作类型处理数据
+    switch (operationType.value) {
+      case "addRecord":
+        // 添加执行记录
+        executionRecords.value.push({
+          time: operationTime,
+          content: operationContent
+        });
+        // 同步到父数据 solutionRecord.record
+        if (!props.detailData.solutionRecord)
+          props.detailData.solutionRecord = {} as any;
+        if (!Array.isArray(props.detailData.solutionRecord.record))
+          props.detailData.solutionRecord.record = [];
+        props.detailData.solutionRecord.record.push({
+          executionTime: operationTime,
+          executionRecords: operationContent
+        });
+        break;
+      case "addFinish":
+        // 添加或修改完结情况
+        finishRecord.value = {
+          time: operationTime,
+          content: operationContent
+        };
+        // 同步到父数据 solutionRecord.endRecordTime / endRecord
+        if (!props.detailData.solutionRecord)
+          props.detailData.solutionRecord = {} as any;
+        props.detailData.solutionRecord.endRecordTime = operationTime;
+        props.detailData.solutionRecord.endRecord = operationContent;
+        break;
+      case "markSolved":
+        // 将提交的数据写回当前问题项
+        if (currentMarkedQuestion.value) {
+          currentMarkedQuestion.value.endTime = operationTime;
+          currentMarkedQuestion.value.solution = operationContent;
+        }
+        break;
+    }
+
+    console.log("确认操作", {
+      type: operationType.value,
+      time: operationTime,
+      content: operationContent
+    });
+    closeOperationDialog();
+  } catch (error) {
+    console.log("表单验证失败", error);
+  }
 };
 function onClickCancel() {
   console.log("取消");
+  emit("update:visible", false);
+  // 清空本地临时数据
+  executionRecords.value = [];
+  finishRecord.value = null;
+  currentMarkedQuestion.value = null;
+  operationForm.operationTime = "";
+  operationForm.operationContent = "";
+  activeName.value = 0;
+  operationFormRef.value?.clearValidate();
 }
 function onClickSave() {
-  console.log("保存");
+  console.log("保存", props.detailData);
+  let copyParams = JSON.parse(JSON.stringify(props.detailData));
+  delete copyParams.solutionEnd;
+  addOrEditApi(copyParams).then(res => {
+    if (res.code === 200) {
+      ElMessage.success("提交成功");
+      // 关闭弹窗
+      emit("update:visible", false);
+      // 清空本地临时数据
+      executionRecords.value = [];
+      finishRecord.value = null;
+      currentMarkedQuestion.value = null;
+      operationForm.operationTime = "";
+      operationForm.operationContent = "";
+      activeName.value = 0;
+      operationFormRef.value?.clearValidate();
+      // 通知父级刷新列表（复用父级的handleReset实现刷新）
+      emit("handleReset");
+    }
+  });
 }
 </script>
 
@@ -202,6 +539,9 @@ function onClickSave() {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 10px;
 }
 .status-box {
   display: flex;
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index 5b8873e..ec32409 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -38,7 +38,6 @@
           v-model="query.people"
           placeholder="请选择赴校人员"
           clearable
-          multiple
           filterable
           style="width: 300px"
         >
@@ -125,7 +124,11 @@
             </template>
           </el-popconfirm>
 
-          <el-button size="small" type="primary" plain @click="onDetail(row)"
+          <el-button
+            size="small"
+            type="primary"
+            plain
+            @click="onDetailOrFollow(row, true)"
             >详情</el-button
           >
           <el-button
@@ -133,7 +136,7 @@
             size="small"
             type="success"
             plain
-            @click="onFollow(row)"
+            @click="onDetailOrFollow(row, false)"
             >跟进</el-button
           >
         </template>
@@ -157,7 +160,13 @@
   <!-- 新建 -->
   <AddModal v-model:visible="isShowAddModal" @handleReset="handleReset" />
   <!-- 跟进 -->
-  <EditModal v-model:visible="isShowEditModal" :detailData="detailData" />
+  <EditModal
+    v-model:visible="isShowEditModal"
+    :editModalLoading="editModalLoading"
+    :detailData="detailData"
+    :isDetail="isDetail"
+    @handleReset="handleReset"
+  />
 </template>
 <!-- 赴校信息管理菜单 -->
 <script setup lang="ts" name="Toschoolinfomanage">
@@ -189,6 +198,7 @@ interface TableItem {
 
 const schoolOptions = ref([]);
 const peopleOptions = ref([]);
+const isDetail = ref(false);
 /**
  * 获取学校下拉数据
  */
@@ -208,12 +218,18 @@ const getSchoolDataFn = () => {
 const getSchoolBusinessPeopleList = () => {
   getSchoolBusinessPeopleListApi({}).then((res: any) => {
     if (res.code == 200) {
-      peopleOptions.value = res.data || [];
+      peopleOptions.value = (res.data || []).map(i => {
+        return {
+          value: i.text,
+          text: i.text
+        };
+      });
     }
   });
 };
 const isShowAddModal = ref(false);
 const isShowEditModal = ref(false);
+const editModalLoading = ref(false);
 const detailData = ref({});
 onMounted(() => {
   // addOrEdit();
@@ -261,7 +277,7 @@ const addOrEdit = () => {
       // }
     ],
     isDiscussion: true,
-    discussion: "开展座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈",
+    discussion: "开展座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈座谈",
     isClassMeeting: true,
     classMeeting: "班会情况班会情况班会情况班会情况班会情况班会情况班会情况"
   });
@@ -270,7 +286,7 @@ const addOrEdit = () => {
 const query = reactive({
   school: "" as string | undefined,
   grade: "" as string | undefined,
-  people: [] as number[],
+  people: "" as string | undefined,
   solutionEnd: undefined,
   times: [] as string[]
 });
@@ -317,8 +333,8 @@ async function loadList() {
   };
   if (query.school) payload.schoolId = query.school;
   if (query.grade) payload.grade = query.grade;
-  if (query.people && query.people.length > 0) {
-    payload.people = query.people.join(",");
+  if (query.people) {
+    payload.UserName = query.people;
   }
   if (typeof query.solutionEnd !== "undefined")
     payload.solutionEnd = query.solutionEnd;
@@ -359,7 +375,7 @@ function handleSearch() {
 function handleReset() {
   query.school = "";
   query.grade = "";
-  query.people = [];
+  query.people = "";
   query.solutionEnd = undefined;
   query.times = [];
   page.value = 1;
@@ -387,27 +403,41 @@ function onDelete(row: TableItem) {
   });
 }
 /**
- * 获取详情
+ * 详情或者跟进
  * @param row
  */
-function onDetail(row: TableItem) {
-  getSchoolBusinessDetailApi(row.id).then(res => {
-    if (res.code === 200) {
-      console.log("详情信息", res.data);
-    }
-  });
-}
-
-function onFollow(row: TableItem) {
-  console.log(`跟进`);
+function onDetailOrFollow(row: TableItem, disabled = false) {
+  isDetail.value = disabled;
   isShowEditModal.value = true;
-  detailData;
-  getSchoolBusinessDetailApi(row.id).then(res => {
-    if (res.code === 200) {
-      detailData.value = res.data;
-    }
-  });
+  editModalLoading.value = true;
+  getSchoolBusinessDetailApi(row.id)
+    .then(res => {
+      if (res.code === 200 && res.data) {
+        detailData.value = res.data;
+      }
+    })
+    .finally(() => {
+      editModalLoading.value = false;
+    });
 }
+/**
+ * 跟进
+ * @param row
+ */
+// function onFollow(row: TableItem) {
+//   isShowEditModal.value = true;
+//   editModalLoading.value = true;
+//   console.log(`跟进`);
+//   getSchoolBusinessDetailApi(row.id)
+//     .then(res => {
+//       if (res.code === 200 && res.data) {
+//         detailData.value = res.data;
+//       }
+//     })
+//     .finally(() => {
+//       editModalLoading.value = false;
+//     });
+// }
 
 function handleAdd() {
   console.log("新建");

From 4c418a72d39aec7308d19f5d5dd52293441905a6 Mon Sep 17 00:00:00 2001
From: xiangbo <975188351@qq.com>
Date: Wed, 20 Aug 2025 17:49:55 +0800
Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E7=89=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/toschoolinfomanage/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index ec32409..f84a76c 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -82,6 +82,7 @@
       <el-button type="primary" @click="handleAdd">新建</el-button>
       <el-button type="success" @click="handleImport">批量导入</el-button>
       <el-button type="info" @click="handleExport">导出</el-button>
+      <el-button type="info" @click="downLoadTpl">下载模版</el-button>
     </div>
     <!-- 表格区域 -->
     <el-table :data="listData" border style="width: 100%">
@@ -449,6 +450,9 @@ function handleImport() {
 function handleExport() {
   console.log("导出");
 }
+function downLoadTpl() {
+  console.log("下载模版");
+}
 </script>
 
 <style lang="scss" scoped>