vue2-client 1.15.5 → 1.15.7

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -13,182 +13,171 @@
         @activeStep="activeStep"/>
     </a-card>
     <!-- 无权访问的提示 -->
-    <template v-if="!canSubmit">
-      <a-result status="403" title="无权操作" sub-title="您没有访问该步骤的权限.">
-      </a-result>
-    </template>
-    <template v-else>
+    <a-result v-show="!canSubmit" status="403" title="无权操作" sub-title="您没有访问该步骤的权限.">
+    </a-result>
+    <div v-show="canSubmit">
       <!-- 流程被退回的提示 -->
-      <template v-if="currentStep && currentStep.back && !(beforeStepActive || workflowState)">
-        <a-alert type="info" show-icon style="margin-bottom: 14px">
-          <div slot="message">
-            <span style="font-weight: bold">流程被退回</span>
-            <span style="margin-left: 14px; font-size: 14px; color: rgba(0, 0, 0, 0.65)">请重新填写信息发起提交</span>
+      <a-alert v-if="currentStep && currentStep.back && !(beforeStepActive || workflowState)" type="info" show-icon style="margin-bottom: 14px">
+        <div slot="message">
+          <span style="font-weight: bold">流程被退回</span>
+          <span style="margin-left: 14px; font-size: 14px; color: rgba(0, 0, 0, 0.65)">请重新填写信息发起提交</span>
+        </div>
+        <div slot="description">
+          <div>操作人：{{
+            currentStep.back.f_operator
+          }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;操作时间：{{ currentStep.back.f_date }}
           </div>
-          <div slot="description">
-            <div>操作人：{{ currentStep.back.f_operator }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;操作时间：{{ currentStep.back.f_date }}</div>
-            <div>原因：{{ currentStep.back.f_notes }}</div>
-          </div>
-        </a-alert>
-      </template>
+          <div>原因：{{ currentStep.back.f_notes }}</div>
+        </div>
+      </a-alert>
       <!-- 步骤内容主体 -->
       <a-tabs default-active-key="1" @change="note = ''" type="card">
-        <template v-if="beforeStepActive || workflowState">
-          <a-tab-pane key="0" tab="步骤详情">
-            <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
-              <!--   当前步骤历史记录   -->
-              <template v-if="showTab">
-                <x-tab
-                  :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }, disableAction: true }"
-                  :local-config="tabDesigner"
-                  :body-style="{ padding: 0 }"
-                  :tabBarGutter="24"
-                  :extra-data="{ workflowId: workflowId }"
-                  default-active-key="workFlowTab">
-                  <a-tab-pane
-                    :forceRender="true"
-                    v-if="formCompletedDataPreview"
-                    slot="extraBeforeTabs"
-                    key="workFlowTab"
-                    tab="表单"
-                  >
-                    <work-flow-preview :form-completed-data-preview="formCompletedDataPreview" />
-                  </a-tab-pane>
-                </x-tab>
-              </template>
-              <template v-else-if="formCompletedDataPreview">
-                <work-flow-preview :form-completed-data-preview="formCompletedDataPreview" />
-              </template>
-              <template v-else>
-                <a-result status="404" title="暂无数据" sub-title="该步骤暂无数据。">
-                </a-result>
-              </template>
-            </a-card>
-          </a-tab-pane>
-        </template>
-        <template v-else>
-          <a-tab-pane key="1" tab="业务操作">
-            <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
-              <template v-if="showTab">
-                <x-tab :local-config="tabDesigner" :extra-data="{ workflowId:workflowId }" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
-                  <a-tab-pane
-                    :forceRender="true"
-                    v-if="showForm"
-                    slot="extraBeforeTabs"
-                    key="workFlowTab"
-                    tab="表单"
-                  >
-                    <x-add-native-form
-                      ref="xAddForm"
-                      @onSubmit="submitForm"/>
-                  </a-tab-pane>
-                </x-tab>
-              </template>
-              <template v-else>
-                <template v-if="showForm">
-                  <x-add-native-form
-                    ref="xAddForm"
-                    @x-form-item-emit-func="formItemEmitFunc"
-                    @onSubmit="submitForm"/>
-                </template>
-              </template>
-              <a-divider />
-              <a-form v-if="!lastStep" label-align="left" :label-col="{ span: 3 }" :wrapper-col="{ span: 13 }">
-                <a-form-item v-if="showStepNextBtn" label="操作类型" required>
-                  <a-radio-group v-model="operationType" @change="handleOperationTypeChange">
-                    <a-radio value="submit">到下一步</a-radio>
-                    <a-radio value="skip">{{ stepNextBtnTitle }}</a-radio>
-                  </a-radio-group>
-                </a-form-item>
-                <a-form-item label="下一环节处理人" required v-if="needSelectPerson">
-                  <a-select
-                    v-model="checkedChargePerson"
-                    placeholder="请选择或搜索"
-                    :options="chargePersonOptions"
-                    show-search
-                    style="width: 195px"
-                  />
-                </a-form-item>
-                <a-form-item
-                  label="下一环节截止时间"
-                  :validate-status="deadlineValidateStatus"
-                  :help="deadlineHelp"
-                  required>
-                  <a-date-picker
-                    v-model="deadline"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    :allow-clear="false"
-                    :show-today="false"
-                    show-time
-                    placeholder="请选择"/>
-                </a-form-item>
-              </a-form>
-              <a-divider />
-              <!--     备注信息    -->
-              <a-textarea
-                v-model="note"
-                :auto-size="{ minRows: 3, maxRows: 5 }"
-                placeholder="填写本环节备注事项"
-              />
-              <!--  当前步骤完成后，控制流程按钮  -->
-              <div style="text-align: center">
-                <a-radio-group style="margin-top: 20px">
-                  <a-space>
-                    <!-- 动态按钮渲染 -->
-                    <template v-if="buttonGroup && buttonGroup.actionArr">
+        <a-tab-pane key="0" tab="步骤详情" v-if="beforeStepActive || workflowState">
+          <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
+            <!--   当前步骤历史记录   -->
+            <template v-if="showTab">
+              <x-tab
+                :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }, disableAction: true }"
+                :local-config="tabDesigner"
+                :body-style="{ padding: 0 }"
+                :tabBarGutter="24"
+                :extra-data="{ workflowId: workflowId }"
+                default-active-key="workFlowTab">
+                <a-tab-pane
+                  :forceRender="true"
+                  v-if="formCompletedDataPreview"
+                  slot="extraBeforeTabs"
+                  key="workFlowTab"
+                  tab="表单"
+                >
+                  <work-flow-preview :form-completed-data-preview="formCompletedDataPreview"/>
+                </a-tab-pane>
+              </x-tab>
+            </template>
+            <template v-else-if="formCompletedDataPreview">
+              <work-flow-preview :form-completed-data-preview="formCompletedDataPreview"/>
+            </template>
+            <template v-else>
+              <a-result status="404" title="暂无数据" sub-title="该步骤暂无数据。">
+              </a-result>
+            </template>
+          </a-card>
+        </a-tab-pane>
+        <a-tab-pane key="1" tab="业务操作" v-else>
+          <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
+            <x-tab
+              v-if="showTab"
+              :local-config="tabDesigner"
+              :extra-data="{ workflowId:workflowId }"
+              :body-style="{ padding: 0 }"
+              :tabBarGutter="24"
+              default-active-key="workFlowTab">
+              <a-tab-pane
+                :forceRender="true"
+                v-if="showForm"
+                slot="extraBeforeTabs"
+                key="workFlowTab"
+                tab="表单"
+              >
+                <x-add-native-form
+                  ref="xAddForm"
+                  @onSubmit="submitForm"/>
+              </a-tab-pane>
+            </x-tab>
+            <x-add-native-form
+              v-else
+              ref="xAddForm"
+              @x-form-item-emit-func="formItemEmitFunc"
+              @onSubmit="submitForm"/>
+            <a-divider/>
+            <a-form v-show="!lastStep" label-align="left" :label-col="{ span: 3 }" :wrapper-col="{ span: 13 }">
+              <a-form-item v-if="showStepNextBtn" label="操作类型" required>
+                <a-radio-group v-model="operationType" @change="handleOperationTypeChange">
+                  <a-radio value="submit">到下一步</a-radio>
+                  <a-radio value="skip">{{ stepNextBtnTitle }}</a-radio>
+                </a-radio-group>
+              </a-form-item>
+              <!-- 智能分支人员选择组件 -->
+              <WorkflowPersonSelector ref="personSelector"/>
+              <a-form-item
+                label="下一环节截止时间"
+                :validate-status="deadlineValidateStatus"
+                :help="deadlineHelp"
+                required>
+                <a-date-picker
+                  v-model="deadline"
+                  value-format="YYYY-MM-DD HH:mm"
+                  format="YYYY-MM-DD HH:mm"
+                  :allow-clear="false"
+                  :show-today="false"
+                  show-time
+                  placeholder="请选择"/>
+              </a-form-item>
+            </a-form>
+            <a-divider/>
+            <!--     备注信息    -->
+            <a-textarea
+              v-model="note"
+              :auto-size="{ minRows: 3, maxRows: 5 }"
+              placeholder="填写本环节备注事项"
+            />
+            <!--  当前步骤完成后，控制流程按钮  -->
+            <div style="text-align: center">
+              <a-radio-group style="margin-top: 20px">
+                <a-space>
+                  <!-- 动态按钮渲染 -->
+                  <template v-if="buttonGroup && buttonGroup.actionArr">
+                    <a-button
+                      v-for="(button, index) in buttonGroup.actionArr"
+                      :key="index"
+                      v-show="checkButtonVisible(button)"
+                      :type="button.type ? button.type : 'default'"
+                      @click="handleCustomButtonClick(button)"
+                    >
+                      {{ button.text }}
+                    </a-button>
+                  </template>
+                  <!-- 原有的按钮逻辑 -->
+                  <template>
+                    <a-popover v-if="operationType === 'submit'">
+                      <template slot="content">
+                        <p>{{ nextBtnTitle }}</p>
+                      </template>
                       <a-button
-                        v-for="(button, index) in buttonGroup.actionArr"
-                        :key="index"
-                        v-show="checkButtonVisible(button)"
-                        :type="button.type ? button.type : 'default'"
-                        @click="handleCustomButtonClick(button)"
+                        v-show="!lastStep"
+                        :disabled="!showNextBtn && !stepDone"
+                        type="primary"
+                        @click="nextClick"
                       >
-                        {{ button.text }}
+                        完成提交
+                        <a-icon type="right"/>
                       </a-button>
-                    </template>
-                    <!-- 原有的按钮逻辑 -->
-                    <template>
-                      <a-popover v-if="operationType === 'submit'">
-                        <template slot="content">
-                          <p>{{ nextBtnTitle }}</p>
-                        </template>
-                        <a-button
-                          v-show="!lastStep"
-                          :disabled="!showNextBtn && !stepDone"
-                          type="primary"
-                          @click="nextClick"
-                        >
-                          完成提交
-                          <a-icon type="right"/>
-                        </a-button>
-                      </a-popover>
-                      <a-popover v-else :title="stepNextBtnTitle">
-                        <template slot="content">
-                          <p v-for="(item,index) in stepNextBtnText" :key="index">{{ item }}</p>
-                        </template>
-                        <a-button
-                          v-if="showStepNextBtn && !lastStep"
-                          type="primary"
-                          @click="stepNextClick"
-                        >
-                          跳过
-                        </a-button>
-                      </a-popover>
+                    </a-popover>
+                    <a-popover v-else :title="stepNextBtnTitle">
+                      <template slot="content">
+                        <p v-for="(item,index) in stepNextBtnText" :key="index">{{ item }}</p>
+                      </template>
                       <a-button
-                        v-if="lastStep"
+                        v-if="showStepNextBtn && !lastStep"
                         type="primary"
-                        @click="lastStepNextClick"
+                        @click="stepNextClick"
                       >
-                        确认完成
+                        跳过
                       </a-button>
-                    </template>
-                  </a-space>
-                </a-radio-group>
-              </div>
-            </a-card>
-          </a-tab-pane>
-        </template>
+                    </a-popover>
+                    <a-button
+                      v-if="lastStep"
+                      type="primary"
+                      @click="lastStepNextClick"
+                    >
+                      确认完成
+                    </a-button>
+                  </template>
+                </a-space>
+              </a-radio-group>
+            </div>
+          </a-card>
+        </a-tab-pane>
         <!-- 退回 -->
         <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !workflowState" key="2" tab="退回">
           <a-form layout="vertical">
@@ -220,7 +209,7 @@
           <workflow-list-resolution :workflow-project-id="workflowId" :details="details"></workflow-list-resolution>
         </a-tab-pane>-->
       </a-tabs>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -230,23 +219,30 @@ import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XF
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import { postByServiceName } from '@vue2-client/services/api/restTools'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
+import { commonApi } from '@vue2-client/services/api'
 import { formatDate } from '@vue2-client/utils/util'
-// import { commonApi } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import moment from 'moment'
 import FilePreview from '@vue2-client/components/FilePreview'
 import WorkFlowTimeline from './WorkFlowTimeline.vue'
 import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
 import WorkflowListResolution from './WorkflowListResolution'
-import { commonApi } from '@vue2-client/services/api'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
+import LogicRunner from '@vue2-client/logic/LogicRunner'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
 import WorkFlowPreview from './WorkFlowPreview'
+import WorkflowPersonSelector from './components/WorkflowPersonSelector.vue'
 
 export default {
   name: 'WorkFlowHandle',
+  provide () {
+    return {
+      formDataChange: this.handleFormDataChange,
+      workflowHandleWrap: this.workflowHandleWrap
+    }
+  },
   components: {
     XTab,
     WorkflowListResolution,
@@ -257,9 +253,13 @@ export default {
     FilePreview,
     FileItem,
     ImageItem,
-    WorkFlowPreview
+    WorkFlowPreview,
+    WorkflowPersonSelector
   },
   computed: {
+    workflowHandleWrap () {
+      return this
+    },
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
       // 对于超级管理员直接认为可以提交
@@ -272,7 +272,7 @@ export default {
       }
       // 如果当前选中节点不是正在进行的节点，则判断viewers权限
       if (this.activeStepId !== this.currentStepId) {
-        const activeStep = this.stepsForChild[this.activeStepId - 1]
+        const activeStep = this.stepsForChild.find(item => item.id === this.activeStepId)
         const viewers = activeStep?.properties?.otherProperty?.viewers ?? []
         if (viewers.length > 0) {
           // 使用some方法判断当前人员是否满足任一条件
@@ -291,7 +291,7 @@ export default {
           return true
         }
       } else {
-        const step = this.stepsForChild[this.currentStepId - 1]
+        const step = this.stepsForChild.find(item => item.id === this.currentStepId)
         // 检查角色和部门权限
         if (step && step.properties && step.properties.chargePerson) {
           if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
@@ -410,11 +410,16 @@ export default {
       // 下一环节人员信息
       chargePerson: {},
       // 动态按钮配置
-      buttonGroup: null
+      buttonGroup: null,
+      // 分支节点相关数据
+      branchNodes: [], // 需要选择人员的分支节点列表
+      branchChargePersons: {}, // 分支节点人员选择 格式：{stepId: personId}
+      isWfResultBranch: false, // 是否包含WF_RESULT的分支
+      calculatedTargetNode: null // 前台计算出的目标节点
     }
   },
   async mounted () {
-    this.init()
+    await this.init()
     // this.checkDeadline()
   },
   props: {
@@ -469,6 +474,12 @@ export default {
       this.formCompletedData = {}
       this.formCompletedDataPreview = null
       this.operationType = 'submit'
+
+      // 清理分支节点相关数据
+      this.branchNodes = []
+      this.branchChargePersons = {}
+      this.isWfResultBranch = false
+      this.calculatedTargetNode = null
     },
     async showQueryFormItemFunc () {
       if (this.attr.showQueryFormItemFunc) {
@@ -503,42 +514,39 @@ export default {
         workflowId: this.workflowId
       })
         .then(res => {
-          res.state = this.stepsForChild[res.id - 1].name
           this.currentStepId = res.id
+          const currentStep = this.stepsForChild.find(item => item.id === res.id)
+          res.state = currentStep.name
           // 获取到当前步骤后复制下一步时间
-          this.deadline = this.getDefaultDeadline(this.stepsForChild[this.currentStepId - 1].properties?.otherProperty?.nextNodeInterval)
+          this.deadline = this.getDefaultDeadline(currentStep.properties?.otherProperty?.nextNodeInterval)
           this.currentStep = res
           this.getDirection()
         }, err => {
           console.log(err)
         })
     },
-    // 判断id是否为流程中最后一个
-    isLastStep (stepId) {
-      const lastStepId = this.stepsDefine[this.stepsDefine.length - 1].id
-      this.lastStep = stepId === lastStepId
-    },
     // 完工按钮
     async lastStepNextClick () {
       this.$refs.xAddForm.asyncSubmit().then((res) => {
-        this.submitForm(res)
-        postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
-          workflowId: this.workflowId,
-          stepId: this.currentStepId,
-          submitUser: this.currUser.name,
-          submitUserId: this.currUser.id
-        }).then(_res => {
-            this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
-            this.$message.success('已完工！')
-            this.loading = true
-            this.loadingHistory = true
-            this.onClose()
-            this.$emit('success', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId })
-          },
-          () => {
-            this.$message.error('提交失败！')
-          }
-        )
+        this.submitForm(res).then(_ => {
+          postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
+            workflowId: this.workflowId,
+            stepId: this.currentStepId,
+            submitUser: this.currUser.name,
+            submitUserId: this.currUser.id
+          }).then(_res => {
+              this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
+              this.$message.success('已完工！')
+              this.loading = true
+              this.loadingHistory = true
+              this.onClose()
+              this.$emit('success', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId })
+            },
+            () => {
+              this.$message.error('提交失败！')
+            }
+          )
+        })
       })
     },
     // 三个按钮点击后逻辑
@@ -558,29 +566,35 @@ export default {
         })
       })
       this.$refs.xAddForm.asyncSubmit().then(res => {
-        this.submitForm(res)
-        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
-          .then(
-            () => {
-              const extra = {
-                setHandler: this.getStepHandler(),
-                setDeadline: this.deadline,
-                notes: this.note.trim()
+        this.submitForm(res).then(_ => {
+          postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+            .then(
+              () => {
+                const extra = {
+                  setHandler: this.getStepHandler(),
+                  setDeadline: this.deadline,
+                  notes: this.note.trim()
+                }
+                this.saveWorkflowLog('提交', this.generateStepChangeText(this.currentStepId, this.nextBtnTo), extra)
+                this.$message.success('提交成功')
+                this.loading = true
+                this.loadingHistory = true
+                this.$emit('nextClick', {
+                  note: this.note.trim(),
+                  form: res.realForm,
+                  workflowId: this.workflowId,
+...this.generateStepChange(this.currentStepId, this.nextBtnTo)
+                })
+                this.$emit('refresh')
+                this.onClose()
+                this.init()
+              },
+              err => {
+                this.$message.error('提交失败！')
+                console.log(err)
               }
-              this.saveWorkflowLog('提交', this.generateStepChangeText(this.currentStepId, this.nextBtnTo), extra)
-              this.$message.success('提交成功')
-              this.loading = true
-              this.loadingHistory = true
-              this.$emit('nextClick', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId, ...this.generateStepChange(this.currentStepId, this.nextBtnTo) })
-              this.$emit('refresh')
-              this.onClose()
-              this.init()
-            },
-            err => {
-              this.$message.error('提交失败！')
-              console.log(err)
-            }
-          )
+            )
+        })
       })
     },
     async preClick () {
@@ -591,7 +605,8 @@ export default {
       }
       return postByServiceName(workFlowViewApi.updateWorkFlowState, {
         stepId: this.preBtnTo,
-        workflowId: this.workflowId
+        workflowId: this.workflowId,
+        type: 'back'
       })
         .then(
           res => {
@@ -615,72 +630,75 @@ export default {
         return
       }
       this.$refs.xAddForm.asyncSubmit().then(res => {
-        this.submitForm(res)
-        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
-          .then(
-            () => {
-              const extra = {
-                setHandler: this.getStepHandler(),
-                setDeadline: this.deadline,
-                notes: this.note.trim()
+        this.submitForm(res).then(_ => {
+          postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+            .then(
+              () => {
+                const extra = {
+                  setHandler: this.getStepHandler(),
+                  setDeadline: this.deadline,
+                  notes: this.note.trim()
+                }
+                this.saveWorkflowLog('跳过', this.generateStepChangeText(this.currentStepId, this.stepNextBtnTo), extra)
+                this.$message.success('提交成功')
+                this.$emit('nextClick', {
+                  note: this.note.trim(),
+                  form: res.realForm,
+                  workflowId: this.workflowId,
+...this.generateStepChange(this.currentStepId, this.stepNextBtnTo)
+                })
+                this.loading = true
+                this.loadingHistory = true
+                this.$emit('refresh')
+                this.onClose()
+                this.init()
+              },
+              err => {
+                this.$message.error('提交失败！')
+                console.log(err)
               }
-              this.saveWorkflowLog('跳过', this.generateStepChangeText(this.currentStepId, this.stepNextBtnTo), extra)
-              this.$message.success('提交成功')
-              this.$emit('nextClick', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId, ...this.generateStepChange(this.currentStepId, this.stepNextBtnTo) })
-              this.loading = true
-              this.loadingHistory = true
-              this.$emit('refresh')
-              this.onClose()
-              this.init()
-            },
-            err => {
-              this.$message.error('提交失败！')
-              console.log(err)
-            }
-          )
+            )
+        })
       })
     },
     // 获取当前步骤节点，连通的节点
-    getDirection () {
+    async getDirection () {
       // 获取流程定义
       return postByServiceName(workFlowViewApi.getWorkFlowDefine, {
         id: this.workflowId
       })
-        .then(res => {
+        .then(async res => {
           res = JSON.parse(res.value)
           this.directions = []
           this.stepsDefine = res.steps
-          this.resolveDirections()
+          await this.resolveDirections()
           this.resolveStep()
         }, err => {
           console.log(err)
         })
     },
     // 分析当前节点，能通向的节点
-    resolveDirections () {
-      let hasBack = false
-      if (this.stepsDefine[this.currentStepId - 1]?.properties?.actions) {
-        this.currentDirections = this.stepsDefine[this.currentStepId - 1].properties.actions.filter((item) => {
-          if (item.type === 'back') {
-            hasBack = true
-          }
-          return true
-        })
-      }
-      // 默认可退回到上一步
-      if (!hasBack && this.currentStepId !== 1) {
-        this.currentDirections.push({ head: this.currentStepId, tail: this.currentStepId - 1, type: 'back' })
+    async resolveDirections () {
+      const currentStep = this.stepsForChild.find(item => item.id === this.currentStepId)
+      if (currentStep?.properties?.actions) {
+        this.currentDirections = currentStep.properties.actions
       }
-      this.isLastStep(this.currentStepId)
+      // 判断是否是最后ige节点
+      this.lastStep = (currentStep?.properties?.actions || []).filter(item => {
+        return item.type !== 'back'
+      }).length === 0
+
+      // 处理跳转按钮
+      this.workflowControl()
+
       if (!this.lastStep) {
-        // 设置下一步的操作人
-        this.setChargePersonOptions(this.currentStepId + 1)
+        // 分析分支节点并设置智能人员选择
+        await this.analyzeBranchNodes()
       }
-      this.workflowControl()
     },
     // 根据步骤id获取步骤名称
     getStepNameByStepId (stepId) {
-      return this.stepsDefine[stepId - 1].name
+      return this.stepsDefine.find(item => item.id === stepId)?.name
     },
     // 表单提交的回调
     submitForm (obj) {
@@ -710,7 +728,7 @@ export default {
     },
     // 获取当前步骤定义内容，构建组件
     buildComp () {
-      const properties = this.stepsDefine[this.currentStep.id - 1].properties
+      const properties = this.stepsDefine.find(item => item.id === this.currentStep.id).properties
       // 表单的渲染
       if (properties.form && properties.form.formJson) {
         this.stepDefine = properties.form.formJson
@@ -737,34 +755,66 @@ export default {
     },
     // 根据当前节点，判断之后流程，以及按钮的显示
     workflowControl () {
-      for (const direction of this.currentDirections) {
-        if (direction.type === 'submit') {
-          this.showNextBtn = true
-          this.nextBtnTo = direction.to
-          this.nextBtnTitle = '进行下一环节：' + this.getStepNameByStepId(direction.to)
-        } else if (direction.type === 'skip') {
-          this.showStepNextBtn = true
-          this.stepNextBtnTo = direction.to
-          this.stepNextBtnTitle = '跳至：' + this.getStepNameByStepId(direction.to) + '环节'
+      // 分类收集不同类型的actions
+      const submitActions = this.currentDirections.filter(item => item.type === 'submit')
+      const conditionalActions = this.currentDirections.filter(item => item.type === 'conditionalBranch')
+      const parallelActions = this.currentDirections.filter(item => item.type === 'parallelBranch')
+      const skipActions = this.currentDirections.filter(item => item.type === 'skip')
+      const backActions = this.currentDirections.filter(item => item.type === 'back')
+
+      // 处理提交按钮 - 优先级：submit > conditionalBranch > parallelBranch
+      if (submitActions.length > 0) {
+        this.showNextBtn = true
+        this.nextBtnTo = submitActions[0].to // 如果有多个submit，取第一个作为主要跳转目标
+        if (submitActions.length === 1) {
+          this.nextBtnTitle = '进行下一环节：' + this.getStepNameByStepId(submitActions[0].to)
+        } else {
+          this.nextBtnTitle = '将进入以下环节：' + submitActions.map(item => this.getStepNameByStepId(item.to)).join(' , ')
+        }
+      } else if (conditionalActions.length > 0) {
+        this.showNextBtn = true
+        this.nextBtnTo = conditionalActions[0].to // 条件分支的第一个作为主要跳转目标
+        const targetSteps = conditionalActions.map(item => this.getStepNameByStepId(item.to)).join(' , ')
+        this.nextBtnTitle = '后台判断后跳转到：' + targetSteps
+      } else if (parallelActions.length > 0) {
+        this.showNextBtn = true
+        this.nextBtnTo = parallelActions[0].to // 并行分支的第一个作为主要跳转目标
+        const targetSteps = parallelActions.map(item => this.getStepNameByStepId(item.to)).join(' , ')
+        this.nextBtnTitle = '将并行进入以下分支：' + targetSteps
+      }
+
+      // 处理跳过按钮
+      if (skipActions.length > 0) {
+        this.showStepNextBtn = true
+        this.stepNextBtnTo = skipActions[0].to
+        if (skipActions.length === 1) {
+          this.stepNextBtnTitle = '跳至：' + this.getStepNameByStepId(skipActions[0].to) + '环节'
           this.stepNextBtnText.push('将跳过以下环节：')
-          for (let i = this.currentStepId; i < direction.to - 1; i++) {
+          for (let i = this.currentStepId; i < skipActions[0].to - 1; i++) {
             this.stepNextBtnText.push(this.stepsDefine[i].name)
           }
-        } else if (direction.type === 'back') {
-          for (let i = this.currentStepId - 1; i > 0; i--) {
-            if (direction.to >= i && this.stepsForChild[i - 1].handler) {
-              this.preBtnTo = i
-              this.preBtnTitle = '回退至：' + this.getStepNameByStepId(i) + '环节'
-              this.showPrevBtn = true
-              break
-            } else {
-              this.preBtnText.push(this.getStepNameByStepId(i))
-            }
-          }
-          if (this.preBtnText.length) {
-            this.preBtnText.unshift('将跳过以下环节：')
+        } else {
+          const targetSteps = skipActions.map(item => this.getStepNameByStepId(item.to)).join(' , ')
+          this.stepNextBtnTitle = '跳至：' + targetSteps
+        }
+      }
+
+      // 处理退回按钮
+      if (backActions.length > 0) {
+        const backAction = backActions[0] // 通常只有一个back action
+        for (let i = this.currentStepId - 1; i > 0; i--) {
+          if (backAction.to >= i && this.stepsForChild.find(item => item.id === i)?.handler) {
+            this.preBtnTo = i
+            this.preBtnTitle = '回退至：' + this.getStepNameByStepId(i) + '环节'
+            this.showPrevBtn = true
+            break
+          } else {
+            this.preBtnText.push(this.getStepNameByStepId(i))
           }
         }
+        if (this.preBtnText.length) {
+          this.preBtnText.unshift('将跳过以下环节：')
+        }
       }
     },
     // 获取表单字段实际值
@@ -779,7 +829,7 @@ export default {
     // 加载完成
     resolveStep () {
       // 获取当前步骤的按钮组配置
-      const currentStep = this.stepsDefine[this.currentStepId - 1]
+      const currentStep = this.stepsDefine.find(item => item.id === this.currentStepId)
       if (currentStep && currentStep.properties && currentStep.properties.buttonGroup) {
         this.buttonGroup = currentStep.properties.buttonGroup
       } else {
@@ -789,6 +839,7 @@ export default {
     },
     // 流程图组件给当前组件传值用，stepNo为用户点击的非当前步骤
     async activeStep (stepId) {
+      console.log('activeStep', stepId)
       // 开启加载
       this.loadingHistory = true
       this.activeStepId = stepId
@@ -806,7 +857,8 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
-        const isKeyHandle = this.stepsDefine[stepId - 1]?.properties?.form?.isKeyHandle || false
+        const currentStepDefine = this.stepsDefine.find(item => item.id === stepId)
+        const isKeyHandle = currentStepDefine?.properties?.form?.isKeyHandle || false
         for (const key in formData) {
           for (let i = 0; i < this.targetStepDefine.length; i++) {
             const stepDefine = this.targetStepDefine[i]
@@ -837,19 +889,15 @@ export default {
           formCompletedDataPreview.data = null
         }
         // 备注
-        formCompletedDataPreview.note = this.stepsForChild[stepId - 1].note
+        formCompletedDataPreview.note = this.stepsForChild.find(item => item.id === stepId)?.note
         if (!formCompletedDataPreview.data && !formCompletedDataPreview.files.length && !formCompletedDataPreview.images.length && !formCompletedDataPreview.note) {
           formCompletedDataPreview = null
         }
         this.formCompletedDataPreview = formCompletedDataPreview
         // 渲染已完成步骤的Tab
-        const properties = this.stepsDefine[stepId - 1].properties
+        const properties = this.stepsDefine.find(item => item.id === stepId).properties
         this.tabDesigner = properties.tabDesigner
-        if (this.tabDesigner) {
-          this.showTab = true
-        } else {
-          this.showTab = false
-        }
+        this.showTab = !!this.tabDesigner
         // 完成
         this.loadingHistory = false
         this.beforeStepActive = this.activeStepName !== this.currentStep.state
@@ -884,11 +932,28 @@ export default {
       // if (!this.checkDeadline(true)) {
       //   return false
       // }
-      const stepHandler = this.getStepHandler()
-      if (this.needSelectPerson && !this.checkedChargePerson) {
-        this.$message.error('请设置下一环节处理人')
-        return false
+
+      // 验证人员选择
+      if (this.needSelectPerson) {
+        if (this.isWfResultBranch) {
+          // 多分支情况：检查是否所有需要的分支都选择了人员
+          const missingSelections = this.branchNodes.filter(node => !this.branchChargePersons[node.stepId])
+          if (missingSelections.length > 0) {
+            const missingNames = missingSelections.map(node => node.stepName).join('、')
+            this.$message.error(`请设置以下节点的处理人：${missingNames}`)
+            return false
+          }
+        } else {
+          // 单分支情况：检查是否选择了处理人
+          if (!this.checkedChargePerson) {
+            this.$message.error('请设置下一环节处理人')
+            return false
+          }
+        }
       }
+
+      const stepHandler = this.getStepHandler()
+
       return {
         workflowId: this.workflowId,
         stepId,
@@ -899,20 +964,50 @@ export default {
         personList: this.chargePerson.personList,
         deadline: this.deadline,
         submitUser: this.currUser.name,
-        submitUserId: this.currUser.id
+        submitUserId: this.currUser.id,
+        // 新增：分支节点信息
+        branchChargePersons: this.branchChargePersons
       }
     },
     // 获取当前选择的负责人
     getStepHandler () {
       let stepHandler
-      if (this.checkedChargePerson) {
-        // 使用 value 找到对应的 label
-        stepHandler = this.chargePersonOptions.find(item => item.value === this.checkedChargePerson).label
-      } else if (this.chargePerson.personList && this.chargePerson.personList.length > 0) {
-        stepHandler = this.chargePerson.personList.map(item => item.name).join(',')
+
+      if (this.isWfResultBranch) {
+        // 多分支情况：返回所有已选择的人员信息
+        const selectedHandlers = []
+        for (const node of this.branchNodes) {
+          const personId = this.branchChargePersons[node.stepId]
+          if (personId) {
+            const personName = this.getBranchPersonName(node.stepId)
+            selectedHandlers.push(`${node.stepName}:${personName}`)
+          }
+        }
+        stepHandler = selectedHandlers.join(';')
+      } else {
+        // 单分支情况：原有逻辑
+        if (this.checkedChargePerson) {
+          // 使用 value 找到对应的 label
+          stepHandler = this.chargePersonOptions.find(item => item.value === this.checkedChargePerson)?.label
+        } else if (this.chargePerson.personList && this.chargePerson.personList.length > 0) {
+          stepHandler = this.chargePerson.personList.map(item => item.name).join(',')
+        }
       }
+
       return stepHandler
     },
+
+    // 获取分支节点选择的人员姓名
+    getBranchPersonName (stepId) {
+      const personId = this.branchChargePersons[stepId]
+      if (!personId) return ''
+
+      const node = this.branchNodes.find(n => n.stepId === stepId)
+      if (!node) return ''
+
+      const person = node.chargePersonOptions.find(p => p.value === personId)
+      return person ? person.label : ''
+    },
     // 生成工作流日志步骤变化描述
     generateStepChangeText (fromStepId, toStepId) {
       return `第${fromStepId}步: ${this.getStepNameByStepId(fromStepId)} --> 第${toStepId}步: ${this.getStepNameByStepId(toStepId)}`
@@ -970,86 +1065,13 @@ export default {
       return true
     },
     // 操作类型单选按钮改变时重新设置负责人选择框
-    handleOperationTypeChange (event) {
+    async handleOperationTypeChange (event) {
       this.checkedChargePerson = undefined
-      if (event.target.value === 'submit') {
-        this.setChargePersonOptions(this.nextBtnTo)
-      } else {
-        this.setChargePersonOptions(this.stepNextBtnTo)
-      }
+      this.branchChargePersons = {}
+      // 重新分析分支节点
+      await this.analyzeBranchNodes()
     },
-    // 从指定步骤设置负责人下拉选择框
-    async setChargePersonOptions (stepId) {
-      this.checkedChargePerson = undefined
-      const define = this.stepsDefine[stepId - 1]
-      const defineProperties = define.properties
-      // chargePerson 改造  旧数据类型是 {chrgePerson: {role: '1', department: '1'}}
-      // 新数据类型是
-      // "chargePerson": {
-      //     "personList": [
-      //         {
-      //             "type": "department",
-      //             "name": "营业厅"
-      //         },
-      //         {
-      //             "type": "role",
-      //             "name": "管理员"
-      //         }
-      //     ],
-      //     "needSelectPerson": true
-      // }
-      const chargePerson = defineProperties.chargePerson
-      if (!chargePerson) {
-        this.needSelectPerson = false
-        this.chargePersonOptions = []
-        return
-      }
-      // 如果是旧的格式 转换成新的格式后再作处理
-      if (chargePerson.role || chargePerson.department) {
-        chargePerson.needSelectPerson = true
-        chargePerson.personList = [{ type: chargePerson.role ? 'role' : 'department', name: chargePerson.role || chargePerson.department }]
-      }
-      this.needSelectPerson = chargePerson.needSelectPerson
-      this.chargePerson = chargePerson
-      const chargePersonOptions = []
-      // 如果需要选择人员 则在这里选择人员 否则 后台选择人员 这里不处理
-      if (chargePerson.needSelectPerson) {
-        // 获取所有用户信息
-        const allUser = await postByServiceName(commonApi.getAllUserOptionList, {})
-
-        // 使用reduce累积结果
-        const options = chargePerson.personList.reduce((acc, personItem) => {
-          let filteredUsers = []
 
-          if (personItem.type === 'role') {
-            // 根据角色获取人员
-            filteredUsers = allUser.filter(user =>
-              user.rolestr && user.rolestr.split(',').includes(personItem.name)
-            ).map(user => {
-              return { label: user.label, value: user.value }
-            })
-          } else if (personItem.type === 'department') {
-            // 根据部门获取人员
-            filteredUsers = allUser.filter(user =>
-              user.depname === personItem.name
-            ).map(user => {
-              return { label: user.label, value: user.value }
-            })
-          }
-
-          return [...acc, ...filteredUsers]
-        }, [])
-
-        // 去重处理
-        const uniqueOptions = Array.from(new Map(options.map(item => [item.value, item])).values())
-        chargePersonOptions.push(...uniqueOptions)
-      }
-      this.chargePersonOptions = chargePersonOptions
-      // 默认选中下一环节负责人
-      if (this.chargePersonOptions.length === 1) {
-        this.checkedChargePerson = this.chargePersonOptions[0].value
-      }
-    },
     // 处理动态按钮点击
     handleCustomButtonClick (button) {
       try {
@@ -1084,7 +1106,225 @@ export default {
     },
     formItemEmitFunc (func, data, value) {
       this.$emit('x-form-item-emit-func', func, data, value)
-    }
+    },
+    // 检查条件表达式是否包含WF_RESULT
+    checkIfContainsWfResult () {
+      const conditionalActions = this.currentDirections.filter(action => action.type === 'conditionalBranch')
+      if (conditionalActions.length === 0) return false
+
+      return conditionalActions.some(action => {
+        return action.expression && action.expression.includes('WF_RESULT')
+      })
+    },
+
+    // 分析分支节点并设置选择框
+    async analyzeBranchNodes () {
+      const conditionalActions = this.currentDirections.filter(action => action.type === 'conditionalBranch')
+      // 如果没有分支节点，处理普通单线流程
+      if (conditionalActions.length === 0) {
+        this.branchNodes = []
+        this.isWfResultBranch = false
+
+        await this.handleNormalFlow()
+        return
+      }
+
+      this.isWfResultBranch = this.checkIfContainsWfResult()
+
+      if (this.isWfResultBranch) {
+        // 包含WF_RESULT，需要显示所有可能分支的人员选择
+        await this.setupMultipleBranchSelection(conditionalActions)
+      } else {
+        this.branchNodes = []
+        // 不包含WF_RESULT，可以前台实时计算
+        await this.calculateTargetNodeFromForm(conditionalActions)
+      }
+    },
+
+    // 根据表单数据计算目标节点
+    async calculateTargetNodeFromForm (conditionalActions = null) {
+      if (!conditionalActions) {
+        conditionalActions = this.currentDirections.filter(action => action.type === 'conditionalBranch')
+      }
+
+      if (conditionalActions.length === 0) return
+
+      try {
+        const formData = this.$refs.xAddForm?.form || {}
+
+        // 遍历条件找到匹配的
+        for (const action of conditionalActions) {
+          if (action.expression) {
+            const result = await this.evaluateExpression(action.expression, formData)
+            if (result) {
+              this.calculatedTargetNode = action.to
+              // 设置对应节点的人员选择
+              const stepDefine = this.stepsDefine.find(step => step.id === action.to)
+              if (stepDefine?.properties?.chargePerson?.needSelectPerson) {
+                this.chargePerson = stepDefine?.properties?.chargePerson
+                this.checkedChargePerson = undefined
+                this.chargePersonOptions = await this.getChargePersonOptionsForStep(action.to)
+                // 如果只有一个选项，自动选中
+                if (this.chargePersonOptions.length === 1) {
+                  this.checkedChargePerson = this.chargePersonOptions[0].value
+                }
+                this.needSelectPerson = true
+              } else {
+                this.needSelectPerson = false
+                this.chargePersonOptions = []
+              }
+              return
+            }
+          }
+        }
+        // 如果没有匹配的条件，清空选择
+        this.calculatedTargetNode = null
+        this.needSelectPerson = false
+        this.chargePersonOptions = []
+      } catch (error) {
+        console.warn('计算目标节点失败:', error)
+        this.calculatedTargetNode = null
+      }
+    },
+
+    // 表达式评估 - 使用 LogicRunner
+    async evaluateExpression (expression, formData) {
+      try {
+        // 构建参数对象，传递当前表单数据
+        const params = {
+          WF_FORM: { ...formData }
+        }
+
+        // 使用 LogicRunner 执行表达式
+        const result = await LogicRunner.runExpression(expression, params)
+        return result
+      } catch (error) {
+        console.warn('表达式评估失败:', expression, error)
+        return false
+      }
+    },
+
+    // 获取指定步骤的人员选项
+    async getChargePersonOptionsForStep (stepId) {
+      const define = this.stepsDefine.find(item => item.id === stepId)
+      if (!define?.properties?.chargePerson) return []
+
+      const chargePerson = define.properties.chargePerson
+      this.chargePerson = chargePerson
+      // 如果是旧的格式 转换成新的格式
+      if (chargePerson.role || chargePerson.department) {
+        chargePerson.needSelectPerson = true
+        chargePerson.personList = [{
+          type: chargePerson.role ? 'role' : 'department',
+          name: chargePerson.role || chargePerson.department
+        }]
+      }
+
+      if (!chargePerson.needSelectPerson || !chargePerson.personList) return []
+
+      // 获取所有用户信息
+      const allUser = await postByServiceName(commonApi.getAllUserOptionList, {})
+
+      // 使用reduce累积结果
+      const options = chargePerson.personList.reduce((acc, personItem) => {
+        let filteredUsers = []
+
+        if (personItem.type === 'role') {
+          filteredUsers = allUser.filter(user =>
+            user.rolestr && user.rolestr.split(',').includes(personItem.name)
+          ).map(user => ({
+            label: user.label,
+            value: user.value
+          }))
+        } else if (personItem.type === 'department') {
+          filteredUsers = allUser.filter(user =>
+            user.depname === personItem.name
+          ).map(user => ({
+            label: user.label,
+            value: user.value
+          }))
+        }
+
+        return [...acc, ...filteredUsers]
+      }, [])
+
+      // 去重处理
+      return Array.from(new Map(options.map(item => [item.value, item])).values())
+    },
+
+    // 设置多分支人员选择（包含WF_RESULT的情况）
+    async setupMultipleBranchSelection (conditionalActions) {
+      this.branchNodes = []
+      this.branchChargePersons = {}
+
+      for (const action of conditionalActions) {
+        const stepDefine = this.stepsDefine.find(step => step.id === action.to)
+        if (stepDefine?.properties?.chargePerson?.needSelectPerson) {
+          // 都使用多分支了 肯定是新数据 那么不用做兼容处理
+          this.chargePerson = stepDefine?.properties?.chargePerson
+          // 获取这个节点的人员选项
+          const chargePersonOptions = await this.getChargePersonOptionsForStep(action.to)
+
+          this.branchNodes.push({
+            stepId: action.to,
+            stepName: this.getStepNameByStepId(action.to),
+            chargePerson: stepDefine.properties.chargePerson,
+            chargePersonOptions: chargePersonOptions
+          })
+          // 初始化选择值
+          this.branchChargePersons[action.to] = undefined
+        } else {
+          this.branchChargePersons[action.to] = stepDefine?.properties?.chargePerson
+        }
+      }
+
+      // 如果没有需要选择人员的分支，隐藏选择区域
+      this.needSelectPerson = this.branchNodes.length > 0
+    },
+
+    // 处理普通单线流程（没有分支的情况）
+    async handleNormalFlow () {
+      let targetStepId = this.nextBtnTo
+      if (this.operationType === 'skip') {
+        targetStepId = this.stepNextBtnTo
+      }
+
+      this.calculatedTargetNode = targetStepId
+      const stepDefine = this.stepsDefine.find(step => step.id === targetStepId)
+      const defineProperties = stepDefine.properties
+      this.chargePerson = defineProperties?.chargePerson
+      if (defineProperties.chargePerson?.role || defineProperties.chargePerson?.department) {
+        defineProperties.chargePerson.needSelectPerson = true
+        defineProperties.chargePerson.personList = [{
+          type: defineProperties.chargePerson.role ? 'role' : 'department',
+          name: defineProperties.chargePerson.role || defineProperties.chargePerson.department
+        }]
+      }
+      console.warn('defineProperties', defineProperties)
+
+      if (defineProperties?.chargePerson?.needSelectPerson) {
+        // 获取人员选项并设置
+        this.checkedChargePerson = undefined
+        this.chargePersonOptions = await this.getChargePersonOptionsForStep(targetStepId)
+        // 如果只有一个选项，自动选中
+        if (this.chargePersonOptions.length === 1) {
+          this.checkedChargePerson = this.chargePersonOptions[0].value
+        }
+        this.needSelectPerson = true
+        console.warn('设置人员选择，选项数量:', this.chargePersonOptions.length)
+      } else {
+        this.branchChargePersons[targetStepId] = stepDefine?.properties?.chargePerson
+        this.needSelectPerson = false
+        this.chargePersonOptions = []
+        console.warn('无需选择人员')
+      }
+    },
+    // 表单数据变化处理函数（将通过provide传递给表单组件）
+    async handleFormDataChange (formData) {
+      if (!this.isWfResultBranch) {
+        await this.calculateTargetNodeFromForm()
+      }
+    },
   },
   watch: {}
 }
@@ -1094,23 +1334,29 @@ export default {
   margin-top: 8px;
   margin-bottom: 8px;
 }
-:deep(.ant-result){
+
+:deep(.ant-result) {
   padding: 0;
 }
+
 .descriptionPreviewItem {
   margin-bottom: 22px;
+
   :deep(.ant-descriptions-view) {
     overflow: visible;
   }
 }
+
 .allWidth {
   :deep(.ant-descriptions-item-content) {
     width: 100%;
   }
 }
+
 .descriptionTitle {
   position: relative;
   padding-left: 12px;
+
   &::before {
     content: '';
     position: absolute;