@@ -54,34 +54,11 @@
:data="boundUsers"
v-loading="boundLoading"
height="400"
- @selection-change="handleBoundUserSelectionChange">
+ @selection-change="handleBoundUserSelectionChange"
+ :row-key="row => row.userId">
-
+
-
-
-
- {{ scope.row.roleType === 1 ? '管理员' : '普通用户' }}
-
-
-
-
-
-
- {{ scope.row.status === 1 ? '启用' : '禁用' }}
-
-
-
-
-
-
- 改角色
-
-
- 解绑
-
-
-
@@ -101,13 +78,12 @@
From d5a333f32c2fac9df7aec1fbd25ec5aa83ebc410 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 11 Sep 2025 17:07:11 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=A1=8C=E5=AD=90?=
=?UTF-8?q?=E6=91=86=E6=94=BE=E5=BD=A2=E5=BC=8F=EF=BC=8C=E4=BC=9A=E5=8A=A1?=
=?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/integrated/meetingDeskLayout.ts | 41 +++++
.../integrated/meeting/cleanUser/form.vue | 11 +-
.../integrated/meeting/cleanUser/index.vue | 6 +-
.../meeting/meetingDeskLayout/form.vue | 165 ++++++++++++++++++
.../meeting/meetingDeskLayout/index.vue | 127 ++++++++++++++
.../integrated/meeting/meetingRoom/form.vue | 106 ++++++++++-
.../integrated/meeting/meetingRoom/index.vue | 2 +
.../integrated/meeting/serviceUser/form.vue | 116 ++++++++++++
.../integrated/meeting/serviceUser/index.vue | 132 ++++++++++++++
9 files changed, 687 insertions(+), 19 deletions(-)
create mode 100644 src/api/integrated/meetingDeskLayout.ts
create mode 100644 src/views/integrated/meeting/meetingDeskLayout/form.vue
create mode 100644 src/views/integrated/meeting/meetingDeskLayout/index.vue
create mode 100644 src/views/integrated/meeting/serviceUser/form.vue
create mode 100644 src/views/integrated/meeting/serviceUser/index.vue
diff --git a/src/api/integrated/meetingDeskLayout.ts b/src/api/integrated/meetingDeskLayout.ts
new file mode 100644
index 0000000..a9e82ba
--- /dev/null
+++ b/src/api/integrated/meetingDeskLayout.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/integrated/meetingDeskLayout/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/integrated/meetingDeskLayout',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/integrated/meetingDeskLayout/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/integrated/meetingDeskLayout',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/integrated/meetingDeskLayout',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/views/integrated/meeting/cleanUser/form.vue b/src/views/integrated/meeting/cleanUser/form.vue
index 4f8ecee..fd75723 100644
--- a/src/views/integrated/meeting/cleanUser/form.vue
+++ b/src/views/integrated/meeting/cleanUser/form.vue
@@ -1,7 +1,7 @@
-
+
@@ -15,11 +15,7 @@
-
-
-
-
-
+
@@ -39,6 +35,7 @@
\ No newline at end of file
diff --git a/src/views/integrated/meeting/meetingDeskLayout/index.vue b/src/views/integrated/meeting/meetingDeskLayout/index.vue
new file mode 100644
index 0000000..e5f1a46
--- /dev/null
+++ b/src/views/integrated/meeting/meetingDeskLayout/index.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
-
-
-
-
-
-
- {{ findCategoryPath(categoryOptions, scope.row.categoryId).join(' / ') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+
+
-
-
-
-
From 6ae3b1e35bd6f57961effaac96fe428e1db44a14 Mon Sep 17 00:00:00 2001
From: weiwei
Date: Wed, 17 Sep 2025 16:35:17 +0800
Subject: [PATCH 12/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/mallCategory/form.vue | 2 +-
src/views/supermarket/mallCategory/index.vue | 275 +++----
src/views/supermarket/mallMerchant/form.vue | 2 +-
src/views/supermarket/mallMerchant/index.vue | 254 ++++---
src/views/supermarket/mallProduct/form.vue | 730 +++++++++----------
src/views/supermarket/mallProduct/index.vue | 597 +++++++--------
src/views/supermarket/shopCategory/form.vue | 6 +-
src/views/supermarket/shopSku/index.vue | 201 ++---
src/views/supermarket/shopSpu/index.vue | 2 +-
9 files changed, 1067 insertions(+), 1002 deletions(-)
diff --git a/src/views/supermarket/mallCategory/form.vue b/src/views/supermarket/mallCategory/form.vue
index cd73e38..6c5bb39 100644
--- a/src/views/supermarket/mallCategory/form.vue
+++ b/src/views/supermarket/mallCategory/form.vue
@@ -31,7 +31,7 @@
-
+
{{ item.label }}
diff --git a/src/views/supermarket/mallCategory/index.vue b/src/views/supermarket/mallCategory/index.vue
index 04eb2b2..5ac9729 100644
--- a/src/views/supermarket/mallCategory/index.vue
+++ b/src/views/supermarket/mallCategory/index.vue
@@ -1,84 +1,109 @@
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删 除
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 绑定用户
- 删除
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-