eoss-mobiles 0.3.55 → 0.3.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.55",
+  "version": "0.3.56",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Circulate.vue

@@ -191,6 +191,7 @@ export default {
       type: String,
       default: ''
     },
+    selectorParams: { type: Object, default: () => {} },
     title: {
       type: String,
       default: ''
@@ -202,7 +203,7 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      currentOrgSelectorParams: {only_filid:true},
+      currentOrgSelectorParams: { only_filid: true },
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
       foreignOrgSelectorParams: { roleid: '' },
@@ -324,13 +325,21 @@ export default {
   },
   created() {
     // this.getMessage();
-    this.currentOrgSelectorParams.employee = this.currentOrgSelectorParams.persongroup = { pid: this.orgId || JSON.parse($.getStorage('userInfo')).orgId};
-    this.foreignOrgSelectorParams.nofilid = this.orgId || JSON.parse($.getStorage('userInfo')).orgId
-    this.foreignOrgSelectorParams.myUserid = ''
+    this.currentOrgSelectorParams.employee =
+      this.currentOrgSelectorParams.persongroup = {
+        pid: this.orgId || JSON.parse($.getStorage('userInfo')).orgId
+      };
+    this.foreignOrgSelectorParams.nofilid =
+      this.orgId || JSON.parse($.getStorage('userInfo')).orgId;
+    this.foreignOrgSelectorParams.myUserid = '';
     this.foreignOrgSelectorParams.filgroup = {
       pid: 'root',
       myUserid: this.userId
     };
+    this.foreignOrgSelectorParams = {
+      ...this.foreignOrgSelectorParams,
+      ...this.selectorParams
+    };
   },
   computed: {},
   methods: {
@@ -340,7 +349,7 @@ export default {
         params: {
           processDefinitionId: this.defId,
           businessId: this.businessId,
-          pendingId:this.pendingId,
+          pendingId: this.pendingId,
           openMode: this.pendingId ? '' : 'samepage'
         }
       };
@@ -363,10 +372,12 @@ export default {
     },
     onSubmit() {
       let params = {
-        url: this.pendingId?endFlowAndStartTaskCircularRead : directStartTaskCircularRead,
+        url: this.pendingId
+          ? endFlowAndStartTaskCircularRead
+          : directStartTaskCircularRead,
         params: {
           businessId: this.businessId,
-          pendingId:this.pendingId,
+          pendingId: this.pendingId,
           processDefinitionId: this.defId,
           notificationMsg: this.form.notificationMsg,
           notificationType: this.form.notificationType,
@@ -378,9 +389,9 @@ export default {
         },
         type: 'post'
       };
-      if( !this.form.nextOtherOrgObj && !this.form.nextCurrentOrgObj ){
-         this.$toast('请选择办理对象')
-        return
+      if (!this.form.nextOtherOrgObj && !this.form.nextCurrentOrgObj) {
+        this.$toast('请选择办理对象');
+        return;
       }
       this.$toast.loading({
         message: '提交中...',

package/packages/flow/src/components/Handle.vue

@@ -661,6 +661,10 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    selectorParams:{
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -1622,7 +1626,7 @@ export default {
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
                       : currentOrgparams[i],
-                  only_filid:true
+                  only_filid:true,
                 };
               });
               that.currentOrgSelectorTabs =
@@ -1642,7 +1646,8 @@ export default {
                       ? 'root'
                       : foreignOrgparams[i],
                   nofilid:foreignOrgparams[i] == 'nofilidorg' ? that.orgId || JSON.parse($.getStorage('userInfo')).orgId : foreignOrgparams[i] == 'other' ? 1 : 0,
-                  myUserid: x == 'filgroup' ? $.getStorage('userId') : ''
+                  myUserid: x == 'filgroup' ? $.getStorage('userId') : '',
+                  ...that.selectorParams
                 };
               });
               that.foreignOrgSelectorTabs =

package/packages/flow/src/components/taskUnionExamine.vue

@@ -198,7 +198,7 @@ export default {
     };
     this.otherParams.myUserid = this.params.myUserid = $.getStorage('userId') || this.userId || '';
     this.params.nofilid = this.otherParams.nofilid = this.orgId || JSON.parse($.getStorage('userInfo')).orgId || this.userId || '';
-    this.params = {...this.params,...this.selectorParams}
+    this.params = {...this.params}
     this.otherParams = {...this.otherParams,...this.selectorParams}
     // this.newMultiple = this.multiple;
     if (this.type === 'taskReview') return this.getTaskReview();

package/src/index.js

@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.3.55',
+  version: '0.3.56',
   install,
   Button,
   ButtonGroup,