From 205d81017ea5d0d371bd7027deb7a15e0a0216d9 Mon Sep 17 00:00:00 2001 From: "aoli.qu" <408346101@qq.com> Date: Thu, 24 Feb 2022 12:10:57 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DbUpload/DbUpload.vue | 2 +- src/views/notice/NoticeList.vue | 4 ++-- src/views/org/OrgList.vue | 13 +++++----- src/views/person/PersonList.vue | 4 ++-- src/views/security/menu/MenuList.vue | 2 +- src/views/security/role/RoleForm.vue | 6 ++++- src/views/security/role/RoleList.vue | 30 +++++++++++++----------- src/views/security/role/RoleMenuForm.vue | 6 ++--- src/views/security/user/UserForm.vue | 4 ++-- src/views/security/user/UserList.vue | 12 +++++----- 10 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/components/DbUpload/DbUpload.vue b/src/components/DbUpload/DbUpload.vue index 3cb6d63..4b92629 100644 --- a/src/components/DbUpload/DbUpload.vue +++ b/src/components/DbUpload/DbUpload.vue @@ -73,7 +73,7 @@ export default { }, // 有默认值的数字 fileSize:{ - type:Number, + type:[Number, String], default:500 }, }, diff --git a/src/views/notice/NoticeList.vue b/src/views/notice/NoticeList.vue index 0fc421c..871d4dd 100644 --- a/src/views/notice/NoticeList.vue +++ b/src/views/notice/NoticeList.vue @@ -10,7 +10,7 @@ 查询 - 重置 + 重置 @@ -42,7 +42,7 @@ 查询 - 重置 + 重置 diff --git a/src/views/org/OrgList.vue b/src/views/org/OrgList.vue index 1601efd..926f98b 100644 --- a/src/views/org/OrgList.vue +++ b/src/views/org/OrgList.vue @@ -3,7 +3,7 @@
- 新增机构 + 新增机构
编辑 - - + + 删除 @@ -27,7 +27,7 @@
- 新增项目 + 新增项目
编辑 - - + + 删除 @@ -143,6 +143,7 @@ }) }, handleOk () { + console.log("handleok---orgList") if (this.orgType === 1) { this.$refs.table1.refresh() } else { diff --git a/src/views/person/PersonList.vue b/src/views/person/PersonList.vue index 1ca100c..de53390 100644 --- a/src/views/person/PersonList.vue +++ b/src/views/person/PersonList.vue @@ -40,7 +40,7 @@ 查询 - 重置 + 重置 @@ -48,7 +48,7 @@
- 新增人员 + 新增人员 - +
From 3159f03dfc882478458d05fd6a44e7a87bdb92b4 Mon Sep 17 00:00:00 2001 From: cgd_mac <349008059@qq.com> Date: Fri, 25 Feb 2022 09:15:11 +0800 Subject: [PATCH 20/26] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=BA=BF?= =?UTF-8?q?=E4=B8=8Atab=E4=B8=8D=E8=83=BD=E9=BB=98=E8=AE=A4=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchCom/index.vue | 2 +- src/views/mycollection/index.vue | 134 +++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 38 deletions(-) diff --git a/src/components/SearchCom/index.vue b/src/components/SearchCom/index.vue index 6f2f089..a0fc46c 100644 --- a/src/components/SearchCom/index.vue +++ b/src/components/SearchCom/index.vue @@ -24,7 +24,7 @@ - + 查询 重置 diff --git a/src/views/mycollection/index.vue b/src/views/mycollection/index.vue index c099a22..d58b10e 100644 --- a/src/views/mycollection/index.vue +++ b/src/views/mycollection/index.vue @@ -1,54 +1,104 @@