修改解决 bug

src/components/scWorkflow/nodes/approver.vue

@@ -325,10 +325,9 @@ export default {
 				// 选择角色
 				if (!_form.nodeAssigneeList || !_form.nodeAssigneeList.length) return this.$message.warning('请选择角色')
 			}
-
-      if ( _form.actionUrl && _form.actionUrl.length ) {
-        _form.actionUrl = _form.actionUrl[0]
-      }
+			if (_form.actionUrl && _form.actionUrl.length) {
+				_form.actionUrl = _form.actionUrl[0]
+			}
 			this.emit(_form)
 			this.drawer = false
 		},

src/views/approve/components/approvedContent.vue

@@ -442,7 +442,6 @@ const getTaskDetail = () => {
 				}
 				modelContentConfig.value = modelContent_config || {}
 				window.modelContentConfig = modelContentConfig
-				console.error('modelContentConfig', modelContentConfig)
 				if (props.currentTaskType === 'pendingApproval') {
 					allowTransfer.value = data?.allowTransfer
 					allowAppendNode.value = data?.allowAppendNode

src/views/flow/form/index.vue

@@ -287,20 +287,22 @@ const treeForArr = data => {
 const getGroup = async () => {
 	showGroupLoading.value = true
 	let data = await formCategory.formCategoryListTreeApi({})
-	formOptions.value.forms[0].options = treeForArr(data).map(item => {
-		return { value: item.id, label: item.name }
-	})
-	formTemplateOptions.value.forms[0].options = treeForArr(data).map(item => {
-		return { value: item.id, label: item.name }
-	})
-	showGroupLoading.value = false
-	treeData.value = [{ id: '', name: '所有', children: data }]
-	// treeData.value = data
+	if (data) {
+		formOptions.value.forms[0].options = treeForArr(data).map(item => {
+			return { value: item.id, label: item.name }
+		})
+		formTemplateOptions.value.forms[0].options = treeForArr(data).map(item => {
+			return { value: item.id, label: item.name }
+		})
+		showGroupLoading.value = false
+		treeData.value = [{ id: '', name: '所有', children: data }]
+		// treeData.value = data
+	}
 }
 
 // 左侧菜单点击
 const leftTreeClick = data => {
-	searchData.value = { ...searchData.value, formCategoryId: data.id ? data.id : 0 }
+	searchData.value = { ...searchData.value, formCategoryId: data.id ? data.id : null }
 }
 
 // 表格搜索条件
@@ -457,8 +459,13 @@ const deleteTemplateItem = async ids => {
 const submitHandler = async params => {
 	try {
 		formOptions.value.formConfig.submitLoading = true
+		console.log('------activeData----', activeData.value)
 		params.status = params.status ? 1 : 0
-		params.id = activeData.value.id ? activeData.value.id : 0
+		if (activeData.value.id) {
+			params.id = activeData.value.id
+		} else {
+			params.pid = 0
+		}
 		await formCategory.formCategoryAddOrEditSaveApi(params)
 		ElMessage.success(`${isCreate.value ? '新增' : '修改'}成功~`)
 		visible.value = false
@@ -474,6 +481,7 @@ const submitTemplateHandler = async params => {
 	try {
 		formTemplateOptions.value.formConfig.submitLoading = true
 		params.status = params.status ? 1 : 0
+		console.log('------activeDataTemplate-----', activeDataTemplate)
 		params.id = activeDataTemplate.value.id ? activeDataTemplate.value.id : null
 		await formtemplate.formTemplateAddOrEditSaveApi(params)
 		ElMessage.success(`${isCreate.value ? '新增' : '修改'}成功~`)