diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 71d43f8bb..27c44e332 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -348,6 +348,11 @@
+
+
+
+
+
@@ -378,6 +383,7 @@ import ComplaintManagement from "./manage/components/ComplaintManagement";
import MicroApps from "../components/MicroApps";
import UserSelect from "../components/UserSelect.vue";
import ImgUpload from "../components/ImgUpload.vue";
+import Approve from "./manage/approve/index.vue";
import ApproveDetails from "./manage/approve/details.vue";
import notificationKoro from "notification-koro1";
import emitter from "../store/events";
@@ -385,6 +391,7 @@ import SearchBox from "../components/SearchBox.vue";
export default {
components: {
+ Approve,
SearchBox,
ApproveDetails,
ImgUpload,
@@ -457,6 +464,7 @@ export default {
complaintShow: false,
+ approveShow: false,
approveDetails: {id: 0},
approveDetailsShow: false,
}
@@ -1173,6 +1181,9 @@ export default {
onTabbarClick(act, params = '') {
switch (act) {
+ case 'approve':
+ this.approveShow = true
+ break;
case 'createGroup':
this.onAddMenu('group')
break;
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index 168f272d4..537d19873 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -452,7 +452,6 @@ export default {
// 点击应用
applyClick(item, params = '') {
switch (item.value) {
- case 'approve':
case 'calendar':
case 'file':
case 'setting':
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 2ac788e9f..c848a5aff 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -34,11 +34,6 @@ export default [
path: 'messenger/:dialogAction?',
component: () => import('./pages/manage/messenger.vue'),
},
- {
- name: 'manage-approve',//审批
- path: 'approve',
- component: () => import('./pages/manage/approve/index.vue'),
- },
{
name: 'manage-setting',
path: 'setting',
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index b4e31f3f0..22aa70d7e 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -198,6 +198,25 @@
}
}
+.overlay-content {
+ .page-approve {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ .approve-wrapper {
+ .approve-head {
+ .approve-nav {
+ .common-nav-back {
+ display: none;
+ }
+ }
+ }
+ }
+ }
+}
+
.approve-details {
flex: 1 1 auto;
display: flex;