diff --git a/src/views/modules/organize/deptofficer.vue b/src/views/modules/organize/deptofficer.vue
index e5f94cbb..87a47dbc 100644
--- a/src/views/modules/organize/deptofficer.vue
+++ b/src/views/modules/organize/deptofficer.vue
@@ -99,13 +99,10 @@ export default {
dataForm: {
id: ''
},
- deptofficerAddVisible: false,
- pidList: []
+ deptofficerAddVisible: false
}
},
mounted () {
- this.pidList = JSON.parse(this.$route.query.pidList)
- console.log(this.$route.query.deptId)
this.dataForm.deptId = this.$route.query.deptId
this.getDataList()
},
@@ -124,7 +121,7 @@ export default {
backToDeptList () {
this.$emit('refreshDataList')
this.$parent.selectComponent = 'Metasysdept'
- this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
+ this.$router.push({ path: '/organize-organizedeptroute' })
},
deptofficerAddHandle (deptId) {
this.deptofficerAddVisible = true
diff --git a/src/views/modules/organize/metaSysDeptManagement-add-or-update.vue b/src/views/modules/organize/metaSysDeptManagement-add-or-update.vue
index 981b7384..f63ecff1 100644
--- a/src/views/modules/organize/metaSysDeptManagement-add-or-update.vue
+++ b/src/views/modules/organize/metaSysDeptManagement-add-or-update.vue
@@ -66,6 +66,14 @@
:min="0"
:label="$t('dept.sort')" style="width: 75%">
+
+
+
{{ $t('cancel') }}
diff --git a/src/views/modules/organize/metasysdept.vue b/src/views/modules/organize/metasysdept.vue
index e3bacb02..5dc608df 100644
--- a/src/views/modules/organize/metasysdept.vue
+++ b/src/views/modules/organize/metasysdept.vue
@@ -26,27 +26,17 @@
{{scope.$index+1}}
-
+
{{ $t('update') }}
{{ $t('delete') }}
- 查看
管理
-
-
@@ -62,8 +52,7 @@ export default {
data () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/cloudAnalysis/metasysdept/page',
- getDataListIsPage: true,
+ getDataListURL: '/cloudAnalysis/metasysdept/list',
deleteURL: '/cloudAnalysis/metasysdept',
deleteIsBatch: true
},
@@ -76,16 +65,8 @@ export default {
}
},
mounted () {
- if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
- this.pidList = JSON.parse(this.$route.query.pidList)
- this.dataForm.pid = this.pidList[this.pidList.length - 1]
- } else {
- this.dataForm.pid = 0
- }
this.getDataList()
},
- created: function () {
- },
components: {
TableTreeColumn,
AddOrUpdate
@@ -93,35 +74,7 @@ export default {
methods: {
manageHandle (deptId, pid) {
this.$parent.selectComponent = 'Deptofficer'
- this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList), deptId: deptId } })
- },
- lookHandle (id, pid) {
- this.page = 1
- this.pidList.push(id)
- this.$parent.selectComponent = 'Metasysdept'
- this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
- if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
- this.pidList = JSON.parse(this.$route.query.pidList)
- this.dataForm.pid = this.pidList[this.pidList.length - 1]
- } else {
- this.dataForm.pid = 0
- }
- this.getDataList()
- },
- backToDeptList () {
- this.page = 1
- var m = this.pidList.splice(this.pidList.length - 1, 1)
- m.pop()
- this.$emit('refreshDataList')
- this.$parent.selectComponent = 'Metasysdept'
- this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
- if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
- this.pidList = JSON.parse(this.$route.query.pidList)
- this.dataForm.pid = this.pidList[this.pidList.length - 1]
- } else {
- this.dataForm.pid = 0
- }
- this.getDataList()
+ this.$router.push({ path: '/organize-organizedeptroute', query: { deptId: deptId } })
}
}
}
diff --git a/src/views/modules/organize/sysdeptmanagement.vue b/src/views/modules/organize/sysdeptmanagement.vue
new file mode 100644
index 00000000..01016084
--- /dev/null
+++ b/src/views/modules/organize/sysdeptmanagement.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ 同步
+
+
+
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+
+
+ {{ $t('update') }}
+
+
+
+
+
+
+
+
+
+
+