eoss-mobiles 0.3.53 → 0.3.55

package/package.json

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

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

@@ -140,6 +140,7 @@ import {
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
+import $ from '../../../../src/utils/util';
 export default {
   name: 'Handle',
   inheritAttrs: false,
@@ -201,7 +202,7 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      currentOrgSelectorParams: {},
+      currentOrgSelectorParams: {only_filid:true},
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
       foreignOrgSelectorParams: { roleid: '' },
@@ -323,8 +324,8 @@ export default {
   },
   created() {
     // this.getMessage();
-    this.currentOrgSelectorParams.employee = { pid: this.orgId };
-    this.foreignOrgSelectorParams.nofilid = this.orgId
+    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',

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

@@ -399,7 +399,7 @@
               <div
                 class="item"
                 v-if="
-                  currentNodeEnableItemHandleDescription &&
+                  currentNodeEnableItemHandleDescription && nodeList &&
                   nodeList.length != 0 &&
                   isShowNode &&
                   isNextUser
@@ -1347,7 +1347,9 @@ export default {
     },
     // 切换下一步操作
     changeNextOperate(val, isDef) {
+      console.log(val,isDef,this.tagKey,'isDef')
       if (!isDef && val.key === this.tagKey) return;
+      console.log(val,isDef,this.tagKey,'isDef2222')
       this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
@@ -1619,7 +1621,8 @@ export default {
                   pid:
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : currentOrgparams[i]
+                      : currentOrgparams[i],
+                  only_filid:true
                 };
               });
               that.currentOrgSelectorTabs =
@@ -1635,10 +1638,10 @@ export default {
                   pid:
                     foreignOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : foreignOrgparams[i] == 'other'
+                      : foreignOrgparams[i] == 'other' || foreignOrgparams[i] == 'nofilidorg'
                       ? 'root'
                       : foreignOrgparams[i],
-                  nofilid: foreignOrgparams[i] == 'other' ? 1 : 0,
+                  nofilid:foreignOrgparams[i] == 'nofilidorg' ? that.orgId || JSON.parse($.getStorage('userInfo')).orgId : foreignOrgparams[i] == 'other' ? 1 : 0,
                   myUserid: x == 'filgroup' ? $.getStorage('userId') : ''
                 };
               });

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

@@ -17,6 +17,7 @@
             v-model="takeAdviceUser"
             :multiple="newMultiple"
             :isAllCheck="isAllCheck"
+            isEnterprise
             :tabs="
               type == 'takeAdvice'
                 ? currentOrgTabs.length > 0

package/src/index.js

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