DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 表单数据保存修复

Browse Source
This commit is contained in:
tony
2022-12-16 21:52:53 +08:00
parent bc42ac6005
commit 2f5fed6f44
17 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/views/flowable/definition/index.vue
View File

@@ -102,7 +102,7 @@
<el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">编辑</el-button>
<el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-outline" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
<el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
<el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
@@ -131,7 +131,6 @@
</div>
</el-dialog>
<!-- bpmn20.xml导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
@@ -232,7 +231,7 @@ import { listDefinition, updateState, delDeployment, addDeployment, updateDeploy
import { getToken } from "@/utils/auth";
import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
import Parser from '@/components/parser/Parser'
import flow from '@/views/flowable/task/record/flow'
import flow from '@/views/flowable/task/myProcess/send/flow'
export default {
name: "Definition",

2
ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
View File

@@ -29,7 +29,7 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>实际办理</template>
<template slot="label"><i class="el-icon-user"></i>办理人</template>
{{item.assigneeName}}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag>
</el-descriptions-item>

8
ruoyi-ui/src/views/flowable/task/finished/index.vue
View File

@@ -217,7 +217,7 @@ export default {
instanceId: row.procInsId
}
revokeProcess(params).then( res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
this.getList();
});
},
@@ -237,13 +237,13 @@ export default {
if (valid) {
if (this.form.id != null) {
updateDeployment(this.form).then(response => {
this.msgSuccess("修改成功");
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDeployment(this.form).then(response => {
this.msgSuccess("新增成功");
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -262,7 +262,7 @@ export default {
return delDeployment(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功");
})
},
/** 导出按钮操作 */

6
ruoyi-ui/src/views/flowable/task/form/index.vue
View File

@@ -254,13 +254,13 @@ export default {
if (valid) {
if (this.form.formId != null) {
updateForm(this.form).then(response => {
this.msgSuccess("修改成功");
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addForm(this.form).then(response => {
this.msgSuccess("新增成功");
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -279,7 +279,7 @@ export default {
return delForm(formIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功");
})
},
/** 导出按钮操作 */

2
ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
View File

@@ -29,7 +29,7 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>实际办理</template>
<template slot="label"><i class="el-icon-user"></i>办理人</template>
{{item.assigneeName}}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag>
</el-descriptions-item>

8
ruoyi-ui/src/views/flowable/task/myProcess/index.vue
View File

@@ -311,7 +311,7 @@ export default {
instanceId: row.procInsId
}
stopProcess(params).then( res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
this.getList();
});
},
@@ -340,13 +340,13 @@ export default {
if (valid) {
if (this.form.id != null) {
updateDeployment(this.form).then(response => {
this.msgSuccess("修改成功");
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDeployment(this.form).then(response => {
this.msgSuccess("新增成功");
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -366,7 +366,7 @@ export default {
return delDeployment(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功");
})
},
/** 导出按钮操作 */

8
ruoyi-ui/src/views/flowable/task/myProcess/send/flow.vue
View File

@@ -1,22 +1,14 @@
<template>
<div>
<!--<bpmn-modeler
ref="refNode"
:xml="xmlData"
:is-view="true"
:taskList="taskData"
/>-->
<flow-view :xmlData="xmlData"/>
</div>
</template>
<script>
import bpmnModeler from '@/components/Process/index'
import FlowView from './flowview'
export default {
name: "Flow",
components: {
bpmnModeler,
FlowView
},
props: {

2
ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue
View File

@@ -48,7 +48,7 @@ export default {
this.bpmnViewer && this.bpmnViewer.destroy();
this.bpmnViewer = new BpmnViewer({
container: this.$refs.flowCanvas,
height: 'calc(100vh - 200px)',
height: 'calc(85vh - 200px)',
});
},
methods: {

6
ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
View File

@@ -17,7 +17,7 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图">
<flow :xmlData="xmlData"></flow>
<flow :xmlData="xmlData"/>
</el-tab-pane>
</el-tabs>
<el-button style="position: absolute;right:35px;top:35px;" type="primary" @click="goBack">关闭</el-button>
@@ -37,7 +37,7 @@
<script>
import Parser from '@/components/parser/Parser'
import {definitionStart, readXml} from "@/api/flowable/definition";
import flow from '@/views/flowable/task/myProcess/send/flow'
import flow from './flow'
import {flowFormData} from "@/api/flowable/process";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
import FlowUser from '@/components/flow/User'
@@ -174,7 +174,7 @@ export default {
// variables.variables = formData;
// // 启动流程并将表单数据加入流程变量
// definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
// this.msgSuccess(res.msg);
// this.$modal.msgSuccess(res.msg);
// this.goBack();
// })
// }

12
ruoyi-ui/src/views/flowable/task/record/index.vue
View File

@@ -47,7 +47,7 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>实际办理</template>
<template slot="label"><i class="el-icon-user"></i>办理人</template>
{{item.assigneeName}}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag>
</el-descriptions-item>
@@ -455,7 +455,7 @@ export default {
return;
}
complete(this.taskForm).then(response => {
this.msgSuccess(response.msg);
this.$modal.msgSuccess(response.msg);
this.goBack();
});
},
@@ -506,7 +506,7 @@ export default {
variables.variables = formData;
// 启动流程并将表单数据加入流程变量
definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
this.goBack();
})
}
@@ -522,7 +522,7 @@ export default {
this.$refs["taskForm"].validate(valid => {
if (valid) {
rejectTask(this.taskForm).then(res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
this.goBack();
});
}
@@ -542,7 +542,7 @@ export default {
this.$refs["taskForm"].validate(valid => {
if (valid) {
returnTask(this.taskForm).then(res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
this.goBack()
});
}
@@ -560,7 +560,7 @@ export default {
this.$refs["taskForm"].validate(valid => {
if (valid) {
delegate(this.taskForm).then(response => {
this.msgSuccess(response.msg);
this.$modal.msgSuccess(response.msg);
this.goBack();
});
}

5
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@@ -40,7 +40,7 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>实际办理</template>
<template slot="label"><i class="el-icon-user"></i>办理人</template>
{{item.assigneeName}}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag>
</el-descriptions-item>
@@ -76,8 +76,7 @@
<flow :xmlData="xmlData" :taskData="taskList"></flow>
</el-tab-pane>
</el-tabs>
<!-- <el-button style="position: absolute;right:35px;top:35px;" type="primary" @click="goBack">关闭</el-button>-->
<!--审批正常流程-->
<!--审批任务-->
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
<el-form ref="taskForm" :model="taskForm">
<el-form-item prop="targetKey">

2
ruoyi-ui/src/views/flowable/task/todo/index.vue
View File

@@ -216,7 +216,7 @@ export default {
return delDeployment(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功");
})
},
/** 导出按钮操作 */