eoss-ui 0.7.11 → 0.7.13

package/packages/flow/src/main.vue

@@ -122,6 +122,14 @@
       :news-info="nextNode.notificationMsg"
       @cancel="closeProcess($event)"
     />
+
+    <FreeCirculation
+      v-else-if="typeCode == 'freeCirculation'"
+      :appId="resetAppId"
+      :params="param"
+      :formLabelPosition="formLabelPosition"
+      :simpleTips="simpleTips"
+    />
     <Supervise
       :businessId="businessId"
       :appId="resetAppId"
@@ -213,6 +221,7 @@
             multiple
             mix
             :disableds="otherOrgDisabledObjId"
+            :where="{ filid: 'other' }"
             @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
             :types="foreignOrgSelectorTabs"
             :params="foreignOrgSelectorParams"
@@ -528,6 +537,7 @@
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
                     mix
+                    :where="{ filid: 'other' }"
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
                     :types="foreignOrgSelectorTabs"
@@ -1130,6 +1140,7 @@ import FreeStartFlow from './freeStartFlow.vue';
 import SelectUser from './selectUser.vue';
 import Supervise from './supervise.vue';
 import circulate from './component/Circulate.vue';
+import FreeCirculation from './component/FreeCirculation.vue';
 import {
   findSysCodes,
   getHandleInfoHtml,
@@ -1171,7 +1182,8 @@ export default {
     circulate,
     Preset,
     Reset,
-    Supervise
+    Supervise,
+    FreeCirculation
   },
   props: {
     showShrink: { type: Boolean, default: true },
@@ -1584,7 +1596,12 @@ export default {
       this.$emit('endMessageChange', this.endMessage);
     },
     getInfo() {
-      if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
+      if (
+        this.typeCode == 'supervise' ||
+        this.typeCode == 'read' ||
+        this.typeCode == 'freeCirculation'
+      )
+        return;
       if (
         this.showCirculate != undefined &&
         !this.showCirculate &&
@@ -2961,7 +2978,7 @@ export default {
                 this.circularReadParamsMap.circularReadOrgRoleCode;
             }
             this.currentOrgName = currentOrgName;
-            this.nextOperateCheckType = nextOperateCheckType;
+            this.nextOperateCheckType = nextOperateCheckType || 'select';
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
 

package/packages/login/src/resetPassword.vue

@@ -352,7 +352,7 @@ export default {
   },
   data() {
     return {
-      activeIndex: '6',
+      activeIndex: '0',
       checkPassword: null,
       checkPasswordMsg: null,
       btnText: '获取验证码',
@@ -368,15 +368,10 @@ export default {
     if (this.type) {
       let types = this.type.split(',');
       if (types.length) {
-        types.forEach((item) => {
-          if (item != '0' && (item == '11' || item == '6')) {
-            this.activeIndex = item;
-            return;
-          }
-        });
+        this.activeIndex = types[0];
       }
     } else {
-      this.activeIndex = this.operationCheckCode ? '0' : '';
+      this.activeIndex = '0';
     }
   },
   destroyed() {

package/src/config/api.js

@@ -305,4 +305,11 @@ export const endFlowAndStartTaskCircularRead =
 export const getNodeInfoForStart =
   flowPendingPrefix + '/task/taskHandle/getNodeInfoForStart.dhtml';
 export const freeStartFlow = '/bpm/bpmBackend/freeStartFlow';
-export const getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';
+export const getUrgencyLevelChangedNotificationType =
+  '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';
+// 自由发起传阅查询
+export const toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
+// 自由发起传阅提交
+export const freeTaskCircularRead =
+  '/bpm/bpmBackend/freeTaskCircularRead';
+

package/src/index.js

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