Merge remote-tracking branch 'origin/master'

luohairen

2024-11-27 f67241a72e48a90cbcca28acbc2ce9aaffdfa43d

 src/views/projectProcess/index.vue

@@ -270,17 +270,23 @@
      :currentColumns="columns"
    />

    <RunProcess :show="showRunProcess" :now-process-id="nowProcessId" :now-process-name="nowProcessName" :process-list="processList" @close="closeRunProcess"></RunProcess>
    <RunProcess ref="runProcess" :show="showRunProcess"
                :now-process-id="nowProcessId"
                :project-info="projectRunFrom"
                :process-list="processList"
                @close="closeRunProcess">
    </RunProcess>
  </div>
</template>

<script>
import { listDefinition } from "@/api/flowable/definition";
import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
import { getProjectProcesss } from "@/api/projectProcess/projectProcess"
import { getProjectProcess } from "@/api/projectProcess/projectProcess"
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
import RunProcess from "@/views/projectProcess/components/RunProcess";
import {getProcessConfigInfoList} from "@/api/projectProcess/processConfigInfo";

export default {
  dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
@@ -292,11 +298,13 @@
  },
  data() {
    return {
      projectRunFrom: {
        projectId: null,
        projectName: ''
      },
      processList: [],
      showRunProcess: false,
      projectId: null,
      nowProcessId: '',
      nowProcessName: '',
      isImportOrExport: false,
      fileDialogVisible: false,
      //是否需要新增按钮(储蓄项目需要)
@@ -380,16 +388,24 @@
  },
  methods: {
    closeRunProcess() {
      this.projectRunFrom = {
        projectId: null,
        projectName: ''
      }
      this.showRunProcess = false
      this.getList()
    },
    // 打开流程页面
    openOpProcess(row) {
      this.projectId = row.id;
      this.nowProcessId = row.flowableProcessId;
      this.nowProcessName = row.flowableProcessName;
      // 拿到流程列表
      listDefinition(this.queryParams).then(response => {
        this.processList = response.data.records;
      // 拿到流程列表 TODO 根据项目类型做筛选
      getProcessConfigInfoList().then(response => {
        this.processList = response.data;
        this.nowProcessId = row.flowableProcessId;
        // // 防止：id没变不触发监听
        // this.$refs.runProcess.setSelect(row.flowableProcessId);
        this.projectRunFrom.projectId = row.id;
        this.projectRunFrom.projectName = row.projectName;

        this.showRunProcess = true;
      });
    },
@@ -448,7 +464,7 @@
    /** 查询项目管理基础信息列表 */
    getList() {
      this.loading = true;
      getProjectProcesss(this.queryParams).then(response => {
      getProjectProcess(this.queryParams).then(response => {
        this.projectInfoList = response.data;
        this.total = response.total;
      });