-
-
当前无法发布
-
-
-
- 以下内容不完善,需进行修改
-
-
-
-
- 流程设计
-
-
- {{ item.name }} 未选择{{ item.type }}
-
+
+
+
+
+
+
+
+
+
+
+
审批错误: 审批人不能为空({{ workFlowStore.approverErrorCount }}项)
-
-
-
-
- 我知道了
-
-
- 前往修改
-
-
+
+
+
+
+
+
+
+
+
条件错误: 条件分支后不能为空({{ workFlowStore.conditonErrorCount }}项)
+
+
+
+
+
+ 去修改
+
+
+
+
-
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 4e10eb0..bc76e54 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,5 +1,7 @@
@@ -244,7 +268,7 @@
-
+
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index f840c40..37d8f1c 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -69,32 +69,32 @@
},
]
const rules = reactive
({
- selectDecision: [
+ name: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '流程名称不能为空',
+ trigger: 'blur',
},
],
- rejectTo: [
+ business: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '关联业务不能为空',
+ trigger: 'blur',
},
],
- changeData: [
+ formID: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: 'formID不能为空',
+ trigger: 'blur',
},
],
- isMessage: [
+ desc: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '流程描述不能为空',
+ trigger: 'blur',
},
],
})
@@ -109,12 +109,9 @@
if (!formEl) { return }
await formEl.validate((valid, fields) => {
if (valid) {
- // 调保存接口
+ // 调setting组件的保存
processSetting.value.saveSet()
}
- else {
- console.log('error submit!', fields)
- }
})
}
@@ -164,7 +161,7 @@
-->
-
+
@@ -190,12 +187,12 @@
-->
-
+
-
+
-
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index f79428d..e19d7e8 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,5 +1,6 @@
-
-
-
-
-
当前无法发布
-
-
-
- 以下内容不完善,需进行修改
-
-
-
-
- 流程设计
-
-
- {{ item.name }} 未选择{{ item.type }}
-
+
+
+
+
+
+
+
+
+
+
+
审批错误: 审批人不能为空({{ workFlowStore.approverErrorCount }}项)
-
-
-
-
- 我知道了
-
-
- 前往修改
-
-
+
+
+
+
+
+
+
+
+
条件错误: 条件分支后不能为空({{ workFlowStore.conditonErrorCount }}项)
+
+
+
+
+
+ 去修改
+
+
+
+
-
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 4e10eb0..bc76e54 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,5 +1,7 @@
@@ -244,7 +268,7 @@
-
+
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index f840c40..37d8f1c 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -69,32 +69,32 @@
},
]
const rules = reactive
({
- selectDecision: [
+ name: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '流程名称不能为空',
+ trigger: 'blur',
},
],
- rejectTo: [
+ business: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '关联业务不能为空',
+ trigger: 'blur',
},
],
- changeData: [
+ formID: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: 'formID不能为空',
+ trigger: 'blur',
},
],
- isMessage: [
+ desc: [
{
required: true,
- message: '请选择',
- trigger: 'change',
+ message: '流程描述不能为空',
+ trigger: 'blur',
},
],
})
@@ -109,12 +109,9 @@
if (!formEl) { return }
await formEl.validate((valid, fields) => {
if (valid) {
- // 调保存接口
+ // 调setting组件的保存
processSetting.value.saveSet()
}
- else {
- console.log('error submit!', fields)
- }
})
}
@@ -164,7 +161,7 @@
-->
-
+
@@ -190,12 +187,12 @@
-->
-
+
-
+
-
+
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index a66f871..f6b1b01 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -164,12 +164,23 @@
}
// 删除
const del = (row: IlistQuery) => {
- delProcessList(row.deploymentId).then((res) => {
- if (res.code === 200) {
- ElMessage.success('删除成功')
- fetchData(true)
- }
- })
+ ElMessageBox.confirm(
+ `确认删除${row.name}吗?`,
+ '提示',
+ {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ },
+ )
+ .then(() => {
+ delProcessList(row.deploymentId).then((res) => {
+ if (res.code === 200) {
+ ElMessage.success('删除成功')
+ fetchData(true)
+ }
+ })
+ })
}
// 编辑页面点击关闭
const close = () => {