eoss-mobiles 0.2.10 → 0.2.11

package/package.json

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

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

@@ -1361,7 +1361,7 @@ export default {
           taskId: this.processObj.taskExamine.taskId,
           pendingId: this.pendingId,
           businessId: this.taskExamineInfo.businessId,
-          userId: this.userId
+          userId: _that.userId
         }
       }).then(res => {
         this.$toast.clear();

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

@@ -194,7 +194,7 @@ export default {
       const _that = this;
       request({
         url: _that.baseUrl ? _that.baseUrl + commonOpion : commonOpion,
-        params: { userId: this.userId }
+        params: { userId: _that.userId }
       }).then(res => {
         if (res.status == 'success') {
           this.opinionList = res.data.list;

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

@@ -51,7 +51,6 @@ export default {
     appId: String,
     type: String,
     pendingId: String,
-    userId: String,
     beforeSubmit: Function,
     baseUrl: String,
      esign: {
@@ -185,7 +184,7 @@ export default {
           pendingId: this.pendingId,
           isSinglePage: false,
           opinion: this.form.opinion,
-          userId: this.userId
+          userId: _that.userId
         }
       }).then(res => {
         if (res.status == 'success') {

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

@@ -279,7 +279,6 @@ export default {
           : this.form.notificationType,
         opinion: this.form.opinion,
         nodeId: this.form.nodeId,
-        userId: sessionStorage.getItem('userId'),
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
         isImageOpinion:this.form.isImageOpinion,
@@ -410,7 +409,7 @@ export default {
       return new Promise(function(resolve, reiect) {
         request({
           url: that.apiBaseUrl ? that.apiBaseUrl + toStartFlow : toStartFlow,
-          params: {...res,userId:this.userId}
+          params: {...res,userId:that.userId}
         }).then(res => {
           if (res.rCode == 0) {
             res.results.nodeExtr.submitTipsMsg &&
@@ -473,7 +472,7 @@ export default {
           processDefinitionId: this.flowObj.processDefinitionId,
           nodeId: res,
           taskId: this.processObj.taskId,
-          userId: this.userId
+          userId: _that.userId
         }
       }).then(res => {
         this.$toast.clear();

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

@@ -119,7 +119,6 @@ export default {
     orgId: String,
     beforeSubmit: Function,
     pendingId: String,
-    userId: String,
     businessId: String,
     baseUrl: String,
     apiBaseUrl: String,
@@ -328,7 +327,7 @@ export default {
           isImageOpinion: 0,
           loginType: 2,
           taskAction: this.type,
-          userId: this.userId
+          userId: _that.userId
         }
       };
       if (this.beforeSubmit) {

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

@@ -431,9 +431,9 @@ export default {
         return this.$toast('当前步骤必须输入意见!');
       }
       if (
-        (type == 'takeAdvice' &&
-          (!nextCurrentOrgObj && isHideCurrentOrg == 0)) &&
-        (isHideOtherOrg == 0 && !nextOtherOrgObj)
+       ( (type == 'takeAdvice' &&
+         isHideCurrentOrg == 0 && ( !nextCurrentOrgObj || nextCurrentOrgObj.length == 0)) &&
+        (isHideOtherOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0))) || (type != 'takeAdvice' && isHideOtherOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0))
       ) {
         return this.$toast('请选择处理对象!');
       } 

package/packages/flow/src/main.vue

@@ -3,11 +3,13 @@
     <StartFlow
       v-if="type === 'start'"
       v-bind="$attrs"
+      :userId="userId"
       :beforeSubmit="beforeSubmit"
     />
     <Handle
       v-else-if="type === 'handle'"
       v-bind="$attrs"
+      :userId="userId"
       :identityIds="userId"
       :beforeSubmit="beforeSubmit"
     />

package/src/index.js

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