|
|
@@ -160,7 +160,7 @@
|
|
|
<div class="show-window">
|
|
|
<!-- 运行节点弹窗 -->
|
|
|
|
|
|
- <el-dialog :title="nodeTitle" :visible.sync="open" width="50%">
|
|
|
+ <el-dialog :title="nodeTitle" :visible.sync="open">
|
|
|
<!-- <el-form label-width="100px" :model="commonData">
|
|
|
<h1>这里会引入当前节点需要处理的表单</h1>
|
|
|
</el-form> -->
|
|
|
@@ -216,14 +216,16 @@ import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
|
|
|
|
|
|
// 弹窗表单组件
|
|
|
import GY01 from "./dialogCompments/GongYi/GY01.vue";
|
|
|
+import GY03 from "./dialogCompments/GongYi/GY03.vue";
|
|
|
import CG1 from "./dialogCompments/test-component/CaiGou/CG1.vue";
|
|
|
import KC1 from "./dialogCompments/test-component/KuCun/KC1.vue";
|
|
|
+import KC02 from "./dialogCompments/test-component/KuCun/KC02.vue";
|
|
|
import GY06 from "./dialogCompments/GongYi/GY06.vue";
|
|
|
|
|
|
export default {
|
|
|
name: "processMange",
|
|
|
props: [],
|
|
|
- components: { GY01, DialogTemplate, CG1, KC1, GY06 },
|
|
|
+ components: { GY01, DialogTemplate, CG1, KC1, GY06, GY03, KC02 },
|
|
|
dicts: ["bpm_type", "task_process_state"],
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -232,6 +234,7 @@ export default {
|
|
|
// 节点弹窗title
|
|
|
nodeTitle: "节点弹窗",
|
|
|
open: false,
|
|
|
+ // open: true,
|
|
|
// 节点弹窗对应的formData
|
|
|
commonData: {},
|
|
|
taskType: 1,
|
|
|
@@ -355,6 +358,8 @@ export default {
|
|
|
// 打开运行节点弹窗
|
|
|
async opneExecuteNode(row) {
|
|
|
this.resetDialogForm();
|
|
|
+ console.log(row);
|
|
|
+ this.nodeTitle = row.benTaskNodeName;
|
|
|
let preFix = row.benTaskNodeName.split("-")[0];
|
|
|
let {
|
|
|
benTaskNodeFormKey,
|
|
|
@@ -408,7 +413,6 @@ export default {
|
|
|
this.formType = "designForm";
|
|
|
this.myForm = preFix;
|
|
|
let res = await getProcessNodeFormInfoData(payLoad);
|
|
|
- console.log(res);
|
|
|
if (res.code == 200) {
|
|
|
this.formData = res.data;
|
|
|
} else {
|
|
|
@@ -418,6 +422,9 @@ export default {
|
|
|
this.row = row; //记录当前行数据
|
|
|
// if (!this.formType) return; //没有表单,直接掉运行逻辑
|
|
|
this.open = true; // 打开弹窗
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.myFormRef?.resetForm();
|
|
|
+ });
|
|
|
// 根据当前节点绑定的表单信息查询对应的表单进行展示
|
|
|
},
|
|
|
// 运行节点按钮 确认运行回调
|
|
|
@@ -446,7 +453,7 @@ export default {
|
|
|
implementationName: this.row.benmTaskAutomaticScriptTriggerType, //当前节点绑定的脚本名
|
|
|
// taskProcessXmlContent: this.row.bepTaskProcessXmlContent, //当前流程xml
|
|
|
tableName: this.tableName,
|
|
|
- formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
|
|
|
+ // formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
|
|
|
};
|
|
|
let fileXML = new File(
|
|
|
[this.row.bepTaskProcessXmlContent],
|
lph