Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-14 cbb1cc11a9557ce5c3cca9bca549b098436092b6

 src/views/projectProcess/index.vue

@@ -88,7 +88,7 @@
              <el-row>
                <el-col :span="12">
                  <el-form-item label="项目码">
                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                    <el-select v-model="queryParams.coding" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
@@ -197,6 +197,7 @@
        :prop="item.id"
        :label="item.label"
        :min-width="item.minWidth"
        :show-overflow-tooltip="item.showOverflowTooltip"
      >
        <template slot-scope="scope">
          <!-- 使用具名插槽 -->
@@ -205,14 +206,9 @@
            <template v-if="item.slotName === 'projectStatus'">
              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
            </template>
            <!-- projectColorCode插槽 -->
            <template v-if="item.slotName === 'projectColorCode' || item.slotName === 'coding'">
              <div v-if="scope.row.projectColorCode">
                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
              </div>
              <div v-else>
                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
              </div>
            <!-- coding插槽 -->
            <template v-if="item.slotName === 'coding' || item.slotName === 'coding'">
              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
            </template>
            <!-- projectType插槽 -->
            <template v-if="item.slotName === 'projectType'">
@@ -290,7 +286,7 @@
import { listDefinition } from "@/api/flowable/definition";
import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectEngineering/projectInfo";
import { getProjectProcess } from "@/api/projectProcess/projectProcess"
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import {projectProcessCurrent, projectProcessCurrentRest} 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";
@@ -355,7 +351,7 @@
        projectType: '', // 项目类型
        importanceType: '', // 重点分类
        projectStatus: '', // 项目状态
        projectColorCode: '', // 项目码
        coding: '', // 项目码
        investmentType: '', // 资金类型
        projectPhase: '', // 项目阶段
        investType: '', // 投资类别
@@ -384,7 +380,7 @@
    if(projectCategory){
      this.isProjectCategory = true;
    }
    const columns = current.map((item, index) => {
    const columns = projectProcessCurrent.map((item, index) => {
      item.index = index + 1;
      item.key = index;
      item.serialNumber = index + 1;
@@ -397,12 +393,15 @@
  methods: {
    // 查看详情
    lookProcessDetail(row) {
      console.log(row.processDefId)
      sessionStorage.removeItem("projectProDetail")
      this.$router.push({
        path: '/projectFlow/detail',
        query: {
          projectId: row.id,
          processDefId: row.processDefId
          processDefId: row.processDefId,
          processInsId: row.processInsId,
          deployId: row.deployId,
          processName: row.flowableProcessName
        }
      })
    },
@@ -418,28 +417,29 @@
    },
    // 打开流程页面
    openOpProcess(row) {
      // 拿到流程列表 TODO 根据项目类型做筛选
      getProcessConfigInfoList().then(response => {
        this.processList = response.data;
        this.nowProcessDefId = row.processDefId ? row.processDefId : '';
        this.nowProcessInsId = row.processInsId ? row.processInsId : '';
        // // 防止：id没变不触发监听
        // this.$refs.runProcess.setSelect(row.flowableProcessId);
        this.projectRunFrom.projectId = row.id;
        this.projectRunFrom.projectName = row.projectName;
      this.nowProcessDefId = row.processDefId ? row.processDefId : '';
      this.nowProcessInsId = row.processInsId ? row.processInsId : '';
      // // 防止：id没变不触发监听
      // this.$refs.runProcess.setSelect(row.flowableProcessId);
      this.projectRunFrom.projectId = row.id;
      this.projectRunFrom.projectName = row.projectName;

        this.showRunProcess = true;
      });
      this.showRunProcess = true;
      // 拿到流程列表 TODO 根据项目类型做筛选
      // getProcessConfigInfoList().then(response => {
      //   this.processList = response.data;
      //
      // });
    },
    // 重置排序的方法
    handleResetSort() {
      this.defaultColumns = currentRest.map((item, index) => {
      this.defaultColumns = projectProcessCurrentRest.map((item, index) => {
        item.index = index + 1;
        item.key = index;
        item.serialNumber = index + 1
        return item;
      });
      this.columns = currentRest.map((item, index) => {
      this.columns = projectProcessCurrentRest.map((item, index) => {
        item.index = index + 1;
        item.key = index;
        item.serialNumber = index + 1