diff --git a/src/views/setting.vue b/src/views/setting.vue
index 5705273..2a00bf3 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -24,7 +24,7 @@
default: false,
},
})
-const emits = defineEmits(['createProcessSuccess'])
+const emits = defineEmits(['createProcessSuccess', 'notice'])
const processConfig = ref({}) as any
const user = userStore()
@@ -96,9 +96,12 @@
flowPermission.value = flows // 发起人
directorMaxLevel.value = max // 用户主管最大层级数
workFlowDef.value = works // 流程基本信息
+ console.log('9090909090909090', workFlowDef.value.decisionItem)
+
window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
+ emits('notice') // 通知可选决策项和是否通知发起人已获得数据
workFlowStore.setTableId(tableId)
})
})
@@ -135,12 +138,15 @@
}
// 保存流程图
-const saveSet = async () => {
- if (!props.isAddProcess) { // 编辑
+const saveSet = async (type: string, getRowData: any) => {
+ if (type === 'edit') { // 编辑
+ console.log('000000000', getRowData)
+
processConfig.value.formId = props.getRowData.formId // 已有formid
- processConfig.value.formName = props.getRowData.formName
- processConfig.value.formDesc = props.getRowData.formDesc
- processConfig.value.formContent = props.getRowData.formDesc
+ processConfig.value.formName = getRowData.business // 表单名称、关联业务
+ processConfig.value.formDesc = getRowData.formDesc // 描述
+ processConfig.value.formContent = getRowData.formDesc // 描述
+ processConfig.value.workFlowDef.name = getRowData.name // 流程名称
processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
processConfig.value.workFlowDef.directorId = props.getRowData.directorId
}
@@ -150,8 +156,8 @@
processConfig.value.formDesc = props.getRowData.desc
processConfig.value.formContent = props.getRowData.desc
processConfig.value.workFlowDef.directorId = user.id
+ processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
}
- processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
const decisionItem = window.sessionStorage.getItem('decisionItem')
const noticeStarter = window.sessionStorage.getItem('noticeStarter')
if (decisionItem) {
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 5705273..2a00bf3 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -24,7 +24,7 @@
default: false,
},
})
-const emits = defineEmits(['createProcessSuccess'])
+const emits = defineEmits(['createProcessSuccess', 'notice'])
const processConfig = ref({}) as any
const user = userStore()
@@ -96,9 +96,12 @@
flowPermission.value = flows // 发起人
directorMaxLevel.value = max // 用户主管最大层级数
workFlowDef.value = works // 流程基本信息
+ console.log('9090909090909090', workFlowDef.value.decisionItem)
+
window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
+ emits('notice') // 通知可选决策项和是否通知发起人已获得数据
workFlowStore.setTableId(tableId)
})
})
@@ -135,12 +138,15 @@
}
// 保存流程图
-const saveSet = async () => {
- if (!props.isAddProcess) { // 编辑
+const saveSet = async (type: string, getRowData: any) => {
+ if (type === 'edit') { // 编辑
+ console.log('000000000', getRowData)
+
processConfig.value.formId = props.getRowData.formId // 已有formid
- processConfig.value.formName = props.getRowData.formName
- processConfig.value.formDesc = props.getRowData.formDesc
- processConfig.value.formContent = props.getRowData.formDesc
+ processConfig.value.formName = getRowData.business // 表单名称、关联业务
+ processConfig.value.formDesc = getRowData.formDesc // 描述
+ processConfig.value.formContent = getRowData.formDesc // 描述
+ processConfig.value.workFlowDef.name = getRowData.name // 流程名称
processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
processConfig.value.workFlowDef.directorId = props.getRowData.directorId
}
@@ -150,8 +156,8 @@
processConfig.value.formDesc = props.getRowData.desc
processConfig.value.formContent = props.getRowData.desc
processConfig.value.workFlowDef.directorId = user.id
+ processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
}
- processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
const decisionItem = window.sessionStorage.getItem('decisionItem')
const noticeStarter = window.sessionStorage.getItem('noticeStarter')
if (decisionItem) {
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9a9266a..1165f46 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -42,6 +42,15 @@
}
getDict()
+const getNotice = () => {
+ if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+ form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+ }
+ if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+ form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+ }
+}
+
onMounted(() => {
const rowData: any = $route.query.rowData
getRowData.value = JSON.parse(rowData)
@@ -51,12 +60,6 @@
form.value.name = getRowData.value.name
form.value.business = getRowData.value.business
form.value.desc = getRowData.value.describe
- if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
- form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
- }
- if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
- form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
- }
})
@@ -137,7 +140,7 @@
-
+
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 5705273..2a00bf3 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -24,7 +24,7 @@
default: false,
},
})
-const emits = defineEmits(['createProcessSuccess'])
+const emits = defineEmits(['createProcessSuccess', 'notice'])
const processConfig = ref({}) as any
const user = userStore()
@@ -96,9 +96,12 @@
flowPermission.value = flows // 发起人
directorMaxLevel.value = max // 用户主管最大层级数
workFlowDef.value = works // 流程基本信息
+ console.log('9090909090909090', workFlowDef.value.decisionItem)
+
window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
console.log('在这里获得了这条数据的可选决策项和是否通知发起人')
+ emits('notice') // 通知可选决策项和是否通知发起人已获得数据
workFlowStore.setTableId(tableId)
})
})
@@ -135,12 +138,15 @@
}
// 保存流程图
-const saveSet = async () => {
- if (!props.isAddProcess) { // 编辑
+const saveSet = async (type: string, getRowData: any) => {
+ if (type === 'edit') { // 编辑
+ console.log('000000000', getRowData)
+
processConfig.value.formId = props.getRowData.formId // 已有formid
- processConfig.value.formName = props.getRowData.formName
- processConfig.value.formDesc = props.getRowData.formDesc
- processConfig.value.formContent = props.getRowData.formDesc
+ processConfig.value.formName = getRowData.business // 表单名称、关联业务
+ processConfig.value.formDesc = getRowData.formDesc // 描述
+ processConfig.value.formContent = getRowData.formDesc // 描述
+ processConfig.value.workFlowDef.name = getRowData.name // 流程名称
processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
processConfig.value.workFlowDef.directorId = props.getRowData.directorId
}
@@ -150,8 +156,8 @@
processConfig.value.formDesc = props.getRowData.desc
processConfig.value.formContent = props.getRowData.desc
processConfig.value.workFlowDef.directorId = user.id
+ processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
}
- processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
const decisionItem = window.sessionStorage.getItem('decisionItem')
const noticeStarter = window.sessionStorage.getItem('noticeStarter')
if (decisionItem) {
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9a9266a..1165f46 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -42,6 +42,15 @@
}
getDict()
+const getNotice = () => {
+ if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+ form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+ }
+ if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+ form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+ }
+}
+
onMounted(() => {
const rowData: any = $route.query.rowData
getRowData.value = JSON.parse(rowData)
@@ -51,12 +60,6 @@
form.value.name = getRowData.value.name
form.value.business = getRowData.value.business
form.value.desc = getRowData.value.describe
- if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
- form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
- }
- if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
- form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
- }
})
@@ -137,7 +140,7 @@
-
+
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index a10a633..8f8d59d 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -95,11 +95,12 @@
window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
// 调保存接口
- processSetting.value.saveSet('edit', form.value.name, form.value.business, form.value.desc)
- getRowData.name = form.value.name // 流程名称
- getRowData.business = form.value.business // 流程名称
- getRowData.formID = form.value.formID // 流程名称
- getRowData.desc = form.value.desc // 流程名称
+ getRowData.value.name = form.value.name // 流程名称
+ getRowData.value.business = form.value.business // 关联业务
+ getRowData.value.desc = form.value.desc // 流程名称
+ getRowData.value.formDesc = form.value.desc // 流程名称
+ console.log('999999999999999', getRowData.value)
+ processSetting.value.saveSet('edit', getRowData.value)
}
else {
console.log('error submit!', fields)
@@ -107,6 +108,16 @@
})
}
+// 监听可选决策项、是否通知发起人获取到数据了
+const getNotice = () => {
+ if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
+ form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
+ }
+ if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
+ form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
+ }
+}
+
onMounted(() => {
const rowData: any = $route.query.rowData
getRowData.value = JSON.parse(rowData)
@@ -116,12 +127,6 @@
form.value.name = getRowData.value.name
form.value.business = getRowData.value.business
form.value.desc = getRowData.value.describe
- if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项
- form.value.decisionItem = window.sessionStorage.getItem('decisionItem')!
- }
- if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人
- form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')!
- }
})
@@ -151,7 +156,7 @@
-
+
@@ -205,7 +210,7 @@
-
+