eoss-ui 0.6.38 → 0.6.40

package/packages/flow/src/processForm.vue

@@ -58,6 +58,7 @@
           ]"
         >
           <el-select
+            v-if="nextNodeCheckType == 'select'"
             v-model="nextNode.nextNode"
             :placeholder="`请选择下步节点`"
             @change="changeSel"
@@ -69,6 +70,13 @@
               :value="items.nodeId"
             ></el-option>
           </el-select>
+          <es-radio-group
+            v-else-if="nextNodeCheckType == 'radio'"
+            v-model="nextNode.nextNode"
+            :data="nextNode.nodeInfo"
+            value-key="nodeId"
+            label-key="nodeName"
+          ></es-radio-group>
         </el-form-item>
         <el-form-item
           v-if="countersignaturetypeCode != 0"
@@ -190,9 +198,11 @@
               v-for="item of nextNode.noticeList"
               :key="item.cciValue"
               :label="item.cciValue"
-              :disabled="readOnlyNotificationType
+              :disabled="
+                readOnlyNotificationType
                   ? readOnlyNotificationType.indexOf(item.cciValue) != -1
-                  : false"
+                  : false
+              "
             >
               {{ item.shortName }}
             </el-checkbox>
@@ -272,7 +282,8 @@ import {
   getNotificationMsg,
   findCodeValues,
   loginUserInfo,
-  register
+  register,
+  freeStartFlowWithSubmitTask
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 import SelectUser from './selectUser.vue';
@@ -294,6 +305,10 @@ export default {
       type: String,
       default: ''
     },
+    copyHistory:{
+      type:String,
+      default: ''
+    },
     id: {
       type: String,
       default: ''
@@ -301,6 +316,14 @@ export default {
     opinion: {
       type: String,
       default: ''
+    },
+    isFreeStartFlow:{
+      type: Boolean,
+      default: false
+    },
+    taskParams:{
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -311,6 +334,7 @@ export default {
       multiple: false,
       readMultiple: true,
       customPresetHintMessage: '', //流程预设标题
+      nextNodeCheckType: 'select',
       notificationMessageReadOnly: false,
       readOnlyNotificationType: '',
       show: true,
@@ -407,6 +431,7 @@ export default {
     this.getUserInfo();
   },
   mounted() {
+    console.log('发起流程开始')
     this.getNodeType();
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
@@ -631,12 +656,26 @@ export default {
             opinion: this.newOpinion || newOpinion
           };
           if (this.activeNames != '1') delete params.customPresetUserJson;
+          if(this.isFreeStartFlow){
+            let newParm = {}
+            newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory'
+            newParm.startFlowParamJson = params
+            newParm.startFlowParamJson.businessId = '93f66a39a52c47deb7a9a25b6424f089' //this.id
+            newParm.startFlowParamJson = JSON.stringify( newParm.startFlowParamJson)
+            for(let key in this.taskParams){
+              if(Array.isArray(this.taskParams[key])){
+                this.taskParams[key] = this.taskParams[key].length>0?this.taskParams[key].join(',') : ''
+              }
+            }
+            newParm.submitTaskParamJson =JSON.stringify( this.taskParams)
+            params=newParm
+          }
           util
-            .ajax({ url: register, method: 'post', data: params })
+            .ajax({ url:this.isFreeStartFlow?freeStartFlowWithSubmitTask :  register, method: 'post', data: params })
             .then((res) => {
               const { status, message } = res;
               this.loading = false;
-              if (status === 'success') {
+              if (status === 'success' ||  res.rCode == 0) {
                 this.quit(true);
                 this.$message.success('操作成功');
               } else {
@@ -658,7 +697,8 @@ export default {
       let params = {
         processDefinitionId: this.processDefinitionId,
         nextNodeId: nodeId ? nodeId : this.nextNode.nextNode,
-        businessId: this.id
+        businessId: this.id,
+        userId: util.getStorage('userId')
       };
       util
         .ajax({ url: getNodeInfo, params })
@@ -861,9 +901,12 @@ export default {
                 .catch(() => {
                   this.quit();
                 });
+            data.nextNodeCheckType &&
+              (this.nextNodeCheckType = data.nextNodeCheckType);
             this.customPresetHintMessage = data.customPresetHintMessage;
             this.readOnlyNotificationType = data.readOnlyNotificationType;
-            this.notificationMessageReadOnly = data.notificationMessageReadOnly == 'true';
+            this.notificationMessageReadOnly =
+              data.notificationMessageReadOnly == 'true';
             this.nextNode.nodeInfo = data.nextNodeList;
             this.nextNode.nextNode = data.nextNodeList[0].nodeId;
             this.isPreset = data.isPreset;
@@ -888,8 +931,13 @@ export default {
                 this.nextNode.nextOperate = 0;
                 this.nextNode.nodeInfo = this.operationList[0].list;
                 if (this.nextNode.nodeInfo.length > 0) {
+                  let defaultNodeData = data.nextNodeList.filter(
+                    (x) => x.nodeId == this.defaultNextNode
+                  );
                   this.nextNode.nextNode =
-                    this.defaultNextNode || data.nextNodeList[0].nodeId;
+                    defaultNodeData.length > 0
+                      ? this.defaultNextNode
+                      : data.nextNodeList[0].nodeId;
                 }
               } else if (
                 data.nodeInfoMap.nodeExtAttr.defaultNextOperate == 1 ||
@@ -899,8 +947,13 @@ export default {
                 this.nextNode.nextOperate = 1;
                 this.nextNode.nodeInfo = this.operationList[1].list;
                 if (this.nextNode.nodeInfo.length > 0) {
+                  let defaultNodeData = data.nextNodeList.filter(
+                    (x) => x.nodeId == this.defaultNextNode
+                  );
                   this.nextNode.nextNode =
-                    this.defaultNextNode || data.nextNodeList[0].nodeId;
+                    defaultNodeData.length > 0
+                      ? this.defaultNextNode
+                      : data.nextNodeList[0].nodeId;
                 }
               }
             }