Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/api/bpmprocess/process.js

@@ -58,6 +58,7 @@ export function bpmBackups(data) {
   })
 }
 
+// 导出流程文件
 export function exportFileProcess(processIds) {
   console.log()
   return request({
@@ -67,3 +68,15 @@ export function exportFileProcess(processIds) {
     baseURL: process.env.VUE_APP_BASE_API4,
   })
 }
+
+// 启用版本状态
+// 新增流程定义
+export function enableProcess(data) {
+  return request({
+    url: '/system/process/enableProcess',
+    method: 'post',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API4,
+  })
+}
+

ruoyi-ui/src/views/bpmprocess/index.vue

@@ -195,7 +195,7 @@
       <el-table-column label="版本注释" align="center" prop="note" />
       <el-table-column label="版本状态" align="center" prop="processVersion">
         <template slot-scope="scope">
-          <span>{{
+          <span style="color: #337ab7;cursor: pointer;" @click="versionStatusHandle(scope.row)">{{
             getDictLabel(scope.row.processVersion, dict.type.bpm_version)
           }}</span>
         </template>
@@ -342,6 +342,79 @@
         </span>
       </template>
     </el-dialog>
+
+
+    <!-- 版本状态对话框 -->
+    <el-dialog title="版本状态" width="800px" :visible.sync="isVersionsStatus">
+      <el-table
+      :data="versionForm"
+      style="width: 100%">
+        <el-table-column
+          prop="processName"
+          label="流程名称"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="processKey"
+          label="流程别名"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="processType"
+          label="流程类型"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="startEventType"
+          label="启动事件类型"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="note"
+          label="版本注释"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          align="center">
+        </el-table-column>
+        <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-dropdown>
+            <el-button type="warning" plain size="small">
+              处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  v-hasPermi="['system:user:edit']"
+                  @click="statusStartHandle(scope.row)"
+                  >启用
+                </el-button>
+              </el-dropdown-item>
+      
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+      </el-table>
+
+      <pagination
+      :total="statustotal"
+      :page.sync="statusParams.pageNum"
+      :limit.sync="statusParams.pageSize"
+      @pagination="pagelist(versionForm)"
+    />
+
+    </el-dialog>
   </div>
 </template>
 
@@ -354,6 +427,7 @@ import {
   updateProcess,
   bpmBackups,
   exportFileProcess,
+  enableProcess
 } from "@/api/bpmprocess/process";
 import Preview from "./components/preview.vue";
 
@@ -385,6 +459,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示版本控制弹出层
+      isVersionsStatus: false,
+      versionForm: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -401,11 +478,21 @@ export default {
         processJson: null,
         processXmlContent: null,
         processXmlPath: null,
+        processVersion:0
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
+      // 版本状态参数
+      statusParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: null,
+        processVersion:1
+      },
+      statustotal: 0,
+      processKey: null
     };
   },
   created() {
@@ -604,6 +691,37 @@ export default {
         return item.value == value;
       })?.label;
     },
+    // 版本状态
+    versionStatusHandle(row){
+      this.statusParams.processKey = this.processKey ?  this.processKey : row.processKey
+      listProcess(this.statusParams).then(res => {
+        this.statustotal = res.total
+        res.rows.forEach(item => {
+          // 启动事件类型
+          item.startEventType = this.getDictLabel(
+              item.startEventType,
+              this.dict.type.bpm_start_event_type
+            )
+          // 流程类型
+          item.processType = this.getDictLabel(item.processType, this.dict.type.bpm_type)
+        })
+        this.versionForm = res.rows
+      })
+      this.isVersionsStatus = true
+    },
+    // 版本状态分页器
+    pagelist(row){
+      this.processKey = row[0].processKey
+      this.versionStatusHandle(this.processKey)
+    },
+    // 版本状态启用
+    statusStartHandle(row) {
+      enableProcess({processId: row.processId, processKey: row.processKey}).then(res => {
+        if(res.code == 200){
+          this.$message.success("启用成功");
+        }
+      })
+    },
     // 预览流程图
     prviewHandle(row) {
       this.previewData = row;