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

src/components/FormViewer/index.vue

@@ -53,10 +53,11 @@
     };
     const data = await functionGetFormDataFormScheme(querys);
     let obj = new Object();
-    data.forEach((element) => {
-      obj[element.columnName] = element.value;
-    });
-    console.log(obj);
+    for (var i in data) {
+      for (var j in data[i]) {
+        Object.assign(obj, data[i][j]);
+      }
+    }
     setFieldsValue({
       ...obj,
     });
@@ -78,7 +79,6 @@
     if (props.formVerison) {
       getFormHistory();
     } else {
-      console.log(props.flowFormData);
       setFieldsValue({
         ...props.flowFormData,
       });

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

@@ -97,6 +97,9 @@
   const AsyncComponent = ref();
   const props = defineProps({
     code: String,
+    ParentNodeId: String,
+    ParentTaskId: String,
+    ParentProcessId: String,
   });
   const emit = defineEmits(['closeModel']);
   const keyValue = ref('');
@@ -205,7 +208,13 @@
       title: formData.title,
       processId: processId,
       InstanceInfo: JSON.stringify(commit),
+      ParentNodeId: props.ParentNodeId,
+      ParentTaskId: props.ParentTaskId,
+      ParentProcessId: props.ParentProcessId,
     };
+    if (props.ParentNodeId) {
+      querys.isChild = 1;
+    }
     const data = await saveDraft(querys);
     querys.schemeCode = '';
     designerData.isDraft = true;
@@ -274,7 +283,13 @@
       title: formData.title,
       processId: processId,
       InstanceInfo: JSON.stringify(commit),
+      ParentNodeId: props.ParentNodeId,
+      ParentTaskId: props.ParentTaskId,
+      ParentProcessId: props.ParentProcessId,
     };
+    if (props.ParentNodeId) {
+      querys.isChild = 1;
+    }
     if (!designerData.isDraft) {
       await saveDraft(querys);
       querys.schemeCode = '';

src/views/demo/workflow/task/process/audit.vue

@@ -86,8 +86,8 @@
                     <a-button
                       v-for="(btn, index) in designerData.taskBtns"
                       :key="index"
-                      type="primary"
                       :color="btn.type"
+                      :type="btn.type ? btn.type : 'primary'"
                       @click="handleBtnClick(btn)"
                       >{{ btn.name }}</a-button
                     >

src/views/demo/workflow/task/uncompletedTask.vue

@@ -31,6 +31,23 @@
         @closeModel="closeMolder"
       />
     </a-modal>
+    <a-modal
+      width="100%"
+      wrap-class-name="full-modal"
+      v-model:open="previewOpen"
+      title="流程发起"
+      :destroyOnClose="true"
+    >
+      <template #footer> </template>
+      <Preview
+        ref="posRef"
+        :code="childRecord.childSchemeInfoCode"
+        :ParentNodeId="childRecord.unitId"
+        :ParentTaskId="childRecord.id"
+        :ParentProcessId="childRecord.processId"
+        @closeModel="closeMolder"
+      />
+    </a-modal>
   </PageWrapper>
 </template>
 
@@ -43,6 +60,7 @@
   import { Tag } from 'ant-design-vue';
   import { Audit } from './process/page';
   import { flowStore } from '@/store/modules/flow';
+  import { Preview } from '../create/index';
 
   const flowWfDataStore = flowStore();
   const searchInfo = reactive<Recordable>({});
@@ -51,6 +69,9 @@
   const isRead: any = ref(0);
   const type = ref('');
   const auditOpen = ref(false);
+  const previewOpen = ref(false);
+  const childRecord = ref();
+
   const [registerTable, { reload }] = useTable({
     api: getLoadMyUncompletedPage,
     columns: [
@@ -123,14 +144,20 @@
     },
   });
   async function handleDetail(record) {
-    let data = await getDetail({ code: record.processCode });
-    let scheme = JSON.parse(data.scheme.content);
-    let wfData = scheme.wfData;
-    flowWfDataStore.setWfDataAll(wfData);
-    auditOpen.value = true;
-    processId.value = record.processId;
-    taskId.value = record.id;
-    type.value = record.type;
+    console.log(record);
+    if (record.type == 3) {
+      previewOpen.value = true;
+      childRecord.value = record;
+    } else {
+      let data = await getDetail({ code: record.processCode });
+      let scheme = JSON.parse(data.scheme.content);
+      let wfData = scheme.wfData;
+      flowWfDataStore.setWfDataAll(wfData);
+      auditOpen.value = true;
+      processId.value = record.processId;
+      taskId.value = record.id;
+      type.value = record.type;
+    }
     // go(
     //   '/dashboard/task_audit_preview/detail?processId=' +
     //     record.processId +
@@ -143,6 +170,7 @@
   }
   function closeMolder() {
     auditOpen.value = false;
+    previewOpen.value = false;
     reload();
   }
 </script>