diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 361f98b..c44da80 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -2,8 +2,9 @@
 <script name="CustomerInfoBasicForEdit" lang="ts" setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType } from './customer-info'
+import { mobileValidator, phoneValidator, postalCodeValidator } from './customer-info'
 import { UploadFile } from '@/api/file'
-import { saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
+import { failUpdateCustomerBasic, saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
 
 const props = defineProps({
   operation: { type: String, default: '' },
@@ -11,10 +12,10 @@
 
 const emit = defineEmits(['afterSaveDraft', 'commitSuccess'])
 
-// 是否可以编辑
-const fieldsEditable = ref<boolean>(false)
-const keyFieldsEditable = ref<boolean>(false)
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
+// 委托方所在地字典值
 const customerLocationDictInChild = ref<Array<IDictType>>([])
 
 const customerBasicInfo = ref<ICustomerInfo>({
@@ -35,39 +36,6 @@
 
 const basicFormRef = ref()
 
-// 验证手机
-const phoneValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 验证座机
-const mobileValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
-  if (reg.test(value.trim()) === true) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 邮编校验
-const postalCodeValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^[0-9]{6}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
 const customerBasicRules = ref({
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所在地不能为空，请选择', trigger: ['change', 'blur'] }],
@@ -79,16 +47,14 @@
 }) // 表单验证规则
 
 // 逻辑
-
-// 查询人员基本信息
+// 查询人员基本信息 从缓存中直接取
 const getCustomerBasicInCache = () => {
   customerBasicInfo.value = JSON.parse(sessionStorage.getItem('customerInfo')!)
 }
 
 // 设置字段是否可以编辑
-const setFieldsEditable = (editable: boolean, keyEditable: boolean) => {
-  fieldsEditable.value = editable
-  keyFieldsEditable.value = keyEditable
+const setFieldsDisable = (editable: boolean) => {
+  keyFieldsDisable.value = editable
 }
 
 // 保存至草稿箱
@@ -100,6 +66,7 @@
       // 设置返回的委托方id和委托方编号
       customerBasicInfo.value.customerNo = res.data.customerNo
       customerBasicInfo.value.id = res.data.id
+      // 返回保存后生成的id
       emit('afterSaveDraft', res.data.id)
     }
     else {
@@ -170,19 +137,20 @@
   })
 }
 
-// 保存并提交审批单
-const saveAndSubmitBasicForm = async () => {
+// 保存并提交审批单 重新进入流程审批
+const failUpdateSubmitBasicForm = async () => {
   if (!basicFormRef) { return }
-  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+  await basicFormRef.value.validate((valid: boolean) => {
     if (valid === true) {
-      updateCustomerBasic(customerBasicInfo.value).then((res) => {
+      failUpdateCustomerBasic(customerBasicInfo.value).then((res) => {
         if (res.code === 200) {
           // 提示保存成功
-          submitBasicForm()
+          ElMessage.success(`审批单 ${customerBasicInfo.value.customerNo} 提交成功`)
+          emit('commitSuccess', customerBasicInfo.value)
         }
         else {
           // 提示失败信息
-          ElMessage.error(`保存失败：${res.message}`)
+          ElMessage.error(`审批单 ${customerBasicInfo.value.customerNo} 提交失败：${res.message}`)
         }
       })
     }
@@ -205,10 +173,10 @@
 
 defineExpose({
   getCustomerBasicInCache,
-  setFieldsEditable,
+  setFieldsDisable,
   saveBasicForm,
   submitBasicForm,
-  saveAndSubmitBasicForm,
+  failUpdateSubmitBasicForm,
 })
 </script>
 
@@ -219,7 +187,7 @@
         <!-- 第一行 第一列 -->
         <el-col :span="6">
           <el-form-item label="委托方编号">
-            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="!keyFieldsEditable" />
+            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="座机电话" prop="mobile">
             <el-input v-model="customerBasicInfo.mobile" placeholder="请输入座机（区号-号码）" :clearable="true" />
@@ -229,7 +197,7 @@
         <!-- 第一行 第二列 -->
         <el-col :span="6">
           <el-form-item label="委托方名称" prop="deptId">
-            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" />
+            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phone">
             <el-input v-model="customerBasicInfo.phone" placeholder="请输入手机号码" :clearable="true" />

diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 361f98b..c44da80 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -2,8 +2,9 @@
 <script name="CustomerInfoBasicForEdit" lang="ts" setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType } from './customer-info'
+import { mobileValidator, phoneValidator, postalCodeValidator } from './customer-info'
 import { UploadFile } from '@/api/file'
-import { saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
+import { failUpdateCustomerBasic, saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
 
 const props = defineProps({
   operation: { type: String, default: '' },
@@ -11,10 +12,10 @@
 
 const emit = defineEmits(['afterSaveDraft', 'commitSuccess'])
 
-// 是否可以编辑
-const fieldsEditable = ref<boolean>(false)
-const keyFieldsEditable = ref<boolean>(false)
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
+// 委托方所在地字典值
 const customerLocationDictInChild = ref<Array<IDictType>>([])
 
 const customerBasicInfo = ref<ICustomerInfo>({
@@ -35,39 +36,6 @@
 
 const basicFormRef = ref()
 
-// 验证手机
-const phoneValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 验证座机
-const mobileValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
-  if (reg.test(value.trim()) === true) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 邮编校验
-const postalCodeValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^[0-9]{6}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
 const customerBasicRules = ref({
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所在地不能为空，请选择', trigger: ['change', 'blur'] }],
@@ -79,16 +47,14 @@
 }) // 表单验证规则
 
 // 逻辑
-
-// 查询人员基本信息
+// 查询人员基本信息 从缓存中直接取
 const getCustomerBasicInCache = () => {
   customerBasicInfo.value = JSON.parse(sessionStorage.getItem('customerInfo')!)
 }
 
 // 设置字段是否可以编辑
-const setFieldsEditable = (editable: boolean, keyEditable: boolean) => {
-  fieldsEditable.value = editable
-  keyFieldsEditable.value = keyEditable
+const setFieldsDisable = (editable: boolean) => {
+  keyFieldsDisable.value = editable
 }
 
 // 保存至草稿箱
@@ -100,6 +66,7 @@
       // 设置返回的委托方id和委托方编号
       customerBasicInfo.value.customerNo = res.data.customerNo
       customerBasicInfo.value.id = res.data.id
+      // 返回保存后生成的id
       emit('afterSaveDraft', res.data.id)
     }
     else {
@@ -170,19 +137,20 @@
   })
 }
 
-// 保存并提交审批单
-const saveAndSubmitBasicForm = async () => {
+// 保存并提交审批单 重新进入流程审批
+const failUpdateSubmitBasicForm = async () => {
   if (!basicFormRef) { return }
-  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+  await basicFormRef.value.validate((valid: boolean) => {
     if (valid === true) {
-      updateCustomerBasic(customerBasicInfo.value).then((res) => {
+      failUpdateCustomerBasic(customerBasicInfo.value).then((res) => {
         if (res.code === 200) {
           // 提示保存成功
-          submitBasicForm()
+          ElMessage.success(`审批单 ${customerBasicInfo.value.customerNo} 提交成功`)
+          emit('commitSuccess', customerBasicInfo.value)
         }
         else {
           // 提示失败信息
-          ElMessage.error(`保存失败：${res.message}`)
+          ElMessage.error(`审批单 ${customerBasicInfo.value.customerNo} 提交失败：${res.message}`)
         }
       })
     }
@@ -205,10 +173,10 @@
 
 defineExpose({
   getCustomerBasicInCache,
-  setFieldsEditable,
+  setFieldsDisable,
   saveBasicForm,
   submitBasicForm,
-  saveAndSubmitBasicForm,
+  failUpdateSubmitBasicForm,
 })
 </script>
 
@@ -219,7 +187,7 @@
         <!-- 第一行 第一列 -->
         <el-col :span="6">
           <el-form-item label="委托方编号">
-            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="!keyFieldsEditable" />
+            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="座机电话" prop="mobile">
             <el-input v-model="customerBasicInfo.mobile" placeholder="请输入座机（区号-号码）" :clearable="true" />
@@ -229,7 +197,7 @@
         <!-- 第一行 第二列 -->
         <el-col :span="6">
           <el-form-item label="委托方名称" prop="deptId">
-            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" />
+            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phone">
             <el-input v-model="customerBasicInfo.phone" placeholder="请输入手机号码" :clearable="true" />
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index 7405617..5c2ddb0 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -66,3 +66,36 @@
   mobile?: string
   editable: boolean
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 验证座机
+export const mobileValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
+  if (reg.test(value.trim()) === true) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 邮编校验
+export const postalCodeValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^[0-9]{6}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}

diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 361f98b..c44da80 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -2,8 +2,9 @@
 <script name="CustomerInfoBasicForEdit" lang="ts" setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType } from './customer-info'
+import { mobileValidator, phoneValidator, postalCodeValidator } from './customer-info'
 import { UploadFile } from '@/api/file'
-import { saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
+import { failUpdateCustomerBasic, saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
 
 const props = defineProps({
   operation: { type: String, default: '' },
@@ -11,10 +12,10 @@
 
 const emit = defineEmits(['afterSaveDraft', 'commitSuccess'])
 
-// 是否可以编辑
-const fieldsEditable = ref<boolean>(false)
-const keyFieldsEditable = ref<boolean>(false)
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
+// 委托方所在地字典值
 const customerLocationDictInChild = ref<Array<IDictType>>([])
 
 const customerBasicInfo = ref<ICustomerInfo>({
@@ -35,39 +36,6 @@
 
 const basicFormRef = ref()
 
-// 验证手机
-const phoneValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 验证座机
-const mobileValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
-  if (reg.test(value.trim()) === true) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 邮编校验
-const postalCodeValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^[0-9]{6}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
 const customerBasicRules = ref({
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所在地不能为空，请选择', trigger: ['change', 'blur'] }],
@@ -79,16 +47,14 @@
 }) // 表单验证规则
 
 // 逻辑
-
-// 查询人员基本信息
+// 查询人员基本信息 从缓存中直接取
 const getCustomerBasicInCache = () => {
   customerBasicInfo.value = JSON.parse(sessionStorage.getItem('customerInfo')!)
 }
 
 // 设置字段是否可以编辑
-const setFieldsEditable = (editable: boolean, keyEditable: boolean) => {
-  fieldsEditable.value = editable
-  keyFieldsEditable.value = keyEditable
+const setFieldsDisable = (editable: boolean) => {
+  keyFieldsDisable.value = editable
 }
 
 // 保存至草稿箱
@@ -100,6 +66,7 @@
       // 设置返回的委托方id和委托方编号
       customerBasicInfo.value.customerNo = res.data.customerNo
       customerBasicInfo.value.id = res.data.id
+      // 返回保存后生成的id
       emit('afterSaveDraft', res.data.id)
     }
     else {
@@ -170,19 +137,20 @@
   })
 }
 
-// 保存并提交审批单
-const saveAndSubmitBasicForm = async () => {
+// 保存并提交审批单 重新进入流程审批
+const failUpdateSubmitBasicForm = async () => {
   if (!basicFormRef) { return }
-  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+  await basicFormRef.value.validate((valid: boolean) => {
     if (valid === true) {
-      updateCustomerBasic(customerBasicInfo.value).then((res) => {
+      failUpdateCustomerBasic(customerBasicInfo.value).then((res) => {
         if (res.code === 200) {
           // 提示保存成功
-          submitBasicForm()
+          ElMessage.success(`审批单 ${customerBasicInfo.value.customerNo} 提交成功`)
+          emit('commitSuccess', customerBasicInfo.value)
         }
         else {
           // 提示失败信息
-          ElMessage.error(`保存失败：${res.message}`)
+          ElMessage.error(`审批单 ${customerBasicInfo.value.customerNo} 提交失败：${res.message}`)
         }
       })
     }
@@ -205,10 +173,10 @@
 
 defineExpose({
   getCustomerBasicInCache,
-  setFieldsEditable,
+  setFieldsDisable,
   saveBasicForm,
   submitBasicForm,
-  saveAndSubmitBasicForm,
+  failUpdateSubmitBasicForm,
 })
 </script>
 
@@ -219,7 +187,7 @@
         <!-- 第一行 第一列 -->
         <el-col :span="6">
           <el-form-item label="委托方编号">
-            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="!keyFieldsEditable" />
+            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="座机电话" prop="mobile">
             <el-input v-model="customerBasicInfo.mobile" placeholder="请输入座机（区号-号码）" :clearable="true" />
@@ -229,7 +197,7 @@
         <!-- 第一行 第二列 -->
         <el-col :span="6">
           <el-form-item label="委托方名称" prop="deptId">
-            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" />
+            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phone">
             <el-input v-model="customerBasicInfo.phone" placeholder="请输入手机号码" :clearable="true" />
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index 7405617..5c2ddb0 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -66,3 +66,36 @@
   mobile?: string
   editable: boolean
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 验证座机
+export const mobileValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
+  if (reg.test(value.trim()) === true) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 邮编校验
+export const postalCodeValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^[0-9]{6}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
diff --git a/src/views/resource/customer/info/customerApprovalDialog.vue b/src/views/resource/customer/info/customerApprovalDialog.vue
index e27580f..9fad7e2 100644
--- a/src/views/resource/customer/info/customerApprovalDialog.vue
+++ b/src/views/resource/customer/info/customerApprovalDialog.vue
@@ -39,7 +39,7 @@
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
-// agree同意 refuse拒绝 reject驳回 revoke取消
+// 获取用户信息
 const userInfo = useUserStore()
 
 // ---------------表单提交--------------------------------
@@ -50,7 +50,8 @@
   comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
 })
 
-const agree = async () => {
+// 同意
+const agree = () => {
   submitApproval('agree', { taskId: formData.taskId, comments: formData.comments }).then((res) => {
     ElMessage.success('审批完成')
     btnLoading.value = false
@@ -61,7 +62,8 @@
   })
 }
 
-const refuse = async () => {
+// 拒绝
+const refuse = () => {
   refuseApproval({
     id: formData.id,
     taskId: formData.taskId,
@@ -74,8 +76,9 @@
   })
 }
 
-const revoke = async () => {
-  return revokeApproval({
+// 取消（撤回）
+const revoke = () => {
+  revokeApproval({
     id: formData.id,
     processInstanceId: formData.processId,
     comments: formData.comments,

diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 361f98b..c44da80 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -2,8 +2,9 @@
 <script name="CustomerInfoBasicForEdit" lang="ts" setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType } from './customer-info'
+import { mobileValidator, phoneValidator, postalCodeValidator } from './customer-info'
 import { UploadFile } from '@/api/file'
-import { saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
+import { failUpdateCustomerBasic, saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
 
 const props = defineProps({
   operation: { type: String, default: '' },
@@ -11,10 +12,10 @@
 
 const emit = defineEmits(['afterSaveDraft', 'commitSuccess'])
 
-// 是否可以编辑
-const fieldsEditable = ref<boolean>(false)
-const keyFieldsEditable = ref<boolean>(false)
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
+// 委托方所在地字典值
 const customerLocationDictInChild = ref<Array<IDictType>>([])
 
 const customerBasicInfo = ref<ICustomerInfo>({
@@ -35,39 +36,6 @@
 
 const basicFormRef = ref()
 
-// 验证手机
-const phoneValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 验证座机
-const mobileValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
-  if (reg.test(value.trim()) === true) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 邮编校验
-const postalCodeValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^[0-9]{6}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
 const customerBasicRules = ref({
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所在地不能为空，请选择', trigger: ['change', 'blur'] }],
@@ -79,16 +47,14 @@
 }) // 表单验证规则
 
 // 逻辑
-
-// 查询人员基本信息
+// 查询人员基本信息 从缓存中直接取
 const getCustomerBasicInCache = () => {
   customerBasicInfo.value = JSON.parse(sessionStorage.getItem('customerInfo')!)
 }
 
 // 设置字段是否可以编辑
-const setFieldsEditable = (editable: boolean, keyEditable: boolean) => {
-  fieldsEditable.value = editable
-  keyFieldsEditable.value = keyEditable
+const setFieldsDisable = (editable: boolean) => {
+  keyFieldsDisable.value = editable
 }
 
 // 保存至草稿箱
@@ -100,6 +66,7 @@
       // 设置返回的委托方id和委托方编号
       customerBasicInfo.value.customerNo = res.data.customerNo
       customerBasicInfo.value.id = res.data.id
+      // 返回保存后生成的id
       emit('afterSaveDraft', res.data.id)
     }
     else {
@@ -170,19 +137,20 @@
   })
 }
 
-// 保存并提交审批单
-const saveAndSubmitBasicForm = async () => {
+// 保存并提交审批单 重新进入流程审批
+const failUpdateSubmitBasicForm = async () => {
   if (!basicFormRef) { return }
-  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+  await basicFormRef.value.validate((valid: boolean) => {
     if (valid === true) {
-      updateCustomerBasic(customerBasicInfo.value).then((res) => {
+      failUpdateCustomerBasic(customerBasicInfo.value).then((res) => {
         if (res.code === 200) {
           // 提示保存成功
-          submitBasicForm()
+          ElMessage.success(`审批单 ${customerBasicInfo.value.customerNo} 提交成功`)
+          emit('commitSuccess', customerBasicInfo.value)
         }
         else {
           // 提示失败信息
-          ElMessage.error(`保存失败：${res.message}`)
+          ElMessage.error(`审批单 ${customerBasicInfo.value.customerNo} 提交失败：${res.message}`)
         }
       })
     }
@@ -205,10 +173,10 @@
 
 defineExpose({
   getCustomerBasicInCache,
-  setFieldsEditable,
+  setFieldsDisable,
   saveBasicForm,
   submitBasicForm,
-  saveAndSubmitBasicForm,
+  failUpdateSubmitBasicForm,
 })
 </script>
 
@@ -219,7 +187,7 @@
         <!-- 第一行 第一列 -->
         <el-col :span="6">
           <el-form-item label="委托方编号">
-            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="!keyFieldsEditable" />
+            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="座机电话" prop="mobile">
             <el-input v-model="customerBasicInfo.mobile" placeholder="请输入座机（区号-号码）" :clearable="true" />
@@ -229,7 +197,7 @@
         <!-- 第一行 第二列 -->
         <el-col :span="6">
           <el-form-item label="委托方名称" prop="deptId">
-            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" />
+            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phone">
             <el-input v-model="customerBasicInfo.phone" placeholder="请输入手机号码" :clearable="true" />
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index 7405617..5c2ddb0 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -66,3 +66,36 @@
   mobile?: string
   editable: boolean
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 验证座机
+export const mobileValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
+  if (reg.test(value.trim()) === true) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 邮编校验
+export const postalCodeValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^[0-9]{6}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
diff --git a/src/views/resource/customer/info/customerApprovalDialog.vue b/src/views/resource/customer/info/customerApprovalDialog.vue
index e27580f..9fad7e2 100644
--- a/src/views/resource/customer/info/customerApprovalDialog.vue
+++ b/src/views/resource/customer/info/customerApprovalDialog.vue
@@ -39,7 +39,7 @@
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
-// agree同意 refuse拒绝 reject驳回 revoke取消
+// 获取用户信息
 const userInfo = useUserStore()
 
 // ---------------表单提交--------------------------------
@@ -50,7 +50,8 @@
   comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
 })
 
-const agree = async () => {
+// 同意
+const agree = () => {
   submitApproval('agree', { taskId: formData.taskId, comments: formData.comments }).then((res) => {
     ElMessage.success('审批完成')
     btnLoading.value = false
@@ -61,7 +62,8 @@
   })
 }
 
-const refuse = async () => {
+// 拒绝
+const refuse = () => {
   refuseApproval({
     id: formData.id,
     taskId: formData.taskId,
@@ -74,8 +76,9 @@
   })
 }
 
-const revoke = async () => {
-  return revokeApproval({
+// 取消（撤回）
+const revoke = () => {
+  revokeApproval({
     id: formData.id,
     processInstanceId: formData.processId,
     comments: formData.comments,
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 6af3b99..0f22b88 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -7,7 +7,6 @@
 import CustomerInfoStaff from './staff.vue'
 import CustomerApprovalDialog from './customerApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-import { getDeptById } from '@/api/system/dept'
 import { draftDelete } from '@/api/resource/customer'
 
 // 变量
@@ -35,6 +34,7 @@
 const apprDial = ref()
 const refCustomerBasic = ref()
 const refCustomerBasic4Edit = ref() // 可编辑的详情组件
+const refCustomerStaff = ref()
 
 // 字典值
 const customerLocationDict = ref<IDictType[]>([])
@@ -48,6 +48,20 @@
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 逻辑
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 将所有流程操作的按钮隐藏
 const hideAllOpterationButtons = () => {
   saveButtVisable.value = false
   submitButtVisable.value = false
@@ -57,6 +71,7 @@
   editButtVisable.value = false
 }
 
+// 根据审批状态显示对应的流程操作按钮
 const showOperationButtonByStatus = () => {
   switch (status.value) {
     case '0':
@@ -104,7 +119,7 @@
 }
 // 关闭
 const resetForm = () => {
-  sessionStorage.removeItem('customerInfo')
+  sessionStorage.removeItem('customerInfo') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
 
@@ -122,86 +137,21 @@
   }
   else {
     // 之前已经在流程中的表单 先保存 再提交
-    refCustomerBasic4Edit.value.saveAndSubmitBasicForm()
+    refCustomerBasic4Edit.value.failUpdateSubmitBasicForm()
   }
 }
 
-const radioChangeHandler = (newVal: string | number | boolean) => {
-  const radioTarget = radioItems.value.filter(item => item.name === newVal)
-  if (radioTarget.length > 0) {
-    currentLabel.value = radioTarget[0].name
-    current.value = radioTarget[0].value
-  }
-  else {
-    currentLabel.value = radioItems.value[0].name
-    current.value = radioItems.value[0].value
-  }
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type
-  id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
-  // 默认显示第一个tab内容
-  current.value = radioItems.value[0].value
-  currentLabel.value = radioItems.value[0].name
-
-  switch (params.type) {
-    case 'create' :
-      title.value = '委托方名录（新增）'
-      saveButtVisable.value = true
-      submitButtVisable.value = true
-
-      break
-    case 'update':
-      title.value = '委托方名录（编辑）'
-      id.value = params.id
-
-      // 查看详情时所有的操作按钮都隐藏
-      showOperationButtonByStatus()
-
-      // 调用子组件的方法
-      refCustomerBasic4Edit.value.getCustomerBasicInCache()
-      break
-    case 'detail':
-      title.value = '委托方名录（详情）'
-      id.value = params.id
-
-      // 查看详情时所有的操作按钮都隐藏
-      showOperationButtonByStatus()
-
-      // 调用子组件的方法
-      refCustomerBasic.value.getCustomerBasicInCache()
-      break
-    default:
-      title.value = ''
-      break
-  }
-}
-
-const saveDraftHandler = (idRet: string) => {
-  id.value = idRet
-}
-
-const commitSuccessHandler = (customerInfo: ICustomerInfo) => {
-  // 在详情页显示
-  refCustomerBasic.value.initDialog(customerInfo)
-
-  type.value = 'detail'
-  title.value = '委托方名录（详情）'
-  hideAllOpterationButtons()
-}
-
 // 编辑按钮点击事件处理函数
 const editClickedHandler = () => {
   type.value = 'update'
   title.value = '委托方名录（编辑）'
+
+  // 隐藏编辑按钮 显示提交按钮
   editButtVisable.value = false
   submitButtVisable.value = true
 
   // 调用子组件的方法
+  // 切换了组件所有需要初始化数据
   refCustomerBasic4Edit.value.getCustomerBasicInCache()
 }
 
@@ -217,6 +167,12 @@
   apprDial.value.initDialog('agree', customerInfo.id, customerInfo.taskId, '')
 }
 
+// 取消流程
+const revokeClickedHandler = () => {
+  const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
+  apprDial.value.initDialog('revoke', customerInfo.id, customerInfo.taskId, customerInfo.processId)
+}
+
 // 删除审批单
 const deleteClickedHandler = () => {
   const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
@@ -237,13 +193,7 @@
   })
 }
 
-// 取消流程
-const revokeClickedHandler = () => {
-  const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
-  apprDial.value.initDialog('revoke', customerInfo.id, customerInfo.taskId, customerInfo.processId)
-}
-
-// 流程审批结束后的操作
+// 流程审批（同意、拒绝、取消）结束后的操作 将按钮都隐藏（本身就不能编辑了）
 const approvalSuccessHandler = (type: string) => {
   if (type === 'agree' || type === 'refuse') {
     flowButtsVisable.value = false
@@ -253,6 +203,22 @@
   }
 }
 
+// 新建时保存后的处理 获取返回的id
+const saveDraftHandler = (idRet: string) => {
+  id.value = idRet
+}
+
+// 提交后的处理 显示详情页且不能编辑
+const commitSuccessHandler = (customerInfo: ICustomerInfo) => {
+  // 在详情页显示
+  refCustomerBasic.value.initDialog(customerInfo)
+
+  type.value = 'detail'
+  title.value = '委托方名录（详情）'
+  hideAllOpterationButtons()
+}
+
+// 查询委托方所在地的字典值
 const getLabCodeDict = () => {
   if (customerLocationDict.value.length === 0) {
     getDictByCode('bizLabCode').then((res) => {
@@ -268,6 +234,55 @@
   getLabCodeDict()
 }
 
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+  status.value = params.status !== undefined ? params.status : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '委托方名录（新增）'
+      saveButtVisable.value = true
+      submitButtVisable.value = true
+
+      break
+    case 'update':
+      title.value = '委托方名录（编辑）'
+
+      // 判断显示哪些流程操作按钮
+      showOperationButtonByStatus()
+
+      // 调用子组件的方法
+      refCustomerBasic4Edit.value.getCustomerBasicInCache()
+      if (status.value === '0') {
+        // 全部状态下的编辑 委托方名称不能修改
+        refCustomerBasic4Edit.value.setFieldsDisable(true)
+      }
+      else {
+        refCustomerBasic4Edit.value.setFieldsDisable(false)
+      }
+      break
+    case 'detail':
+      title.value = '委托方名录（详情）'
+      id.value = params.id
+
+      // 查看详情时所有的操作按钮都隐藏
+      showOperationButtonByStatus()
+
+      // 调用子组件的方法
+      refCustomerBasic.value.getCustomerBasicInCache()
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
 onMounted(async () => {
   await getDict()
   initDialog(route.query)

diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 361f98b..c44da80 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -2,8 +2,9 @@
 <script name="CustomerInfoBasicForEdit" lang="ts" setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType } from './customer-info'
+import { mobileValidator, phoneValidator, postalCodeValidator } from './customer-info'
 import { UploadFile } from '@/api/file'
-import { saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
+import { failUpdateCustomerBasic, saveCustomerBasic, submitCustomerBasic, updateCustomerBasic } from '@/api/resource/customer'
 
 const props = defineProps({
   operation: { type: String, default: '' },
@@ -11,10 +12,10 @@
 
 const emit = defineEmits(['afterSaveDraft', 'commitSuccess'])
 
-// 是否可以编辑
-const fieldsEditable = ref<boolean>(false)
-const keyFieldsEditable = ref<boolean>(false)
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
+// 委托方所在地字典值
 const customerLocationDictInChild = ref<Array<IDictType>>([])
 
 const customerBasicInfo = ref<ICustomerInfo>({
@@ -35,39 +36,6 @@
 
 const basicFormRef = ref()
 
-// 验证手机
-const phoneValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 验证座机
-const mobileValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
-  if (reg.test(value.trim()) === true) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
-// 邮编校验
-const postalCodeValidator = (rule: any, value: any, callback: any) => {
-  const reg = /^[0-9]{6}$/
-  if (reg.test(value.trim()) === true || value.trim() === '') {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
-
 const customerBasicRules = ref({
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所在地不能为空，请选择', trigger: ['change', 'blur'] }],
@@ -79,16 +47,14 @@
 }) // 表单验证规则
 
 // 逻辑
-
-// 查询人员基本信息
+// 查询人员基本信息 从缓存中直接取
 const getCustomerBasicInCache = () => {
   customerBasicInfo.value = JSON.parse(sessionStorage.getItem('customerInfo')!)
 }
 
 // 设置字段是否可以编辑
-const setFieldsEditable = (editable: boolean, keyEditable: boolean) => {
-  fieldsEditable.value = editable
-  keyFieldsEditable.value = keyEditable
+const setFieldsDisable = (editable: boolean) => {
+  keyFieldsDisable.value = editable
 }
 
 // 保存至草稿箱
@@ -100,6 +66,7 @@
       // 设置返回的委托方id和委托方编号
       customerBasicInfo.value.customerNo = res.data.customerNo
       customerBasicInfo.value.id = res.data.id
+      // 返回保存后生成的id
       emit('afterSaveDraft', res.data.id)
     }
     else {
@@ -170,19 +137,20 @@
   })
 }
 
-// 保存并提交审批单
-const saveAndSubmitBasicForm = async () => {
+// 保存并提交审批单 重新进入流程审批
+const failUpdateSubmitBasicForm = async () => {
   if (!basicFormRef) { return }
-  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+  await basicFormRef.value.validate((valid: boolean) => {
     if (valid === true) {
-      updateCustomerBasic(customerBasicInfo.value).then((res) => {
+      failUpdateCustomerBasic(customerBasicInfo.value).then((res) => {
         if (res.code === 200) {
           // 提示保存成功
-          submitBasicForm()
+          ElMessage.success(`审批单 ${customerBasicInfo.value.customerNo} 提交成功`)
+          emit('commitSuccess', customerBasicInfo.value)
         }
         else {
           // 提示失败信息
-          ElMessage.error(`保存失败：${res.message}`)
+          ElMessage.error(`审批单 ${customerBasicInfo.value.customerNo} 提交失败：${res.message}`)
         }
       })
     }
@@ -205,10 +173,10 @@
 
 defineExpose({
   getCustomerBasicInCache,
-  setFieldsEditable,
+  setFieldsDisable,
   saveBasicForm,
   submitBasicForm,
-  saveAndSubmitBasicForm,
+  failUpdateSubmitBasicForm,
 })
 </script>
 
@@ -219,7 +187,7 @@
         <!-- 第一行 第一列 -->
         <el-col :span="6">
           <el-form-item label="委托方编号">
-            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="!keyFieldsEditable" />
+            <el-input v-model="customerBasicInfo.customerNo" placeholder="委托方编号，保存后自动生成" :readonly="true" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="座机电话" prop="mobile">
             <el-input v-model="customerBasicInfo.mobile" placeholder="请输入座机（区号-号码）" :clearable="true" />
@@ -229,7 +197,7 @@
         <!-- 第一行 第二列 -->
         <el-col :span="6">
           <el-form-item label="委托方名称" prop="deptId">
-            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" />
+            <dept-select v-model="customerBasicInfo.deptId" placeholder="请选择委托方" style="width: 100%;" :disabled="keyFieldsDisable" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phone">
             <el-input v-model="customerBasicInfo.phone" placeholder="请输入手机号码" :clearable="true" />
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index 7405617..5c2ddb0 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -66,3 +66,36 @@
   mobile?: string
   editable: boolean
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 验证座机
+export const mobileValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(0\d{2,3}(-)?\d{7,8})$/
+  if (reg.test(value.trim()) === true) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+
+// 邮编校验
+export const postalCodeValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^[0-9]{6}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
diff --git a/src/views/resource/customer/info/customerApprovalDialog.vue b/src/views/resource/customer/info/customerApprovalDialog.vue
index e27580f..9fad7e2 100644
--- a/src/views/resource/customer/info/customerApprovalDialog.vue
+++ b/src/views/resource/customer/info/customerApprovalDialog.vue
@@ -39,7 +39,7 @@
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
-// agree同意 refuse拒绝 reject驳回 revoke取消
+// 获取用户信息
 const userInfo = useUserStore()
 
 // ---------------表单提交--------------------------------
@@ -50,7 +50,8 @@
   comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
 })
 
-const agree = async () => {
+// 同意
+const agree = () => {
   submitApproval('agree', { taskId: formData.taskId, comments: formData.comments }).then((res) => {
     ElMessage.success('审批完成')
     btnLoading.value = false
@@ -61,7 +62,8 @@
   })
 }
 
-const refuse = async () => {
+// 拒绝
+const refuse = () => {
   refuseApproval({
     id: formData.id,
     taskId: formData.taskId,
@@ -74,8 +76,9 @@
   })
 }
 
-const revoke = async () => {
-  return revokeApproval({
+// 取消（撤回）
+const revoke = () => {
+  revokeApproval({
     id: formData.id,
     processInstanceId: formData.processId,
     comments: formData.comments,
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 6af3b99..0f22b88 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -7,7 +7,6 @@
 import CustomerInfoStaff from './staff.vue'
 import CustomerApprovalDialog from './customerApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
-import { getDeptById } from '@/api/system/dept'
 import { draftDelete } from '@/api/resource/customer'
 
 // 变量
@@ -35,6 +34,7 @@
 const apprDial = ref()
 const refCustomerBasic = ref()
 const refCustomerBasic4Edit = ref() // 可编辑的详情组件
+const refCustomerStaff = ref()
 
 // 字典值
 const customerLocationDict = ref<IDictType[]>([])
@@ -48,6 +48,20 @@
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 逻辑
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 将所有流程操作的按钮隐藏
 const hideAllOpterationButtons = () => {
   saveButtVisable.value = false
   submitButtVisable.value = false
@@ -57,6 +71,7 @@
   editButtVisable.value = false
 }
 
+// 根据审批状态显示对应的流程操作按钮
 const showOperationButtonByStatus = () => {
   switch (status.value) {
     case '0':
@@ -104,7 +119,7 @@
 }
 // 关闭
 const resetForm = () => {
-  sessionStorage.removeItem('customerInfo')
+  sessionStorage.removeItem('customerInfo') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
 
@@ -122,86 +137,21 @@
   }
   else {
     // 之前已经在流程中的表单 先保存 再提交
-    refCustomerBasic4Edit.value.saveAndSubmitBasicForm()
+    refCustomerBasic4Edit.value.failUpdateSubmitBasicForm()
   }
 }
 
-const radioChangeHandler = (newVal: string | number | boolean) => {
-  const radioTarget = radioItems.value.filter(item => item.name === newVal)
-  if (radioTarget.length > 0) {
-    currentLabel.value = radioTarget[0].name
-    current.value = radioTarget[0].value
-  }
-  else {
-    currentLabel.value = radioItems.value[0].name
-    current.value = radioItems.value[0].value
-  }
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type
-  id.value = params.id !== undefined ? params.id : ''
-  status.value = params.status !== undefined ? params.status : ''
-
-  // 默认显示第一个tab内容
-  current.value = radioItems.value[0].value
-  currentLabel.value = radioItems.value[0].name
-
-  switch (params.type) {
-    case 'create' :
-      title.value = '委托方名录（新增）'
-      saveButtVisable.value = true
-      submitButtVisable.value = true
-
-      break
-    case 'update':
-      title.value = '委托方名录（编辑）'
-      id.value = params.id
-
-      // 查看详情时所有的操作按钮都隐藏
-      showOperationButtonByStatus()
-
-      // 调用子组件的方法
-      refCustomerBasic4Edit.value.getCustomerBasicInCache()
-      break
-    case 'detail':
-      title.value = '委托方名录（详情）'
-      id.value = params.id
-
-      // 查看详情时所有的操作按钮都隐藏
-      showOperationButtonByStatus()
-
-      // 调用子组件的方法
-      refCustomerBasic.value.getCustomerBasicInCache()
-      break
-    default:
-      title.value = ''
-      break
-  }
-}
-
-const saveDraftHandler = (idRet: string) => {
-  id.value = idRet
-}
-
-const commitSuccessHandler = (customerInfo: ICustomerInfo) => {
-  // 在详情页显示
-  refCustomerBasic.value.initDialog(customerInfo)
-
-  type.value = 'detail'
-  title.value = '委托方名录（详情）'
-  hideAllOpterationButtons()
-}
-
 // 编辑按钮点击事件处理函数
 const editClickedHandler = () => {
   type.value = 'update'
   title.value = '委托方名录（编辑）'
+
+  // 隐藏编辑按钮 显示提交按钮
   editButtVisable.value = false
   submitButtVisable.value = true
 
   // 调用子组件的方法
+  // 切换了组件所有需要初始化数据
   refCustomerBasic4Edit.value.getCustomerBasicInCache()
 }
 
@@ -217,6 +167,12 @@
   apprDial.value.initDialog('agree', customerInfo.id, customerInfo.taskId, '')
 }
 
+// 取消流程
+const revokeClickedHandler = () => {
+  const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
+  apprDial.value.initDialog('revoke', customerInfo.id, customerInfo.taskId, customerInfo.processId)
+}
+
 // 删除审批单
 const deleteClickedHandler = () => {
   const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
@@ -237,13 +193,7 @@
   })
 }
 
-// 取消流程
-const revokeClickedHandler = () => {
-  const customerInfo: ICustomerInfo = JSON.parse(sessionStorage.getItem('customerInfo')!)
-  apprDial.value.initDialog('revoke', customerInfo.id, customerInfo.taskId, customerInfo.processId)
-}
-
-// 流程审批结束后的操作
+// 流程审批（同意、拒绝、取消）结束后的操作 将按钮都隐藏（本身就不能编辑了）
 const approvalSuccessHandler = (type: string) => {
   if (type === 'agree' || type === 'refuse') {
     flowButtsVisable.value = false
@@ -253,6 +203,22 @@
   }
 }
 
+// 新建时保存后的处理 获取返回的id
+const saveDraftHandler = (idRet: string) => {
+  id.value = idRet
+}
+
+// 提交后的处理 显示详情页且不能编辑
+const commitSuccessHandler = (customerInfo: ICustomerInfo) => {
+  // 在详情页显示
+  refCustomerBasic.value.initDialog(customerInfo)
+
+  type.value = 'detail'
+  title.value = '委托方名录（详情）'
+  hideAllOpterationButtons()
+}
+
+// 查询委托方所在地的字典值
 const getLabCodeDict = () => {
   if (customerLocationDict.value.length === 0) {
     getDictByCode('bizLabCode').then((res) => {
@@ -268,6 +234,55 @@
   getLabCodeDict()
 }
 
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+  status.value = params.status !== undefined ? params.status : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '委托方名录（新增）'
+      saveButtVisable.value = true
+      submitButtVisable.value = true
+
+      break
+    case 'update':
+      title.value = '委托方名录（编辑）'
+
+      // 判断显示哪些流程操作按钮
+      showOperationButtonByStatus()
+
+      // 调用子组件的方法
+      refCustomerBasic4Edit.value.getCustomerBasicInCache()
+      if (status.value === '0') {
+        // 全部状态下的编辑 委托方名称不能修改
+        refCustomerBasic4Edit.value.setFieldsDisable(true)
+      }
+      else {
+        refCustomerBasic4Edit.value.setFieldsDisable(false)
+      }
+      break
+    case 'detail':
+      title.value = '委托方名录（详情）'
+      id.value = params.id
+
+      // 查看详情时所有的操作按钮都隐藏
+      showOperationButtonByStatus()
+
+      // 调用子组件的方法
+      refCustomerBasic.value.getCustomerBasicInCache()
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
 onMounted(async () => {
   await getDict()
   initDialog(route.query)
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index dd58ca1..7244cc5 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -1,29 +1,30 @@
 <!-- 委托方名录 -->
 <script name="CustomerInfoList" lang="ts" setup>
-import { type DateModelType, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ICustomerInfo, IDictType, IListQuery } from './customer-info'
 import CustomerApprovalDialog from './customerApprovalDialog.vue'
-import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { draftDelete, getCustomerInfoList, revokeApproval } from '@/api/resource/customer'
+import { getDictByCode } from '@/api/system/dict'
+import { draftDelete, getCustomerInfoList } from '@/api/resource/customer'
 
 // 定义常量
 const buttonBoxActive = 'customerInfoApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwtfml'
 
+const { proxy } = getCurrentInstance() as any
+const router = useRouter()
+
+// 选中的审批状态按钮
 const active = ref('')
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
 const approvalStatusList = ref<String[]>([
   '全部', '已审批', '草稿箱', '待审批', '审批中', '已通过', '未通过', '已取消', '我的审批单',
 ])
 
-const isApproval = ref<boolean>(false)
-
-const { proxy } = getCurrentInstance() as any
-const router = useRouter()
-
+// 弹窗子组件
 const apprDial = ref()
 
 // 查询条件
@@ -56,6 +57,7 @@
 const customerInfoList = ref<Array<ICustomerInfo>>([]) // 表格数据
 
 // 逻辑
+// 跳转到新建的页面
 const addCustomerInfo = () => {
   router.push({
     query: {
@@ -65,25 +67,7 @@
   })
 }
 
-const detail = (row: ICustomerInfo) => {
-  sessionStorage.setItem('customerInfo', JSON.stringify(row))
-
-  let operType = 'detail'
-  if (searchQuery.value.approvalStatus === '1') {
-    // 草稿箱 状态的 查看 是可以编辑的组件
-    operType = 'update'
-  }
-
-  router.push({
-    query: {
-      type: operType,
-      id: row.id,
-      status: searchQuery.value.approvalStatus,
-    },
-    path: '/customer/info/detail',
-  })
-}
-
+// 点击编辑按钮
 const updateInfo = (row: ICustomerInfo) => {
   sessionStorage.setItem('customerInfo', JSON.stringify(row))
   router.push({
@@ -96,6 +80,27 @@
   })
 }
 
+// 点击查看（或编辑）按钮
+const detail = (row: ICustomerInfo) => {
+  if (searchQuery.value.approvalStatus === '1') {
+    // 全部或草稿箱 状态的 查看 是可以编辑的组件
+    updateInfo(row)
+  }
+  else {
+    // 将行数据存入缓存 用来在路由之间传递数据
+    sessionStorage.setItem('customerInfo', JSON.stringify(row))
+
+    router.push({
+      query: {
+        type: 'detail',
+        id: row.id,
+        status: searchQuery.value.approvalStatus,
+      },
+      path: '/customer/info/detail',
+    })
+  }
+}
+
 // 删除委托方名录 或 删除草稿箱中的审批单
 const deleteById = (row: any) => {
   const confirmStr = `${active.value}` === '0' ? `委托方${row.customerName}` : `委托方审批单${row.customerNo}`
@@ -116,10 +121,6 @@
   })
 }
 
-const revokeApprById = (row: ICustomerInfo) => {
-  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
-}
-
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -192,17 +193,11 @@
   fetchData(true)
 }
 
+// 审批按钮点击切换事件
 const changeCurrentButton = (val: string) => {
   active.value = val // 此时的tab
   window.sessionStorage.setItem(buttonBoxActive, val) // 记录tab状态
 
-  if (val === '0') {
-    isApproval.value = false
-  }
-  else {
-    isApproval.value = true
-  }
-
   reset() // 刷新
 }
 
@@ -216,11 +211,17 @@
   apprDial.value.initDialog('refuse', row.id, row.taskId, '')
 }
 
-// 流程操作之后刷新
-const afterApprovalHandler = () => {
-  fetchData()
+// 取消（撤回审批单）
+const revokeApprById = (row: ICustomerInfo) => {
+  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
 }
 
+// 流程操作之后刷新
+const afterApprovalHandler = () => {
+  fetchData(true)
+}
+
+// 初始化流程审批状态按钮
 const getApprovalStatusDict = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
@@ -283,7 +284,7 @@
     <!-- 表格数据展示 -->
     <table-container>
       <!-- 表头区域 -->
-      <template v-if="isApproval === false" #btns-right>
+      <template v-if="active === '0'" #btns-right>
         <icon-button icon="icon-add" title="新建" @click="addCustomerInfo" />
       </template>
 
@@ -313,10 +314,10 @@
                 编辑
               </el-button>
 
-              <el-button v-if="active === '0' && proxy.hasPerm(`/resource/customer/infoList/del`)" size="small" type="primary" link @click="deleteById(row)">
+              <el-button v-if="active === '0' && proxy.hasPerm(`/resource/customer/infoList/del`)" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/customer/infoList/delAppr`)" size="small" type="primary" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/customer/infoList/delAppr`)" size="small" type="danger" link @click="deleteById(row)">
                 删除2
               </el-button>