Merge remote-tracking branch 'origin/master'

luohairen

2024-12-04 6f68dbce42bc7329e3e32a6959995a3a21843cc7

 src/views/projectProcess/index.vue

@@ -230,6 +230,7 @@
                      size="medium"
                      type="text"
                      icon="el-icon-view"
                      v-if="scope.row.processInsId"
                      @click="lookProcessDetail(scope.row)"
                    >
                    </el-button>
@@ -271,7 +272,8 @@
    />

    <RunProcess ref="runProcess" :show="showRunProcess"
                :now-process-id="nowProcessId"
                :now-process-def-id="nowProcessDefId"
                :now-process-ins-id="nowProcessInsId"
                :project-info="projectRunFrom"
                :process-list="processList"
                @close="closeRunProcess">
@@ -304,7 +306,8 @@
      },
      processList: [],
      showRunProcess: false,
      nowProcessId: '',
      nowProcessDefId: '',
      nowProcessInsId: '',
      isImportOrExport: false,
      fileDialogVisible: false,
      //是否需要新增按钮(储蓄项目需要)
@@ -389,11 +392,12 @@
  methods: {
    // 查看详情
    lookProcessDetail(row) {
      console.log(row.processDefId)
      this.$router.push({
        path: '/projectFlow/detail',
        query: {
          projectId: row.id,
          processId: row.flowableProcessId
          processDefId: row.processDefId
        }
      })
    },
@@ -402,6 +406,8 @@
        projectId: null,
        projectName: ''
      }
      this.nowProcessDefId = "";
      this.nowProcessInsId = "";
      this.showRunProcess = false
      this.getList()
    },
@@ -410,7 +416,8 @@
      // 拿到流程列表 TODO 根据项目类型做筛选
      getProcessConfigInfoList().then(response => {
        this.processList = response.data;
        this.nowProcessId = row.flowableProcessId;
        this.nowProcessDefId = row.processDefId ? row.processDefId : '';
        this.nowProcessInsId = row.processInsId ? row.processInsId : '';
        // // 防止：id没变不触发监听
        // this.$refs.runProcess.setSelect(row.flowableProcessId);
        this.projectRunFrom.projectId = row.id;