From 2be616917ec2e21954a441afa2008050fd92c404 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 26 Jul 2024 17:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/school/setting/area.js | 33 ++++
src/router/modules/remaining.ts | 22 ++-
src/views/Basic/Menu/MenuForm.vue | 14 +-
src/views/Basic/Menu/index.vue | 19 ++-
.../Clue/Order/Comp/DialogFeebackAudit.vue | 19 ++-
.../Clue/Order/Comp/DialogFeebackDetail.vue | 19 ++-
src/views/Clue/Order/Comp/Reback.vue | 6 +-
src/views/Clue/Pool/Comp/DialogSuccess.vue | 37 ++++-
src/views/Clue/Pool/index.vue | 7 +-
src/views/SchoolManagement/Place/index.vue | 14 +-
.../SchoolManagement/Set/Comp/DialogArea.vue | 147 ++++++++++++++++++
.../SchoolManagement/Set/Comp/SettingArea.vue | 105 +++++++++++++
src/views/SchoolManagement/Set/index.vue | 7 +-
13 files changed, 424 insertions(+), 25 deletions(-)
create mode 100644 src/api/school/setting/area.js
create mode 100644 src/views/SchoolManagement/Set/Comp/DialogArea.vue
create mode 100644 src/views/SchoolManagement/Set/Comp/SettingArea.vue
diff --git a/src/api/school/setting/area.js b/src/api/school/setting/area.js
new file mode 100644
index 0000000..c30e01c
--- /dev/null
+++ b/src/api/school/setting/area.js
@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+// 查询列表
+export const getAreaPage = async (params) => {
+ return await request.get({ url: '/admin-api/crm/area/page', params })
+}
+
+export const getAreaSimpleList = async (params) => {
+ return await request.get({ url: '/admin-api/crm/area/simple-list', params })
+}
+
+// 查询详情
+export const getArea = async (id) => {
+ return await request.get({ url: '/admin-api/crm/area/get?id=' + id })
+}
+
+// 新增
+export const createArea = async (data) => {
+ return await request.post({
+ url: '/admin-api/crm/area/create',
+ data: data,
+ isSubmitForm: true
+ })
+}
+
+// 修改
+export const updateArea = async (params) => {
+ return await request.put({ url: '/admin-api/crm/area/update', data: params })
+}
+
+// 删除
+export const deleteArea = async (id) => {
+ return await request.delete({ url: '/admin-api/crm/area/delete?id=' + id })
+}
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 326aad7..3508257 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -130,7 +130,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
// }
// ]
// },
-
+ // {
+ // path: '/Basic',
+ // component: Layout,
+ // name: 'Basic',
+ // meta: {},
+ // redirect: '/Basic/menu',
+ // children: [
+ // {
+ // path: 'menu',
+ // component: () => import('@/views/Basic/Menu/index.vue'),
+ // name: 'Menu',
+ // meta: {
+ // canTo: true,
+ // hidden: true,
+ // noTagsView: false,
+ // icon: 'ep:user',
+ // title: '菜单管理'
+ // }
+ // }
+ // ]
+ // },
{
path: '/login',
component: () => import('@/views/Login/Login.vue'),
diff --git a/src/views/Basic/Menu/MenuForm.vue b/src/views/Basic/Menu/MenuForm.vue
index 3fa39ea..5bdbd6a 100644
--- a/src/views/Basic/Menu/MenuForm.vue
+++ b/src/views/Basic/Menu/MenuForm.vue
@@ -10,7 +10,7 @@
{
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
- getOptions()
if (parentId) {
formData.value.parentId = parentId
}
@@ -177,13 +180,6 @@ const open = async (type: string, id?: number, parentId?: number) => {
}
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
-const appList = ref([])
-const getOptions = () => {
- MenuApi.getServiceAppList().then((data) => {
- appList.value = data
- })
-}
-
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
const submitForm = async () => {
diff --git a/src/views/Basic/Menu/index.vue b/src/views/Basic/Menu/index.vue
index ad4f5d6..7720244 100644
--- a/src/views/Basic/Menu/index.vue
+++ b/src/views/Basic/Menu/index.vue
@@ -62,6 +62,11 @@
+
+
+ {{ getServiceName(row.serviceId) }}
+
+
@@ -77,7 +82,7 @@
-
+
diff --git a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
index 5e42600..815cfbd 100644
--- a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
+++ b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
@@ -1,6 +1,11 @@
diff --git a/src/views/Clue/Order/Comp/DialogFeebackDetail.vue b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
index bd7db44..8d3f435 100644
--- a/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
+++ b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
@@ -7,6 +7,11 @@
:columns="2"
labelWidth="130px"
/>
+
+
+
+
+
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index e14412c..1ac72a8 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -93,7 +93,7 @@
-
+
详情
-
+
@@ -102,6 +102,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
{
// warehouseOptions.value = data
// })
+ // 获取员工列表
}
// 自定义参数
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 1602cce..578eae8 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -169,7 +169,12 @@
@get-list="getTableList"
@update="handleEdit"
/>
-
+
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index febc57c..4939e7b 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -118,9 +118,9 @@
@@ -234,6 +234,7 @@
diff --git a/src/views/SchoolManagement/Set/Comp/DialogArea.vue b/src/views/SchoolManagement/Set/Comp/DialogArea.vue
new file mode 100644
index 0000000..d02aa75
--- /dev/null
+++ b/src/views/SchoolManagement/Set/Comp/DialogArea.vue
@@ -0,0 +1,147 @@
+
+
+
+
diff --git a/src/views/SchoolManagement/Set/Comp/SettingArea.vue b/src/views/SchoolManagement/Set/Comp/SettingArea.vue
new file mode 100644
index 0000000..3340997
--- /dev/null
+++ b/src/views/SchoolManagement/Set/Comp/SettingArea.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 新增
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/SchoolManagement/Set/index.vue b/src/views/SchoolManagement/Set/index.vue
index c42eab1..0b620a3 100644
--- a/src/views/SchoolManagement/Set/index.vue
+++ b/src/views/SchoolManagement/Set/index.vue
@@ -4,15 +4,16 @@
-
+
+
+