Merge branch 'master' into dev

zxl

2025-03-02 16f122cfcec09e65e4790ecee46bae1f1b7b8fff

 src/views/flowable/definition/index.vue

@@ -62,7 +62,7 @@
      <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true"/>
      <el-table-column label="流程标识" align="center" prop="flowKey" :show-overflow-tooltip="true" />
      <el-table-column label="流程分类" align="center" prop="category" />
      <el-table-column label="流程名称" align="center" width="120" :show-overflow-tooltip="true">
      <el-table-column label="流程名称" align="center" width="200" :show-overflow-tooltip="true">
        <template slot-scope="scope">
          <el-button type="text" @click="handleReadImage(scope.row.deploymentId)">
            <span>{{ scope.row.name }}</span>
@@ -92,6 +92,7 @@
      <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
          <el-button @click="handleConfig(scope.row)" icon="el-icon-edit-outline" type="text" size="small">流程配置</el-button>
          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>
          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
@@ -224,6 +225,11 @@
    <!--      append-to-body>-->
    <!--      <Model :deployId="deployId"/>-->
    <!--    </el-dialog>-->

    <edit-process-config :process-config-show="processConfigShow"
                         :deploy-name="configDeployName"
                         :form="configForm"
                         @close="closeConfig"/>
  </div>
</template>

@@ -242,16 +248,30 @@
import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
import BpmnViewer from '@/components/Process/viewer';
import Model from './model';
import EditProcessConfig from '@/views/flowable/definition/component/EditProcessConfig';
import {getProcessConfigInfoByDeploy} from "@/api/projectProcess/processConfigInfo";

export default {
  name: "Definition",
  dicts: ['sys_process_category'],
  components: {
    BpmnViewer,
    Model
    Model,
    EditProcessConfig
  },
  data() {
    return {
      configForm: {
        processDefId: '',
        deployId: '',
        processDefVersion: null,
        projectType: '', // 项目类型
        fundType: '',  // 资金类型
        investType: '',  // 投资类别
        importanceType: '',  // 重点分类
      },
      processConfigShow: false,  // 修改流程信息show
      configDeployName: '',   // 修改配置的部署名称
      // 遮罩层
      loading: true,
      dialogVisible: false,
@@ -341,6 +361,35 @@
    }
  },
  methods: {
    closeConfig() {
      this.configForm = {
        processDefId: '',
        deployId: '',
        processDefVersion: null,
        projectType: '', // 项目类型
        fundType: '',  // 资金类型
        investType: '',  // 投资类别
        importanceType: '',  // 重点分类
      }
      this.processConfigShow = false
    },
    handleConfig(row) {

      const params = {
        processDefId: row.id,
        processDefVersion: row.version
      }
      getProcessConfigInfoByDeploy(params).then(res => {
        if (res.data) {
          this.configForm = res.data
        }
      })
      this.configForm.processDefId = row.id
      this.configForm.deployId = row.deploymentId
      this.configForm.processDefVersion = row.version
      this.configDeployName = row.name
      this.processConfigShow = true
    },
    /** 查询流程定义列表 */
    getList() {
      this.loading = true;