修改完毕表单添加与保存草稿

src/components/DesignForm/app/formPage.vue

@@ -375,7 +375,7 @@ watch(() => props.options,(val:any) => {
 */
 provide(constFormBtnEvent, (obj: any) => {
 	emits('btnClick', obj.key)
-    // console.log("按钮组件事件-----2-------->",obj.key)                                
+    console.log("按钮组件事件-----2-------->",obj.key)                                
 	if ([3, 4, 5].includes(props.type)) {
       	return ElMessage.error('当前模式不能提交表单')
     }

src/components/DesignForm/public/form/form.vue

@@ -51,7 +51,12 @@ const props = withDefaults(
 		options?: { [key: string]: any } // 表单组件选项，同setOptions
 		dict?: object // 固定匹配的字典
 		isSearch?: boolean // 列表里作为筛选使用
-		
+		isWorkFlow?: number //
+		flowkey?: string //
+		groupid?: string //
+		signCode?: string //
+		versionId?: string //
+		mastesformjson?: string //
     }>(),
     {
 		type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
@@ -78,7 +83,12 @@ const props = withDefaults(
 			type:Boolean,
 			default:true
 		},
-		key:1
+		key:1,
+		isWorkFlow:2,
+		flowkey:"",
+		groupid:"",
+		signCode:"",
+		mastesformjson:"",
     }
 )
 const emits = defineEmits<{
@@ -1223,6 +1233,7 @@ const appendRemoveStyle = (type?: boolean) => {
 
 // 按钮组件事件
 provide(constFormBtnEvent, (obj: any) => {
+	console.log("点击的哪个按钮----》",obj.key);
     emits('btnClick', obj.key)
     if ([3, 4, 5].includes(props.type)) {
       	return ElMessage.error('当前模式不能提交表单')
@@ -1408,7 +1419,7 @@ const submit = (params = {}) => {
     let editUrl = props.formData.config?.editUrl || props.editUrl
     let apiUrl = props.type === 1 ? addUrl : editUrl
 
-	// console.log("新增、查看、保存数据",props.type,props.addUrl,props.editUrl)
+	console.log("新增、查看、保存数据",apiUrl,props.type,props.addUrl,props.editUrl)
     if (props.isSearch || !apiUrl || loading.value) {
 		if (!props.isSearch && !apiUrl) {
 			console.error(
@@ -1431,6 +1442,9 @@ const submit = (params = {}) => {
 		case "editFormContent":
 			 apiUrl ="/systemapi/task_management/editCustomerTable"
 			break;
+		case "addData":
+			 apiUrl ="/systemapi/task_management/createAppTask"
+			break;
 		default:
 	}
     validate((valid: boolean, fields: any) => {
@@ -1462,11 +1476,13 @@ const submit = (params = {}) => {
 			// console.log("beforeSubmit--->",beforeSubmit)
 			// console.log("props.beforeSubmit--->",props.beforeSubmit)
 			// console.log("props.beforeSubmit--->",props.beforeSubmit)
-
+			formatParams.versionId=props.versionId
+			formatParams.appKey=props.groupid
+			formatParams.status=2
 			// loading.value = true
-			// console.log("apiUrl--->",apiUrl)
-			// console.log("submitParams--->",submitParams)
-			// console.log("formatParams--->",formatParams)
+			console.log("apiUrl--->",apiUrl)
+			console.log("submitParams--->",submitParams)
+			console.log("formatParams--->",formatParams)
 
 			// debugger
 			// 提交保存表单
@@ -1669,6 +1685,17 @@ const saveDraft = (params = {}) => {
 			if (submitParams === false) {
 				return
 			}
+			formatParams.versionId=props.versionId
+			formatParams.appKey=props.groupid
+			formatParams.status=1
+			if(formatParams.formId){
+				if(formatParams.formId == ""){
+					formatParams.formId = props.versionId
+				}
+			}else{
+				formatParams.formId = props.versionId
+			}
+			console.log("提交保存草稿！",params)
 			// 提交保存表单
 			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
 				.then((res: any) => {

src/utils/workflow/const.ts

@@ -194,7 +194,7 @@ export let  afreshSubmitButton = {
 				},
 				list: [
 						{
-							type: "button",
+							type: "button", 
 							iconFont: "fa-square-o",
 							control:{
 								label: "确认提交",