Sfoglia il codice sorgente

修改节点后表单数据获取方法

lph 1 anno fa
parent
commit
5e5c63b837

+ 11 - 3
zkqy-ui/src/views/system/bpmnPro/components/Panel/components/ElementAfterNode.vue

@@ -143,6 +143,8 @@ import {
   getAfterNdoe,
   getFormKey,
   setFormKey,
+  setFId,
+  getFId,
 } from "@packages/bo-utils/myFieldUtil";
 import { getActive } from "@packages/bpmn-utils/BpmnDesignerUtils";
 import { getForm } from "@/api/dragform/form";
@@ -154,7 +156,6 @@ import {
 } from "@/api/dragform/form.js";
 import { getDicts } from "@/api/system/dict/data";
 import { mapState } from "vuex";
-
 export default {
   name: "ElementAfterNode",
   data() {
@@ -168,7 +169,12 @@ export default {
       listData: [],
     };
   },
-
+  inject: {
+    getMyFid: {
+      from: "getMyFid",
+      default: "",
+    },
+  },
   mounted() {
     this.initFormData();
     EventEmitter.on("element-update", () => {
@@ -275,7 +281,9 @@ export default {
     },
     // 编辑回调
     async editHandler() {
-      let fId = getFormKey(getActive());
+      // let fId = getFId(getActive());
+      let fId = this.getMyFid();
+      console.log(fId);
       if (!fId) {
         this.$message.warning(`请在'常规信息'中绑定表单`);
         return;

+ 6 - 0
zkqy-ui/src/views/system/bpmnPro/components/Panel/components/ElementGenerations.vue

@@ -332,6 +332,10 @@ export default {
       from: "groupDragFormList",
       default: [],
     },
+    setMyFid: {
+      from: "setMyFid",
+      default: () => {},
+    },
   },
   mounted() {
     this.reloadGenerationData();
@@ -353,6 +357,7 @@ export default {
         this.elFormData.elementVersion =
           getProcessVersionTag(getActive()) || "";
         this.elFormData.fId = getFId(getActive()) || "";
+        this.setMyFid()(this.elFormData.fId);
         this.elFormData.formType = getFormType(getActive());
         if (!this.elFormData.formType) {
           this.elFormData.formType = "dragForm";
@@ -374,6 +379,7 @@ export default {
     },
     updateFId(value) {
       setFId(getActive(), value);
+      this.setMyFid()(value);
     },
     updateFormType(value) {
       setFormType(getActive(), value);

+ 1 - 1
zkqy-ui/src/views/system/bpmnPro/components/Panel/index.vue

@@ -229,7 +229,7 @@ export default {
           this.renderComponents.push(ElementExcuteType); //执行类型
       } else if (this.myProcessType == 1) {
         this.renderComponents.push(ElementGenerations); //常规信息
-        !isProcess(element) && this.renderComponents.push(ElementAfterNode);
+        // !isProcess(element) && this.renderComponents.push(ElementAfterNode);
         isUserTask(element) && this.renderComponents.push(ElementExecuteUser);
         !isProcess(element) && this.renderComponents.push(ElementNormalTask); //正常节点`
       }

+ 4 - 1
zkqy-ui/src/views/system/bpmnPro/components/bo-utils/myFieldUtil.js

@@ -78,9 +78,12 @@ export function setFId(element, value) {
   });
 }
 export function getFId(element) {
-
+  const modeling = getModeler.getModeling();
   const prefix = getProcessEngine();
+
+  console.log(modeling);
   return element.businessObject.get(`${prefix}:fId`);
+  // return modeling.businessObject.get(`${prefix}:fId`);
 }
 // 流程的表单类型
 export function setFormType(element, value) {

+ 7 - 0
zkqy-ui/src/views/system/bpmnPro/index.vue

@@ -105,6 +105,7 @@ export default {
       allRoleList: [],
       dragFormList: [],
       groupDragFormList: [],
+      FID: "",
 
       // 流程类型数据
       show: false,
@@ -127,6 +128,8 @@ export default {
       processType: () => this.processForm.processType,
       dragFormList: () => this.dragFormList,
       groupDragFormList: () => this.groupDragFormList,
+      setMyFid: () => this.setFid,
+      getMyFid: () => this.FID,
     };
   },
   methods: {
@@ -147,6 +150,10 @@ export default {
         this.$message.warning("网络异常,请稍后再试");
       }
     },
+    // 设置流程的fId
+    setFid(fId) {
+      this.FID = fId;
+    },
     // 获取所有用户列表
     async getAllUserList() {
       // console.log(this.$store.state.user.tenant.tenantId);