linweizeng před 2 roky
rodič
revize
3ed20652ac

+ 0 - 17
src/business/platform/org/employee/dialog.vue

@@ -13,9 +13,6 @@
       <ibps-selector-panel
         ref="panel"
         v-bind="scope"
-        :orgAddId="orgAddId"
-        :orgAddIndex="orgAddIndex"
-        :orgAddList="orgAddList"
         :party-type-id="partyTypeId"
         :seeting-search-party-type="seetingSearchPartyType"
         :current-org-id="currentOrgId"
@@ -40,20 +37,6 @@ export default {
     IbpsSelectorPanel
   },
   props: {
-    orgAddIndex: {
-      type: String,
-      default: '',
-    },
-    orgAddId:{
-        type: String,
-      default: '',
-    },
-    orgAddList:{
-        type: Array,
-        default: ()=>{
-            return []
-        }
-    },
     className: String,
     filter: {
       type: Array,

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

@@ -124,20 +124,6 @@ export default {
         isSuperInitTree: { // 是否为超管初始化树类型数据
             type: Object,
             default: () => {}
-        },
-        orgAddIndex: {
-            type: String,
-            default: ''
-        },
-        orgAddId: {
-            type: String,
-            default: ''
-        },
-        orgAddList: {
-            type: Array,
-            default: () => {
-                return []
-            }
         }
     },
     data () {
@@ -146,7 +132,7 @@ export default {
             dialogFormVisible: false, // 弹窗
             editId: '',
             title: '更多查询条件',
-            partyTypeOptions: this.orgAddIndex === 'qita' ? this.orgAddList : this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions : partyTypeOptions,
+            partyTypeOptions: this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions : partyTypeOptions,
             statusOptions: statusOptions,
             genderOptions: genderOptions,
             partyType: this.$utils.isNotEmpty(this.customPartyTypeOptions) ? this.customPartyTypeOptions[0].value : 'org',
@@ -268,7 +254,7 @@ export default {
     mounted () {
         if (this.showTree) {
             if (this.isUseScope) return
-            this.loadTreeData(true)
+            this.loadTreeData(false)
         } else {
             this.loadListData()
         }
@@ -429,7 +415,7 @@ export default {
             // 选择器范围模式函数回调
             this.moreSearchParams = {}
             // 普通模式与选择器范围模式切换调用
-            !this.isUseScope ? this.loadTreeData() : null
+            !this.isUseScope ? this.loadTreeData(false) : null
             this.scriptExecuteTime = false // 初始化脚本类型时的函数调用
             this.$emit('change-party-type', value)
         },

+ 3 - 18
src/business/platform/org/employee/selector.vue

@@ -8,15 +8,13 @@
     />
     <!-- 选择器 -->
     <ibps-employee-selector-dialog
-      :orgAddId="orgAddId"
-      :orgAddIndex="orgAddIndex"
-      :orgAddList="orgAddList"
       :visible="selectorVisible"
       :value="selectorValue"
       :multiple="multiple"
       :class="className"
       :party-type-id="partyTypeId"
       :current-org-id="currentOrgId"
+      :customPartyTypeOptions="customPartyTypeOptions"
       @close="visible => selectorVisible = visible"
       @action-event="handleSelectorActionEvent"
     />
@@ -46,20 +44,6 @@ export default {
   },
   mixins: [emitter],
   props: {
-    orgAddIndex: {
-      type: String,
-      default: '',
-    },
-    orgAddId:{
-        type: String,
-      default: '',
-    },
-    orgAddList:{
-        type: Array,
-        default: ()=>{
-            return []
-        }
-    },
     className: String,
     partyTypeId: [String, Number],
     currentOrgId: [String, Number],
@@ -113,7 +97,8 @@ export default {
     readonlyText: {
       type: String,
       default: 'original'
-    }
+    },
+    customPartyTypeOptions: [Object, Array],
   },
   data() {
     return {

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

@@ -23,7 +23,7 @@
                 </el-col>
             </el-row>
             <el-form-item label="委托人:" prop="delegatorId">
-                <ibps-employee-selector v-if="!readonly" v-model="bpmAgent.delegatorId" :orgAddId="orgAddId" :orgAddIndex="orgAddIndex" :orgAddList="orgAddList" @callback="callbackDelegatorrInfo" />
+                <ibps-employee-selector v-if="!readonly" v-model="bpmAgent.delegatorId" :customPartyTypeOptions="customPartyTypeOptions" @callback="callbackDelegatorrInfo" />
                 <span v-else>{{ bpmAgent.delegatorName }}</span>
             </el-form-item>
             <el-row>
@@ -43,7 +43,7 @@
 
             <!-- 全部代理 || 部分代理 -->
             <el-form-item v-if="bpmAgent.agentType === 'all' || bpmAgent.agentType === 'part'" label="代理人:" prop="agenterId">
-                <ibps-employee-selector v-if="!readonly" v-model="bpmAgent.agenterId" :orgAddId="orgAddId" :orgAddIndex="orgAddIndex" :orgAddList="orgAddList" @callback="callbackAgenterInfo" />
+                <ibps-employee-selector v-if="!readonly" v-model="bpmAgent.agenterId" :customPartyTypeOptions="customPartyTypeOptions" @callback="callbackAgenterInfo" />
                 <span v-else>{{ bpmAgent.agenterName }}</span>
             </el-form-item>
 
@@ -183,14 +183,11 @@ export default {
             ],
             url: '',
             srcList: [],
-            orgAddIndex: 'qita',
-            orgAddId: '1040706288339648512,1055070808143036416,1040707811132047360,1040707841519779840',
-            orgAddList: [
-                {
-                    value: 'org',
-                    label: '机构'
-                }
-            ]
+
+            customPartyTypeOptions: [{
+                label: "岗位",
+                value: "position"
+            }]
         }
     },
     computed: {