eoss-ui 0.7.60 → 0.7.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-ui.common.js +38 -36
- package/lib/flow.js +32 -30
- package/lib/index.js +1 -1
- package/package.json +1 -1
- package/packages/flow/src/component/FreeCirculation.vue +2 -2
- package/packages/flow/src/component/taskUnionExamine.vue +2 -1
- package/packages/flow/src/freeStartFlow.vue +1 -1
- package/packages/flow/src/main.vue +2 -4
- package/src/index.js +1 -1
package/package.json
CHANGED
|
@@ -81,8 +81,8 @@ export default {
|
|
|
81
81
|
filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
|
|
82
82
|
},
|
|
83
83
|
currentOrgSelectorTabs: ['employee', 'persongroup'],
|
|
84
|
-
foreignOrgSelectorTabs: ['enterprise', '
|
|
85
|
-
foreignOrgSelectorParams: {
|
|
84
|
+
foreignOrgSelectorTabs: ['enterprise', 'filgroup'],
|
|
85
|
+
foreignOrgSelectorParams: {enterprise:{filid: 'other', roleid: '', nofilid:sessionStorage.getItem('orgId')},filgroup:{filid: sessionStorage.getItem('orgId'), roleid: '', nofilid: sessionStorage.getItem('orgId')},roleid:'' },
|
|
86
86
|
loading: null
|
|
87
87
|
};
|
|
88
88
|
},
|
|
@@ -491,7 +491,8 @@ export default {
|
|
|
491
491
|
this.foreignOrgTabs.map((x, i) => {
|
|
492
492
|
this.otherParams[x] = {
|
|
493
493
|
filid: param[i],
|
|
494
|
-
roleid: this.selectorParams.roleid
|
|
494
|
+
roleid: this.selectorParams.roleid,
|
|
495
|
+
nofilid: sessionStorage.getItem('orgId')
|
|
495
496
|
};
|
|
496
497
|
});
|
|
497
498
|
}
|
|
@@ -311,7 +311,7 @@
|
|
|
311
311
|
:disableds="otherOrgDisabledObjId"
|
|
312
312
|
@change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
|
|
313
313
|
:types="['enterprise']"
|
|
314
|
-
:params="{ filid: 'all',roleid:selectorParams.roleid }"
|
|
314
|
+
:params="{ filid: 'all',roleid:selectorParams.roleid, nofilid:sessionStorage.getItem('orgId') }"
|
|
315
315
|
|
|
316
316
|
/>
|
|
317
317
|
</el-form-item>
|
|
@@ -3077,13 +3077,11 @@ export default {
|
|
|
3077
3077
|
filid:
|
|
3078
3078
|
foreignOrgparams[i] == 'my'
|
|
3079
3079
|
? choiceOrgId
|
|
3080
|
-
: foreignOrgparams[i] == 'nofilidorg' || foreignOrgparams[i] == 'nofiliddept' ? '' : foreignOrgparams[i],
|
|
3080
|
+
: foreignOrgparams[i] == 'nofilidorg' || foreignOrgparams[i] == 'nofiliddept' ? 'other' : foreignOrgparams[i],
|
|
3081
3081
|
nofilid:foreignOrgparams[i] == 'nofilidorg'? sessionStorage.getItem('orgId') :foreignOrgparams[i] == 'nofiliddept'? sessionStorage.getItem('depId') : foreignOrgparams[i] == 'other' ? 1 : 0,
|
|
3082
3082
|
roleid:this.circularReadParamsMap.circularReadOrgRoleCode || this.foreignOrgSelectorParams.roleid,
|
|
3083
3083
|
};
|
|
3084
|
-
|
|
3085
|
-
this.foreignOrgSelectorParams[x].id= `${foreignOrgparams[i] == 'nofilidorg' ? sessionStorage.getItem('orgId')+'-org-0' : sessionStorage.getItem('depId')+'-dep-0'}`
|
|
3086
|
-
}
|
|
3084
|
+
|
|
3087
3085
|
});
|
|
3088
3086
|
}
|
|
3089
3087
|
this.circularReadParamsMap = circularReadParamsMap || {};
|