eoss-mobiles 0.3.37 → 0.3.39

package/packages/flow/src/main.vue

@@ -1,51 +1,60 @@
 <template>
   <div class="em-flow">
     <StartFlow
-      v-if="type === 'start'"
+      v-if="newType === 'start'"
       v-bind="$attrs"
       :userId="userId"
       :beforeSubmit="beforeSubmit"
     />
     <Handle
-      v-else-if="type === 'handle' || type === 'freeStart'"
+      v-else-if="newType === 'handle' || newType === 'freeStart'"
       v-bind="$attrs"
-      :type="type"
+      :type="newType"
       :userId="userId"
       :identityIds="userId"
       :beforeSubmit="beforeSubmit"
     />
     <Reject
-      v-else-if="type === 'reject'"
-      :type="type"
+      v-else-if="newType === 'reject'"
+      :type="newType"
       v-bind="$attrs"
       :userId="userId"
       :beforeSubmit="beforeSubmit"
     />
     <TaskRead
-      v-else-if="type === 'taskRead' || type === 'transfer'"
+      v-else-if="newType === 'taskRead' || newType === 'transfer'"
       v-bind="$attrs"
       :userId="userId"
-      :type="type"
+      :type="newType"
       :beforeSubmit="beforeSubmit"
     />
     <TaskUnionExamineVue
-      v-else-if="type === 'unionExamine' || type === 'takeAdvice' || type === 'startDraf'"
+      v-else-if="
+        newType === 'unionExamine' || newType === 'takeAdvice' || newType === 'startDraf'
+      "
       v-bind="$attrs"
       :userId="userId"
-      :type="type"
+      :type="newType"
       :beforeSubmit="beforeSubmit"
     />
     <Supervise
-      v-else-if="type === 'supervise'"
+      v-else-if="newType === 'supervise'"
       v-bind="$attrs"
       :userId="userId"
-      :type="type"
+      :type="newType"
     />
     <Reset
-      v-if="type === 'reset' || type == 'continuation'"
+      v-if="newType === 'reset' || newType == 'continuation'"
       v-bind="$attrs"
       :userId="userId"
-      :type="type"
+      :type="newType"
+      :beforeSubmit="beforeSubmit"
+    />
+    <Circulate
+      v-if="newType === 'circulate'"
+      v-bind="$attrs"
+      :userId="userId"
+      :type="newType"
       :beforeSubmit="beforeSubmit"
     />
   </div>
@@ -53,6 +62,7 @@
 <script>
 import StartFlow from './components/StartFlow.vue';
 import Handle from './components/Handle.vue';
+import Circulate from './components/Circulate.vue';
 import Reject from './components/Reject.vue';
 import TaskRead from './components/TaskRead.vue';
 import TaskUnionExamineVue from './components/taskUnionExamine.vue';
@@ -68,7 +78,8 @@ export default {
     TaskRead,
     Supervise,
     Reset,
-    TaskUnionExamineVue
+    TaskUnionExamineVue,
+    Circulate
   },
   props: {
     userId: String, //用户id
@@ -76,16 +87,28 @@ export default {
     type: {
       type: String,
       default: 'handle'
+    },
+    isCirculate: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
-    return {};
+    return {
+      newType:'handle',
+    };
   },
-  mounted(){
-    for(let i=0;i<10;i++){
-      if(i == 2) return
-      console.log(i)
+  watch: {
+    isCirculate: {
+      handler(val) {
+        this.newType = val ? 'circulate' : this.type;
+      },
+      deep: true,
+      immediate: true
     }
+  },
+  mounted() {
+    this.newType = this.type;
   }
 };
 </script>

package/packages/selector/src/selector-tree.vue

@@ -747,10 +747,15 @@ export default {
         }else{
           this.newParam.pid = 'root';
         }
+        this.newParam.pid = 'root';
         this.newParam.myUserid =
           this.newParam.myUserid || $.getStorage('userId');
       } else {
-        this.newParam = {...this.newTabs[this.selectIndex].param,...this.newParam[this.newTabs[this.selectIndex].name]?this.newParam[this.newTabs[this.selectIndex].name]:{}}
+       
+        this.newParam = {...this.newParam,...this.newTabs[this.selectIndex].param,...this.newParam[this.newTabs[this.selectIndex].name]?this.newParam[this.newTabs[this.selectIndex].name]:{}}
+         if(this.param.pid){
+          this.newParam.pid = this.param.pid;
+        }
         //  this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
       delete this.newParam.department

package/src/config/api.js

@@ -148,3 +148,7 @@ export const officeHandleRemark =
   '/archives/task/taskHandle/getDefaultNotificationType.dhtml';
 // 获取分阅信息
 export const toStartTaskReadNew = '/bpm/bpmBackend/toStartTaskRead';
+export const directStartTaskCircularRead =
+  '/bpm/bpmBackend/directStartTaskCircularRead';
+export const endFlowAndStartTaskCircularRead =
+  '/bpm/bpmBackend/endFlowAndStartTaskCircularRead';

package/src/index.js

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