Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-14 78e5ece58bf05ed6f344239f40b49dbe90956cce

 src/views/flowable/task/myProcess/send/index.vue

@@ -21,17 +21,6 @@
                    <el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">转办</el-button>
                  </div>
                  <div style="margin-bottom: 15px;color: #E6A23C">当前阶段：<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="当前节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-else-if="formDataList.length > 1">
                  <!--     前置节点可驳回         -->
@@ -39,22 +28,22 @@
                    <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">驳 回</el-button>
                  </div>
                  <div style="margin-bottom: 15px;color: #E6A23C">前置阶段：<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="前置节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                  <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                </div>
                <div v-else>
                  <el-alert
                    title="节点未绑定表单"
                    type="warning"
                    :closable="false"
                  >
                  </el-alert>
                </div>
                <div v-if="formDataList.length <= 1">
                  <el-alert
                    title="不存在前置节点"
                    type="info"
                    type="warning"
                    :closable="false"
                  >
                  </el-alert>
@@ -65,7 +54,7 @@
        </el-tab-pane>
        <!--流程图-->
        <el-tab-pane label="流程图" name="2">
          <bpmn-viewer :flowData="flowData"/>
          <bpmn-viewer :flowData="flowData" :procInsId="procInsId"/>
        </el-tab-pane>
      </el-tabs>
      <!--选择流程接收人-->
@@ -239,6 +228,7 @@
      loading: true,
      deployId: "",  // 流程定义编号
      procDefId: "",  // 流程实例编号
      procInsId: "",  // 流程实例编号
      formRenderData: {},
      formRenderDataList: [],
      variables: [], // 流程变量数据
@@ -266,6 +256,7 @@
    this.flowName = this.$route.query && this.$route.query.flowName;
    // 初始化表单
    this.procDefId  = this.$route.query && this.$route.query.procDefId;
    this.procInsId  = this.$route.query && this.$route.query.procInsId;
    this.goBackParams  = this.$route.query && this.$route.query.goBackParams;
    // this.getNextFlowNodeByStart(this.deployId);
    this.getFlowFormData(this.taskId);
@@ -455,7 +446,7 @@
    },
    handleClick(tab, event) {
      if (tab.name === '2'){
        flowXmlAndNode({deployId:this.deployId}).then(res => {
        flowXmlAndNode({procInsId:this.procInsId,deployId:this.deployId}).then(res => {
          this.flowData = res.data;
        })
      }
@@ -469,7 +460,8 @@
          this.$nextTick(() => {
            this.formDataList.forEach((formDataObj, index) => {
              let that = this
              if (formDataObj.formJsonObj) {
              console.log(eval("that.$refs.form" +index))
              if (eval("that.$refs.form" +index) && formDataObj.formJsonObj) {
                eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
                eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
              }