From 1c6b3b8303ea397e06e0813372ad020f64d87001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 6 Nov 2024 11:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clientflowtemplate/BaseInfoStep.vue       |  2 +
 .../TenantAuditStepModal.vue                  | 54 ++++++++++++-------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/baseinfo/clientflowtemplate/BaseInfoStep.vue b/src/views/baseinfo/clientflowtemplate/BaseInfoStep.vue
index 72bb79bd..09f5ed58 100644
--- a/src/views/baseinfo/clientflowtemplate/BaseInfoStep.vue
+++ b/src/views/baseinfo/clientflowtemplate/BaseInfoStep.vue
@@ -19,6 +19,8 @@
   watch(
     () => props.ApiData,
     () => {
+      console.log(props.ApiData)
+
       initData()
     },
     { deep: true },
diff --git a/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue b/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
index 83e45e21..216e78eb 100644
--- a/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
@@ -102,6 +102,9 @@
     markerNotifyURL: '',
     callbackURL: '',
     id: '',
+    permissionName: '',
+    orderNo: '',
+    status: '',
   })
   const state = reactive({
     initSetp1: true,
@@ -114,15 +117,18 @@
     if (res.succeeded) {
       // ApiData = { ...res.data }
       // await setFieldsValue(res.data)
+      ApiData.id = res.data.id
       ApiData.name = res.data.name
-      ApiData.note = res.data.note
-      ApiData.auditType = res.data.auditType.toString()
-      ApiData.markerNotifyURL = res.data.markerNotifyURL
-      ApiData.callbackURL = res.data.callbackURL
-      ApiData.content = res.data.content
       ApiData.permissionId = res.data.permissionId
+      ApiData.permissionName = res.data.permissionName
       ApiData.columnView = res.data.columnView
-      ApiData.id = res.data.id
+      ApiData.content = res.data.content
+      ApiData.orderNo = res.data.orderNo
+      ApiData.status = res.data.status
+      ApiData.markerNotifyURL = res.data.markerNotifyURL
+      ApiData.callbackURL = res.data.callbackURL
+      ApiData.auditType = res.data.auditType ? res.data.auditType.toString() : ''
+      ApiData.note = res.data.note
     }
   }
   async function GetTable(tableViewName) {
@@ -218,16 +224,18 @@
   // }
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     console.log('closeModal')
-
+    ApiData.id = ''
     ApiData.name = ''
-    ApiData.note = ''
-    ApiData.auditType = ''
-    ApiData.markerNotifyURL = ''
-    ApiData.callbackURL = ''
-    ApiData.content = ''
     ApiData.permissionId = ''
+    ApiData.permissionName = ''
     ApiData.columnView = ''
-    ApiData.id = ''
+    ApiData.content = ''
+    ApiData.orderNo = ''
+    ApiData.status = ''
+    ApiData.markerNotifyURL = ''
+    ApiData.callbackURL = ''
+    ApiData.auditType = ''
+    ApiData.note = ''
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
     if (unref(isUpdate)) {
@@ -262,12 +270,15 @@
     }
   }
   function handleStep1Next(step1Values: any) {
+    ApiData.id = step1Values.id
     ApiData.name = step1Values.name
-    ApiData.note = step1Values.note
+    ApiData.orderNo = step1Values.orderNo
     ApiData.columnView = step1Values.columnView
+    ApiData.status = step1Values.status
     ApiData.auditType = step1Values.auditType
     ApiData.markerNotifyURL = step1Values.markerNotifyURL
     ApiData.callbackURL = step1Values.callbackURL
+    ApiData.note = step1Values.note
     if (step1Values.id) {
       ApiData.id = step1Values.id
     }
@@ -387,15 +398,18 @@
     const res: API.DataResult = await EditFlowTemplate(ApiData)
     if (res.succeeded) {
       notification.success({ message: res.message, duration: 3 })
+      ApiData.id = ''
       ApiData.name = ''
-      ApiData.note = ''
-      ApiData.auditType = ''
-      ApiData.markerNotifyURL = ''
-      ApiData.callbackURL = ''
-      ApiData.content = ''
       ApiData.permissionId = ''
+      ApiData.permissionName = ''
       ApiData.columnView = ''
-      ApiData.id = ''
+      ApiData.content = ''
+      ApiData.orderNo = ''
+      ApiData.status = ''
+      ApiData.markerNotifyURL = ''
+      ApiData.callbackURL = ''
+      ApiData.auditType = ''
+      ApiData.note = ''
       closeModal()
       emit('success')
     } else {