|
@@ -340,32 +340,29 @@ const openComment = async (visibleType, item) => {
|
|
|
// 点击同意
|
|
|
let bool = true
|
|
|
if (item === 'agree') {
|
|
|
- const form = EReditorRef.value.getSelfFormRef()
|
|
|
- bool = await form.validate(valid => {
|
|
|
- if (valid) {
|
|
|
- // 表单验证通过 进行保存
|
|
|
- const formData = EReditorRef.value.getData()
|
|
|
- let processForm = JSON.parse(cur_processForm_str)
|
|
|
- processForm = { ...processForm, formData }
|
|
|
- currentFormData.value = { processForm: JSON.stringify(processForm) }
|
|
|
- console.log('验证通过')
|
|
|
+ const { processType } = currentTaskRow.value
|
|
|
+ const flag = processType === 'business' && currentObj.value.formTemplate.type === 1 // 系统表单
|
|
|
+ if (flag) {
|
|
|
+ //todo 这里的系统表单还未做必填校验,根据自己的业务做校验
|
|
|
+ const formData = dyVueComponentRef.value.getData()
|
|
|
+ const saveData = {
|
|
|
+ formStructure: '@/views/flow/test/test1.vue',
|
|
|
+ formData: formData
|
|
|
}
|
|
|
- })
|
|
|
- // const api = validateForm.value.api
|
|
|
- // bool = await api.validate((valid, fail) => {
|
|
|
- // if (valid) {
|
|
|
- // // 表单验证通过
|
|
|
- // const values = api.formData()
|
|
|
- // const processForm = JSON.parse(cur_processForm_str)
|
|
|
- // processForm.forEach(v => {
|
|
|
- // // 填写的数据存储(local_: 本地数据处理标识)
|
|
|
- // v.local_value = values[v.field]
|
|
|
- // })
|
|
|
- // console.warn(processForm, 'processForm')
|
|
|
- // // 流程表单JSON内容 & local_value 保存
|
|
|
- // currentFormData.value = { processForm: JSON.stringify(processForm) }
|
|
|
- // }
|
|
|
- // })
|
|
|
+ currentFormData.value = { processForm: JSON.stringify(saveData) }
|
|
|
+ } else {
|
|
|
+ const form = EReditorRef.value.getSelfFormRef()
|
|
|
+ bool = await form.validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ // 表单验证通过 进行保存
|
|
|
+ const formData = EReditorRef.value.getData()
|
|
|
+ let processForm = JSON.parse(cur_processForm_str)
|
|
|
+ processForm = { ...processForm, formData }
|
|
|
+ currentFormData.value = { processForm: JSON.stringify(processForm) }
|
|
|
+ console.log('验证通过')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
if (!bool) return
|
|
|
currentType.value = item
|