代码修改

src/apis/modules/serviceMenu.js

@@ -0,0 +1,11 @@
+// 服务设施模块
+import request from '@/utils/request'
+// 获取节点
+export const getNodeList = (params) => request.basic.get('/api/v1/service-nodes', params)
+
+// 创建节点
+export const createNode = (params) => request.basic.post('/api/v1/service-nodes', params)
+
+// 删除节点
+export const delNode = (id) => request.basic.delete(`/api/v1/service-nodes/${id}`)
+

src/views/serviceMenu/nodeAdministration/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="org-management">
-    <!-- <div class="header">
+    <div class="header" v-if="!hasData">
       <h1>组织管理</h1>
       <a-button type="primary" @click="showAddModal()">添加根节点</a-button>
-    </div> -->
+    </div>
     
     <div class="org-table">
       <a-table
@@ -14,27 +14,30 @@
         :expand-icon-as-cell="false"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'projectType'">
+          <template v-if="column.key === 'disabled'">
-            <a-tag :color="record.projectType === 'Supervision' ? 'blue' : 'green'">
+            <a-tag :color="record.disabled === false ? 'green' : 'red'">
-              {{ record.projectType === 'Supervision' ? '监管' : '居家养老床位' }}
+              {{ record.disabled === false ? '启用' : '禁用' }}
             </a-tag>
           </template>
-          <template v-if="column.key === 'status'">
+          <template v-if="column.key === 'created_at'">
-            <a-tag :color="record.status === 0 ? 'green' : 'red'">
+            <div>{{ record.created_at ? dayjs(record.created_at).format('YYYY-MM-DD HH:mm') : '-' }}</div>
-              {{ record.status === 0 ? '启用' : '禁用' }}
+          </template>
-            </a-tag>
+          <template v-if="column.key === 'updated_at'">
+            <div>{{ record.updated_at ? dayjs(record.updated_at).format('YYYY-MM-DD HH:mm') : '-' }}</div>
           </template>
           <template v-if="column.key === 'actions'">
             <div class="actions">
+              <!-- 修改这里：只在前两层显示添加子节点按钮 -->
               <a-button 
+                v-if="getNodeLevel(record) < 2"
                 size="small" 
                 type="primary" 
                 @click="showAddModal(record)"
-                v-if="record.projectType === 'Supervision'"
               >
                 添加子节点
               </a-button>
               <a-button 
+                style="margin-left: 20px;"
                 size="small" 
                 danger 
                 @click="handleDelete(record)"
@@ -64,17 +67,13 @@
         <a-form-item label="节点名称" name="name">
           <a-input v-model:value="formState.name" placeholder="请输入节点名称" />
         </a-form-item>
-        <a-form-item label="节点类型" name="projectType">
-          <a-select v-model:value="formState.projectType" placeholder="请选择节点类型">
-            <a-select-option value="Supervision">监管</a-select-option>
-            <a-select-option value="HomeCareBed">居家养老床位</a-select-option>
-          </a-select>
-        </a-form-item>
         <a-form-item label="状态" name="status">
-          <a-radio-group v-model:value="formState.status">
+          <a-switch 
-            <a-radio :value="0">启用</a-radio>
+            v-model:checked="formState.status" 
-            <a-radio :value="1">禁用</a-radio>
+            :checked-children="statusText.checked"
-          </a-radio-group>
+            :un-checked-children="statusText.unchecked"
+            :disabled="!isEditing"
+          />
         </a-form-item>
       </a-form>
     </a-modal>
@@ -82,15 +81,34 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, computed } from 'vue';
-import { message, Modal } from 'ant-design-vue';
+import apis from '@/apis';
+import { Modal, message } from 'ant-design-vue';
+import dayjs from 'dayjs';
+import { config } from '@/config';
+import { usePagination } from '@/hooks';
+
+const { listData, paginationState, loading, showLoading, hideLoading, resetPagination, searchFormData } = usePagination();
+
+// 是否有数据的计算属性
+const hasData = computed(() => {
+  return listData.value && listData.value.length > 0;
+});
+
+paginationState.onChange = (page, pageSize) => {
+    paginationState.current = page
+    paginationState.pageSize = pageSize
+    getList()
+}
 
 // 转换数据格式，将 subOrgList 转换为 children
 const convertData = (data) => {
+  if (!data || data.length === 0) return [];
+  
   return data.map(item => {
     const converted = {
       ...item,
-      key: item.orgId, // 使用 orgId 作为 key
+      key: item.id, // 使用 id 作为 key，注意这里应该是 id 而不是 orgId
     };
     
     if (item.subOrgList && item.subOrgList.length > 0) {
@@ -101,122 +119,6 @@ const convertData = (data) => {
   });
 };
 
-// 原始数据
-const originalData = ref([
-  {
-    "id": 5066,
-    "orgId": "1813150290069417984",
-    "name": "南通市通州区互联网+智慧养老居家上门服务项目",
-    "path": "/0/1813150290069417984",
-    "parentId": "0",
-    "status": 0,
-    "tenantId": "1813150290048446464",
-    "projectType": "Supervision",
-    "subOrgList": [
-      {
-        "id": 5093,
-        "orgId": "1813400548804390913",
-        "name": "东社镇",
-        "parentId": "1813150290069417984",
-        "path": "/0/1813150290069417984/1813400548804390913",
-        "status": 0,
-        "tenantId": "1813150290048446464",
-        "projectType": "Supervision",
-        "createBy": "1694238554834726912",
-        "createTime": "2024-07-17T10:29:17",
-        "updateBy": "1694238554834726912",
-        "updateTime": "2024-07-17T10:29:17",
-        "subOrgList": [
-          {
-            "id": 5094,
-            "orgId": "1813400640336556032",
-            "name": "东社镇服务站",
-            "parentId": "1813400548804390913",
-            "path": "/0/1813150290069417984/1813400548804390913/1813400640336556032",
-            "status": 0,
-            "tenantId": "1813150290048446464",
-            "projectType": "HomeCareBed",
-            "createBy": "1694238554834726912",
-            "createTime": "2024-07-17T10:29:39",
-            "updateBy": "1694238554834726912",
-            "updateTime": "2024-07-17T10:29:39",
-            "subOrgList": [],
-            "disabled": false
-          }
-        ],
-        "disabled": false
-      },
-      {
-        "id": 5071,
-        "orgId": "1813396942931881985",
-        "name": "二甲镇",
-        "parentId": "1813150290069417984",
-        "path": "/0/1813150290069417984/1813396942931881985",
-        "status": 0,
-        "tenantId": "1813150290048446464",
-        "projectType": "Supervision",
-        "createBy": "1694238554834726912",
-        "createTime": "2024-07-17T10:14:57",
-        "updateBy": "1694238554834726912",
-        "updateTime": "2024-07-17T10:14:57",
-        "subOrgList": [
-          {
-            "id": 5072,
-            "orgId": "1813397035642646528",
-            "name": "二甲镇服务站",
-            "parentId": "1813396942931881985",
-            "path": "/0/1813150290069417984/1813396942931881985/1813397035642646528",
-            "status": 0,
-            "tenantId": "1813150290048446464",
-            "projectType": "HomeCareBed",
-            "createBy": "1694238554834726912",
-            "createTime": "2024-07-17T10:15:19",
-            "updateBy": "1694238554834726912",
-            "updateTime": "2024-07-17T10:15:19",
-            "subOrgList": [],
-            "disabled": false
-          }
-        ],
-        "disabled": false
-      },
-      {
-        "id": 5091,
-        "orgId": "1813400338249674753",
-        "name": "五接镇",
-        "parentId": "1813150290069417984",
-        "path": "/0/1813150290069417984/1813400338249674753",
-        "status": 0,
-        "tenantId": "1813150290048446464",
-        "projectType": "Supervision",
-        "createBy": "1694238554834726912",
-        "createTime": "2024-07-17T10:28:27",
-        "updateBy": "1694238554834726912",
-        "updateTime": "2024-07-17T10:28:27",
-        "subOrgList": [
-          {
-            "id": 5092,
-            "orgId": "1813400446438469632",
-            "name": "五接镇服务站",
-            "parentId": "1813400338249674753",
-            "path": "/0/1813150290069417984/1813400338249674753/1813400446438469632",
-            "status": 0,
-            "tenantId": "1813150290048446464",
-            "projectType": "HomeCareBed",
-            "createBy": "1694238554834726912",
-            "createTime": "2024-07-17T10:28:53",
-            "updateBy": "1694238554834726912",
-            "updateTime": "2024-07-17T10:28:53",
-            "subOrgList": [],
-            "disabled": false
-          }
-        ],
-        "disabled": false
-      }
-    ],
-    "disabled": false
-  }
-]);
-
 // 数据源
 const dataSource = ref([]);
 
@@ -226,52 +128,51 @@ const isEditing = ref(false);
 const currentParent = ref(null);
 const confirmLoading = ref(false);
 
-// 表单状态
+// 表单状态 - 默认状态为启用（false）
 const formState = reactive({
   name: '',
-  projectType: 'Supervision',
+  status: false  // 默认为false表示启用
-  status: 0
+});
+
+// 状态显示文本
+const statusText = computed(() => {
+  return {
+    checked: '禁用',
+    unchecked: '启用'
+  };
 });
 
 // 表单验证规则
 const rules = {
   name: [
     { required: true, message: '请输入节点名称', trigger: 'blur' }
-  ],
-  projectType: [
-    { required: true, message: '请选择节点类型', trigger: 'change' }
   ]
 };
 
-// 表格列定义
+// 表格列定义 - 移除 projectType 列
 const columns = [
   {
     title: '组织名称',
     dataIndex: 'name',
     key: 'name',
-  },
+    width: 200,
-  {
-    title: '组织类型',
-    dataIndex: 'projectType',
-    key: 'projectType',
-    width: 150,
   },
   {
     title: '状态',
-    dataIndex: 'status',
+    dataIndex: 'disabled',
-    key: 'status',
+    key: 'disabled',
     width: 100,
   },
   {
     title: '创建时间',
-    dataIndex: 'createTime',
+    dataIndex: 'created_at',
-    key: 'createTime',
+    key: 'created_at',
     width: 180,
   },
   {
     title: '更新时间',
-    dataIndex: 'updateTime',
+    dataIndex: 'updated_at',
-    key: 'updateTime',
+    key: 'updated_at',
     width: 180,
   },
   {
@@ -281,49 +182,110 @@ const columns = [
   },
 ];
 
-// 初始化数据
+/**
-const initData = () => {
+ * 获取节点的层级
-  dataSource.value = convertData(originalData.value);
+ * @param {Object} node 节点数据
+ * @param {Array} data 数据源
+ * @param {number} level 当前层级
+ * @returns {number} 节点层级（0表示第一层，1表示第二层，2表示第三层）
+ */
+const getNodeLevel = (node, data = null, level = 0) => {
+  // 如果是根节点，直接返回0
+  if (!node.parentId || node.parentId === "") {
+    return 0;
+  }
+  
+  // 如果没有传入data，使用dataSource
+  const searchData = data || dataSource.value;
+  
+  // 递归查找父节点
+  const findParentLevel = (nodes, targetId, currentLevel) => {
+    for (const item of nodes) {
+      if (item.id === targetId) {
+        return currentLevel;
+      }
+      if (item.children && item.children.length > 0) {
+        const found = findParentLevel(item.children, targetId, currentLevel + 1);
+        if (found !== -1) {
+          return found;
+        }
+      }
+    }
+    return -1;
+  };
+  
+  // 查找父节点的层级
+  const parentLevel = findParentLevel(searchData, node.parentId, 0);
+  
+  // 返回当前节点层级（父节点层级 + 1）
+  return parentLevel + 1;
 };
 
+/**
+ * 获取表格数据
+ * @returns {Promise<void>}
+ */
+async function getList() {
+    try {
+        showLoading()
+        const { pageSize, current } = paginationState
+        const { success, data, total } = await apis.serviceMenu
+            .getNodeList({
+                pageSize,
+                current: current
+            })
+            .catch(() => {
+                throw new Error()
+            })
+        hideLoading()
+        if (config('http.code.success') === success) {
+            console.log("接口返回数据:", data)
+            listData.value = data || [];
+            paginationState.total = total || 0;
+            
+            // 转换数据格式用于表格显示
+            dataSource.value = convertData(listData.value);
+        }
+    } catch (error) {
+        hideLoading()
+        console.error('获取数据失败:', error);
+        message.error('获取数据失败');
+    }
+}
+
 // 删除节点
-const handleDelete = (record) => {
+const handleDelete = async (record) => {
   Modal.confirm({
     title: '确认删除',
     content: `确定要删除"${record.name}"吗？${record.children && record.children.length > 0 ? '此操作将同时删除所有子节点。' : ''}`,
-    onOk() {
+    async onOk() {
-      deleteNode(originalData.value, record.orgId);
+        console.log('删除节点:', record.id);
-      initData();
+      try {
+        // 调用删除接口
+        const { success } = await apis.serviceMenu.delNode(record.id);
+        if (config('http.code.success') === success) {
           message.success('删除成功');
+          // 重新获取数据
+          await getList();
+        } else {
+          message.error('删除失败');
+        }
+      } catch (error) {
+        console.error('删除失败:', error);
+        message.error('删除失败');
+      }
     }
   });
 };
 
-// 递归删除节点
-const deleteNode = (data, orgId) => {
-  for (let i = 0; i < data.length; i++) {
-    if (data[i].orgId === orgId) {
-      data.splice(i, 1);
-      return true;
-    }
-    if (data[i].subOrgList && data[i].subOrgList.length > 0) {
-      if (deleteNode(data[i].subOrgList, orgId)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-
 // 显示添加模态框
 const showAddModal = (parent = null) => {
   currentParent.value = parent;
   isEditing.value = false;
-  // 重置表单
+  // 重置表单 - 默认启用状态
   Object.assign(formState, {
     name: '',
-    projectType: 'Supervision',
+    status: false  // 默认为启用状态
-    status: 0
   });
   addModalVisible.value = true;
 };
@@ -338,38 +300,26 @@ const handleAdd = async () => {
   confirmLoading.value = true;
 
   try {
-    // 模拟异步操作
+    // 准备提交数据 - 始终包含 parentId 字段
-    await new Promise(resolve => setTimeout(resolve, 500));
+    const submitData = {
-
+      companyId: 'c001',
-    const newNode = {
+      disabled: formState.status, // 状态为false表示启用，true表示禁用
-      id: Date.now(),
-      orgId: `new_${Date.now()}`,
       name: formState.name,
-      parentId: currentParent.value ? currentParent.value.orgId : '0',
+      status: "",
-      path: currentParent.value ? `${currentParent.value.path}/${formState.name}` : `/0/${formState.name}`,
+      parentId: currentParent.value ? currentParent.value.id : "" // 使用 id 字段
-      status: formState.status,
-      tenantId: "1813150290048446464",
-      projectType: formState.projectType,
-      createBy: "system",
-      createTime: new Date().toISOString().split('T')[0],
-      updateBy: "system",
-      updateTime: new Date().toISOString().split('T')[0],
-      subOrgList: [],
-      disabled: false
     };
 
-    if (currentParent.value) {
+    // 调用添加接口
-      // 添加到父节点的 subOrgList
+    const { success } = await apis.serviceMenu.createNode(submitData);
-      addChildNode(originalData.value, currentParent.value.orgId, newNode);
-    } else {
-      // 添加为根节点
-      originalData.value.push(newNode);
-    }
     
-    // 重新初始化数据以触发响应式更新
+    if (config('http.code.success') === success) {
-    initData();
       addModalVisible.value = false;
       message.success('添加成功');
+      // 重新获取数据
+      await getList();
+    } else {
+      message.error('添加失败');
+    }
   } catch (error) {
     console.error('添加失败:', error);
     message.error('添加失败');
@@ -378,82 +328,12 @@ const handleAdd = async () => {
   }
 };
 
-// 递归添加子节点
-const addChildNode = (data, parentId, newNode) => {
-  for (let i = 0; i < data.length; i++) {
-    if (data[i].orgId === parentId) {
-      if (!data[i].subOrgList) {
-        data[i].subOrgList = [];
-      }
-      data[i].subOrgList.push(newNode);
-      return true;
-    }
-    if (data[i].subOrgList && data[i].subOrgList.length > 0) {
-      if (addChildNode(data[i].subOrgList, parentId, newNode)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-
 // 取消添加
 const handleCancel = () => {
   addModalVisible.value = false;
 };
 
 onMounted(() => {
-  initData();
+  getList();
 });
 </script>
-
-<style scoped>
-.org-management {
-  margin: 0 auto;
-  padding: 10px;
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-  padding: 0 10px;
-}
-
-.org-table {
-  background: white;
-  border-radius: 8px;
-  padding: 20px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.actions {
-  display: flex;
-  gap: 8px;
-}
-
-.header h1 {
-  margin: 0;
-  color: #1f1f1f;
-  font-size: 24px;
-  font-weight: 600;
-}
-
-:deep(.ant-table-thead > tr > th) {
-  background-color: #fafafa;
-  font-weight: 600;
-}
-
-:deep(.ant-table-row-level-0) {
-  font-weight: 600;
-}
-
-:deep(.ant-table-row-level-1) {
-  font-weight: 500;
-}
-
-:deep(.ant-table-row-level-2) {
-  font-weight: 400;
-}
-</style>

src/views/serviceMenu/serviceSites/components/EditDialog.vue

@@ -26,9 +26,10 @@
                     <a-col :span="12">
                         <a-form-item :label="'站点类型'" name="type" :required="true">
                             <a-select v-model:value="formData.type" @change="handleChange">
-                                <a-select-option value="type1">社区服务中心</a-select-option>
+                               <a-select-option v-for="item in dicsStore.dictOptions.Station_Type" :key="item.dval"
-                                <a-select-option value="type2">养老服务站</a-select-option>
+                                    :value="item.dval">
-                                <a-select-option value="type3">综合服务中心</a-select-option>
+                                     {{ item.introduction }}
+                                </a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
@@ -45,11 +46,10 @@
                     <a-col :span="12">
                         <a-form-item :label="'星级等级'" name="starLevel">
                             <a-select v-model:value="formData.starLevel">
-                                <a-select-option value="1">一星</a-select-option>
+                                 <a-select-option v-for="item in dicsStore.dictOptions.Level" :key="item.dval"
-                                <a-select-option value="2">二星</a-select-option>
+                                    :value="item.dval">
-                                <a-select-option value="3">三星</a-select-option>
+                                     {{ item.introduction }}
-                                <a-select-option value="4">四星</a-select-option>
+                                </a-select-option>
-                                <a-select-option value="5">五星</a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
@@ -63,12 +63,11 @@
             </a-card>
 
             <!-- 地址信息区域 -->
-            <a-card class="mb-4" title="地址信息">
+            <a-card class="mb-4" title="地址信息" style="margin-top: 20px" >
                 <a-row :gutter="16">
                     <a-col :span="24">
                         <a-form-item :label="'服务中心地址'" name="address">
-                            <a-cascader v-model:value="formData.address" :options="addressOptions"
+                            <AreaCascader v-model:value="formData.address" @change="onAreaChange" />
-                                placeholder="请选择省/市/区" style="width: 100%"></a-cascader>
                         </a-form-item>
                     </a-col>
                     <a-col :span="24">
@@ -92,7 +91,7 @@
             </a-card>
 
             <!-- 站点信息区域 -->
-            <a-card class="mb-4" title="站点信息">
+            <a-card class="mb-4" title="站点信息" style="margin-top: 20px">
                 <a-row :gutter="16">
                     <a-col :span="12">
                         <a-form-item :label="'建成时间'" name="buildTime">
@@ -116,7 +115,7 @@
             </a-card>
 
             <!-- 服务信息区域 -->
-            <a-card class="mb-4" title="服务信息">
+            <a-card class="mb-4" title="服务信息" style="margin-top: 20px">
                 <a-row :gutter="16">
                     <a-col :span="12">
                         <a-form-item :label="'开始营业时间'" name="openTime">
@@ -130,9 +129,10 @@
                     <a-col :span="12">
                         <a-form-item :label="'营业状态'" name="businessStatus">
                             <a-select v-model:value="formData.businessStatus">
-                                <a-select-option value="open">营业中</a-select-option>
+                                <a-select-option v-for="item in dicsStore.dictOptions.Business_Status" :key="item.dval"
-                                <a-select-option value="closed">已关闭</a-select-option>
+                                    :value="item.dval">
-                                <a-select-option value="suspended">暂停营业</a-select-option>
+                                     {{ item.introduction }}
+                                </a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
@@ -162,7 +162,7 @@
                         </a-form-item>
                     </a-col>
 
-                    <a-col :span="12">
+                    <!-- <a-col :span="12">
                         <a-form-item :label="'是否有厨房'" name="hasKitchen">
                             <a-select v-model:value="formData.hasKitchen">
                                 <a-select-option value="yes">是</a-select-option>
@@ -201,12 +201,12 @@
                         <a-form-item :label="'日间照料中心名称'" name="daycareCenterName">
                             <a-input v-model:value="formData.daycareCenterName" placeholder="请输入日间照料中心名称"></a-input>
                         </a-form-item>
-                    </a-col>
+                    </a-col> -->
                 </a-row>
             </a-card>
 
             <!-- 图片上传区域 -->
-            <a-card class="mb-4" title="图片上传">
+            <a-card class="mb-4" title="图片上传" style="margin-top: 20px">
                 <a-row :gutter="16">
                     <a-col :span="12">
                         <a-form-item :label="'资质附件'" name="qualificationFiles">
@@ -240,11 +240,6 @@
             @update:open="mapVisible = $event"
             @handleGetLng="handleLocationChange"
             @select="handleLocationSelect" />
-        <div v-if="selectedLocation">
-            <p>经纬度: {{ selectedLocation.lnglat }}</p>
-            <p>地址: {{ selectedLocation.address }}</p>
-            <p>名称: {{ selectedLocation.placeName }}</p>
-        </div>
     </a-modal>
 </template>
 
@@ -260,6 +255,8 @@ import { useI18n } from 'vue-i18n'
 import storage from '@/utils/storage'
 import { message } from 'ant-design-vue'
 import MapPickerModal from '@/components/Map/index.vue'
+import { useDicsStore } from '@/store'
+import AreaCascader from '@/components/AreaCascader/index.vue'
 const emit = defineEmits(['ok'])
 const { t } = useI18n() // 解构出t方法
 const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
@@ -378,6 +375,7 @@ const okText = ref(t('button.confirm'))
 const platform = ref('')
 const showMapPicker = ref(false)
 const location = ref('')
+const dicsStore = useDicsStore()
 
 const handleLocationSelect = (lngLat) => {
     console.log('确认选择:', lngLat)