diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 036ebbd..fd06b2b 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -68,6 +68,7 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
+            dialogVisible.value = false
             emit('onSuccess')
           }).catch((_) => {
             btnLoading.value = false

diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 036ebbd..fd06b2b 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -68,6 +68,7 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
+            dialogVisible.value = false
             emit('onSuccess')
           }).catch((_) => {
             btnLoading.value = false
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 0011ab3..4cab873 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -91,7 +91,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 

diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 036ebbd..fd06b2b 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -68,6 +68,7 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
+            dialogVisible.value = false
             emit('onSuccess')
           }).catch((_) => {
             btnLoading.value = false
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 0011ab3..4cab873 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -91,7 +91,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index e3491d5..72271a5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -276,6 +276,10 @@
   standard: '',
   extarCss: '',
 })
+
+onActivated(() => {
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -306,7 +310,7 @@
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">

diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 036ebbd..fd06b2b 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -68,6 +68,7 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
+            dialogVisible.value = false
             emit('onSuccess')
           }).catch((_) => {
             btnLoading.value = false
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 0011ab3..4cab873 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -91,7 +91,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index e3491d5..72271a5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -276,6 +276,10 @@
   standard: '',
   extarCss: '',
 })
+
+onActivated(() => {
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -306,7 +310,7 @@
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index c36a618..9cc1da2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -251,6 +251,10 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onActivated(() => {
+  fetchData(true)
+})
 </script>
 
 <template>

diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 036ebbd..fd06b2b 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -68,6 +68,7 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
+            dialogVisible.value = false
             emit('onSuccess')
           }).catch((_) => {
             btnLoading.value = false
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 0011ab3..4cab873 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -91,7 +91,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index e3491d5..72271a5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -276,6 +276,10 @@
   standard: '',
   extarCss: '',
 })
+
+onActivated(() => {
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -306,7 +310,7 @@
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index c36a618..9cc1da2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -251,6 +251,10 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onActivated(() => {
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bda1c70..9a8d316 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -14,6 +14,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 const loading = ref(false) // 表单加载状态
+const curFormId = SCHEDULE.SUPPLIER_APPROVAL
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
@@ -70,6 +71,7 @@
   website: '',
   traceSupplierPersonList: [],
 })
+const isChanged = ref(false)
 const companyAddress = ref<string[]>([]) // 公司地址
 const invoiceAddress = ref<string[]>([]) // 开票地址
 const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([]) // 人员列表
@@ -197,56 +199,90 @@
 })
 
 // 保存至草稿箱
-function saveForm(formEl: FormInstance | undefined) {
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  formEl.validate((valid, fields) => {
+  await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
+      if (formInline.value.supplierNo) {
+        sourceDraftUpdate(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('已保存')
+            isChanged.value = false
+          }
+        })
+      }
+      else {
+        sourceSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            formInline.value.id = res.data.id
+            formInline.value.supplierNo = res.data.supplierNo
+            ElMessage.success('已保存')
+            isChanged.value = false
+          }
+        })
+      }
+    }
+  })
+}
+
+// 提交表单
+const submitFunc = () => {
+// 再提交
+  const params = {
+    id: formInline.value.id,
+    formId: curFormId, // 表单id
+  }
+  sourceSubmit(params).then((res) => {
+    ElMessage.success('提交成功')
+    close()
+  })
+}
+
+// 点击提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示',
         {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         },
       ).then(() => {
-        if (formInline.value.supplierNo) {
-          sourceDraftUpdate(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-            }
-          })
+        // 如果id存在, 调用更新接口
+        if (formInline.value.id) {
+          // 如果表单变更过,先保存，再提交
+          if (isChanged.value) {
+            sourceDraftUpdate(formInline.value).then((res) => {
+              if (res.code === 200) {
+                submitFunc()
+              }
+              else {
+                ElMessage.error('保存失败，请重新保存后提交')
+              }
+            })
+          }
+          else { // 表单未变更过，直接提交
+            submitFunc()
+          }
         }
         else {
+          // id不存在，调用新建接口
           sourceSave(formInline.value).then((res) => {
             if (res.code === 200) {
               formInline.value.id = res.data.id
               formInline.value.supplierNo = res.data.supplierNo
-              ElMessage.success('已保存')
+              submitFunc()
             }
           })
+          ElMessage.info('请先保存再提交！')
         }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
@@ -299,7 +335,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail' && formInline.supplierNo" type="primary" @click="submitForm">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">