Jelajahi Sumber

update 代理管理 岗位改成部门

linweizeng 2 tahun lalu
induk
melakukan
d086a89cf9

+ 8 - 1
src/business/platform/org/employee/mixins/panelTree.js

@@ -300,6 +300,9 @@ export default {
         getPositionTreeData(params).then(res => {
         getPositionTreeData(params).then(res => {
           this.loadingTree = false
           this.loadingTree = false
           const arr = JSON.parse(JSON.stringify(res.data))
           const arr = JSON.parse(JSON.stringify(res.data))
+        if(arr.length > 0 && arr[0].name == '岗位树'){
+            arr[0].name = '部门树'
+        }
           let treeData
           let treeData
           if (this.$utils.isEmpty(node.data)) {
           if (this.$utils.isEmpty(node.data)) {
             treeData = arr
             treeData = arr
@@ -319,8 +322,12 @@ export default {
           params.posId = node.data.id
           params.posId = node.data.id
         }
         }
         getPositionTreeData(params).then(res => {
         getPositionTreeData(params).then(res => {
+
           this.loadingTree = false
           this.loadingTree = false
-          const arr = JSON.parse(JSON.stringify(res.data))
+          let arr = JSON.parse(JSON.stringify(res.data))
+          if(this.orgAddIndex == 'qita'){
+            arr = arr.filter(item => item.alias !== 'kh')
+          }
           resolve(this.toTree(arr))
           resolve(this.toTree(arr))
         }).catch(res => {
         }).catch(res => {
           this.loadingTree = false
           this.loadingTree = false

+ 4 - 4
src/business/platform/org/employee/panel.vue

@@ -26,7 +26,7 @@
         />
         />
       </div>
       </div>
       <div
       <div
-        :style="{ height:auto}"
+        style="height: 300px"
       >
       >
         <el-scrollbar
         <el-scrollbar
           style="height: 100%;width:100%; padding-bottom:8px;"
           style="height: 100%;width:100%; padding-bottom:8px;"
@@ -53,7 +53,7 @@
     </div>
     </div>
     <ibps-crud
     <ibps-crud
       ref="crud"
       ref="crud"
-      :height="'auto'"
+      :height="'300px'"
       :data="listData"
       :data="listData"
       :toolbars="listConfig.toolbars"
       :toolbars="listConfig.toolbars"
       :search-form="listConfig.searchForm"
       :search-form="listConfig.searchForm"
@@ -149,7 +149,7 @@ export default {
       partyTypeOptions: this.orgAddIndex === 'qita'? this.orgAddList : this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions : partyTypeOptions,
       partyTypeOptions: this.orgAddIndex === 'qita'? this.orgAddList : this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions : partyTypeOptions,
       statusOptions: statusOptions,
       statusOptions: statusOptions,
       genderOptions: genderOptions,
       genderOptions: genderOptions,
-      partyType: this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions[0].value : 'org',
+      partyType: this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions[0].value : 'position',
       // inclueChild: true,
       // inclueChild: true,
       partyId: '',
       partyId: '',
       treeDatas: [],
       treeDatas: [],
@@ -221,7 +221,7 @@ export default {
   watch: {
   watch: {
     showTree: {
     showTree: {
       handler: function(val, oldVal) {
       handler: function(val, oldVal) {
-        this.lazyTree = this.partyType === 'org'
+        this.lazyTree = this.partyType === 'position'
        /* if (val === false) { */
        /* if (val === false) { */
           this.listConfig.searchForm.forms = [
           this.listConfig.searchForm.forms = [
             { prop: 'name', label: '姓名' }
             { prop: 'name', label: '姓名' }

+ 7 - 3
src/views/platform/bpmn/bpmAgent/edit.vue

@@ -184,11 +184,15 @@ export default {
             url: '',
             url: '',
             srcList: [],
             srcList: [],
             orgAddIndex: 'qita',
             orgAddIndex: 'qita',
-            orgAddId: '1040706288339648512,1055070808143036416,1040707811132047360,1040707841519779840',
+            orgAddId: '',
             orgAddList: [
             orgAddList: [
                 {
                 {
-                    value: 'org',
-                    label: '机构'
+                    value: 'position',
+                    label: '部门'
+                },
+                {
+                    value: 'role',
+                    label: '角色'
                 }
                 }
             ]
             ]
         }
         }