Просмотр исходного кода

Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

shenqilong 7 месяцев назад
Родитель
Сommit
b089680287
1 измененных файлов с 19 добавлено и 17 удалено
  1. 19 17
      src/business/platform/org/employee/panel.vue

+ 19 - 17
src/business/platform/org/employee/panel.vue

@@ -13,8 +13,8 @@
             currentOrgIdValue === ''
               ? false
               : $store.getters.isSuper
-                ? false
-                : !isUseScope
+              ? false
+              : !isUseScope
           "
           placeholder="请选择"
           @change="changePartyType"
@@ -55,10 +55,10 @@
                 ? partyType === 'org' && partyTypeId === '3'
                   ? loadOrgTreeNode3
                   : partyType === 'position'
-                    ? partyTypeId === '3'
-                      ? loadPosTreeNode3
-                      : loadPosTreeNode
-                    : loadOrgTreeNode
+                  ? partyTypeId === '3'
+                    ? loadPosTreeNode3
+                    : loadPosTreeNode
+                  : loadOrgTreeNode
                 : null
             "
             :lazy="lazyTree"
@@ -226,7 +226,9 @@ export default {
           { prop: 'createTime', label: '创建时间', width: 100 }
         ]
       },
-      pagination: {},
+      pagination: {
+        limit: 100
+      },
       sorts: {},
       moreSearchParams: {},
       lazyTree: true,
@@ -403,12 +405,12 @@ export default {
         this.partyType === 'org'
           ? 'orgId'
           : this.partyType === 'position'
-            ? 'positionId'
-            : this.partyType === 'role'
-              ? 'roleId'
-              : this.partyType === 'group'
-                ? 'groupId'
-                : ''
+          ? 'positionId'
+          : this.partyType === 'role'
+          ? 'roleId'
+          : this.partyType === 'group'
+          ? 'groupId'
+          : ''
       const deptLists = storeGetters.deptList.map((m) => {
         return m.positionId
       })
@@ -535,10 +537,10 @@ export default {
             ? loadPosTreeNode3
             : loadPosTreeNode
           : value === 'org'
-            ? this.partyTypeId === '3'
-              ? loadOrgTreeNode3
-              : loadOrgTreeNode
-            : null
+          ? this.partyTypeId === '3'
+            ? loadOrgTreeNode3
+            : loadOrgTreeNode
+          : null
       // 选择器范围模式函数回调
       this.moreSearchParams = {}
       // 普通模式与选择器范围模式切换调用