eoss-ui 0.6.89 → 0.6.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.89",
+  "version": "0.6.90",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -1590,7 +1590,7 @@ export default {
       this.freeStartFlowParams.startFlowBusinessId =
         this.taskExamineInfo.businessId;
       this.freeStartFlowNextNode = this.taskExamineInfo.processDefinitionId;
-      const { businessId, appId, processDefinitionId, pendingId } =
+      const { businessId, appId, processDefinitionId, pendingId,isSubFlow } =
         this.taskExamineInfo;
       let params = {
         businessId,
@@ -1598,6 +1598,7 @@ export default {
         processDefinitionId,
         pendingId,
         opinion: this.value,
+        isSubFlow,
         taskAction: 'complete'
       };
       this.taskParams = params;
@@ -3536,6 +3537,7 @@ export default {
             delete params.nextUserId;
           }
           if (freetype === 'multiInsMidwayWithSubmitScene') {
+            params.isSubFlow = this.taskExamineInfo.isSubFlow;
             this.taskParams = params;
             return;
           }

package/packages/flow/src/reset.vue

@@ -14,8 +14,8 @@
       label-width="100px"
       label-position="left"
     >
-      <div  class="es-reset-flow-form-box">
-         <el-form-item prop="nodeName" label="标题">
+      <div class="es-reset-flow-form-box">
+        <el-form-item prop="nodeName" label="标题">
           <el-input v-model="pendtitle" disabled />
         </el-form-item>
         <el-form-item prop="nodeName" label="当前步骤">
@@ -32,7 +32,7 @@
           ]"
         >
           <el-select
-          v-if="nextNodeCheckType == 'select'"
+            v-if="nextNodeCheckType == 'select'"
             v-model="nextNode.nextNode"
             :placeholder="`请选择下步节点`"
             @change="changeSel"
@@ -44,7 +44,7 @@
               :value="items.nodeId"
             ></el-option>
           </el-select>
-           <es-radio-group
+          <es-radio-group
             v-else-if="nextNodeCheckType == 'radio'"
             v-model="nextNode.nextNode"
             :data="nextNode.nodeInfo"
@@ -166,6 +166,21 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
+        <el-form-item
+          v-if="
+            currentNodeEnableItemHandleDescription &&
+            nextNode.nodeInfo.length != 0
+          "
+          prop="nextItemHandleDescription"
+          label="办理说明"
+        >
+          <el-input
+            placeholder="请输入办理说明"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            v-model="nextItemHandleDescription"
+          />
+        </el-form-item>
         <el-form-item prop="noticeType" label="通知方式">
           <el-checkbox-group
             v-if="showNoticeType"
@@ -247,7 +262,7 @@ export default {
       type: Object,
       default: () => {}
     },
-     subParams: {
+    subParams: {
       type: Object,
       default: () => {}
     },
@@ -262,7 +277,9 @@ export default {
       loading: false,
       isCustomUser: 0,
       selectUser: false,
+      nextItemHandleDescription: '',
       nextNodeCheckType: 'select',
+      currentNodeEnableItemHandleDescription: false,
       multiple: false,
       showNoticeType: false,
       readMultiple: true,
@@ -302,15 +319,13 @@ export default {
       tabs: {
         employee: {
           param: {
-            filid: JSON.parse(util.getStorage('mainConfig')).userModel
-              .orgId,
+            filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,
             name: '本单位用户'
           }
         },
         department: {
           param: {
-            filid: JSON.parse(util.getStorage('mainConfig')).userModel
-              .orgId
+            filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
           }
         }
       },
@@ -565,7 +580,7 @@ export default {
             processDefinitionId: this.processDefinitionId,
             nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
             nextNodeId: nextNode,
-            appId:this.appId,
+            appId: this.appId,
             nextOperate: nextOperate,
             businessId: this.taskExamine.businessId,
             pendingId: this.taskExamine.pendingId,
@@ -588,8 +603,12 @@ export default {
                 ? this.mixPresetList.join('|')
                 : presetReadUserId.join(','),
             opinion: this.newOpinion || newOpinion,
+            nextItemHandleDescription: this.nextItemHandleDescription,
             ...this.subParams
           };
+          if (!this.currentNodeEnableItemHandleDescription) {
+            delete params.nextItemHandleDescription;
+          }
           if (this.activeNames != '1') delete params.customPresetUserJson;
           util
             .ajax({
@@ -640,6 +659,10 @@ export default {
           } = res;
           this.loading = false;
           if (status === 'success') {
+            if (this.type == 'reset') {
+              this.currentNodeEnableItemHandleDescription =
+                nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
+            }
             this.nextNode.userInfo = nextUserList;
             this.countersignaturetypeCode = countersignaturetypeCode;
             this.nextNode.countersignaturetypeText = countersignaturetypeText;

package/src/index.js

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