Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/onlineform/formCall/CreateFlow.vue

@@ -197,6 +197,7 @@
     let content = JSON.parse(data.scheme.content);
     let wfData = content.wfData;
     const currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
+    designerData.isCustmerTitle = currentNode.isCustmerTitle;
     if (currentNode.authFields.length > 0) {
       formVisble.value = true;
     } else {
@@ -269,30 +270,48 @@
     }
   }
   async function handleCreateFlow(processId, pkeyValue) {
-    var commit = {
-      schemeId: designerData.formCurrentNode.formVerison,
-      pkey: keyValue.value,
-      pkeyValue: pkeyValue ? pkeyValue : processId,
-    };
-    var querys = {
-      schemeCode: designerData.isDraft ? '' : props.code,
-      userId: formData.userId,
-      title: formData.title,
-      processId: processId,
-      InstanceInfo: JSON.stringify(commit),
-    };
-    let data;
-    if (!designerData.isDraft) {
-      let draft = await saveDraft(querys);
-      querys.schemeCode = '';
-      designerData.isDraft = true;
-      if (draft) {
-        data = await create(querys);
-        if (data) {
-          closePreview();
-          return createMessage.success('发起流程成功');
-        } else {
-          return createMessage.error('发起流程失败');
+    let values;
+    if (designerData.isCustmerTitle) {
+      values = await formRef.value
+        .validate()
+        .then(() => {
+          return true;
+        })
+        .catch((error: ValidateErrorEntity<FormState>) => {
+          console.log('error', error);
+          processVisble.value = true;
+          activeName.value = 'flow';
+          return false;
+        });
+    } else {
+      values = true;
+    }
+    if (values) {
+      var commit = {
+        schemeId: designerData.formCurrentNode.formVerison,
+        pkey: keyValue.value,
+        pkeyValue: pkeyValue ? pkeyValue : processId,
+      };
+      var querys = {
+        schemeCode: designerData.isDraft ? '' : props.code,
+        userId: formData.userId,
+        title: formData.title,
+        processId: processId,
+        InstanceInfo: JSON.stringify(commit),
+      };
+      let data;
+      if (!designerData.isDraft) {
+        let draft = await saveDraft(querys);
+        querys.schemeCode = '';
+        designerData.isDraft = true;
+        if (draft) {
+          data = await create(querys);
+          if (data) {
+            closePreview();
+            return createMessage.success('发起流程成功');
+          } else {
+            return createMessage.error('发起流程失败');
+          }
         }
       }
     }

src/views/demo/workflow/create/preview.vue

@@ -353,7 +353,6 @@
     } else {
       values = true;
     }
-    console.log(values);
     if (values) {
       var commit = {
         schemeId: designerData.formCurrentNode.formVerison,