Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-03 1bfba74b6bea7da6d14b0da1ab8b1efe02e474b3

 src/views/projectProcess/components/RunProcess.vue

@@ -10,7 +10,7 @@
      <div>
        <div style="display: flex; flex-direction: row; justify-content: center; align-items: center;font-size: 24px">
          <div>当前流程：</div>
          <div v-if="nowProcessDefId">{{selectProcessName}}</div>
          <div v-if="nowProcessDefId">{{selectProcessName}}<span v-if="nowProcessInsId" style="color: red">（运行中）</span></div>
          <div v-else>未绑定流程</div>
        </div>
      </div>
@@ -28,6 +28,11 @@
          <el-table-column
            prop="name"
            label="流程名称"
          >
          </el-table-column>
          <el-table-column
            prop="version"
            label="流程版本"
          >
          </el-table-column>
          <el-table-column
@@ -74,8 +79,8 @@
        </el-table>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="danger" @click="startProcess" :disable="!this.selectProcessDefId">启动流程</el-button>
        <el-button type="primary" @click="changeProcess">变更</el-button>
        <el-button type="danger" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">启动流程</el-button>
        <el-button type="primary" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">流程变更</el-button>
      </span>
    </el-dialog>
  </div>
@@ -100,10 +105,14 @@
      required: true,
      type: Array
    },
    nowProcessDefId: {  // 当前项目绑定的流程id
    nowProcessDefId: {  // 当前项目绑定的定义id
      required: true,
      type: String
    }
    },
    nowProcessInsId: {  // 当前项目绑定的实例id
      required: true,
      type: String
    },
  },
  watch: {
    // 监听回显值
@@ -120,6 +129,9 @@
      selectProcessDefId: '',  // 组件内部选中的流程id
      selectProcessName: '',  // 组件内部选中的流程id
    }
  },
  created() {
    console.log(this.nowProcessInsId, typeof this.nowProcessInsId, "wwwww")
  },
  methods: {
    setSelect(value) {
@@ -150,6 +162,7 @@
    startProcess() {
      startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => {
        this.$message.success(res.msg);
        this.handleClose()
      })
    },
    // 变更流程