Merge branch 'feature-20260316wyz-预约修改' into 'test'

修改预约提交loading

See merge request !95

src/views/sign/appointment/appointmentEdit.vue

@@ -695,27 +695,6 @@ const handleFileChange = async file => {
   return false // 阻止自动上传
 }
 
-const execlUpload = () => {
-  // exprotLoading.value = true
-  // let data = {
-  //   // appointmentBizId: idsObj.value.appointmentBizId,
-  //   file: currentFile.value
-  // }
-  // try {
-  //   if (currentFile.value) {
-  //     uploadExcel(data).then(res => {
-  //       if (res.code == 200) {
-  //         proxy.$message.success('预约导入成功')
-  //         execlDialog.value = false
-  //         exprotLoading.value = false
-  //       }
-  //     })
-  //   }
-  // } catch (error) {
-  //   proxy.$message.error(error.message)
-  //   exprotLoading.value = false
-  // }
-}
 // 获取预约详情
 function getAppointmentInfo(appointmentBizId, changeTab) {
   getAppointmentDetail(appointmentBizId).then(res => {
@@ -1061,8 +1040,9 @@ const handleSubmit = async type => {
     if (type == 'submit') {
       submitLoading.value = true
       // 新增预约单
-      addAppointment(submitAppointmentObj.value).then(res => {
-        if (res.code == 200) {
+      try {
+        const res = await addAppointment(submitAppointmentObj.value)
+        if (res.code === 200) {
           submitLoading.value = false
           proxy.$message.success('预约成功')
           editStatus.value = false
@@ -1071,10 +1051,15 @@ const handleSubmit = async type => {
             type: 'add'
           })
         } else {
+          console.log('出错了', res)
           submitLoading.value = false
         }
-      })
+      } catch (error) {
+        console.error('新增请求异常:', error)
+        submitLoading.value = false
+      }
     }
+    return
   }
   // 代表修改预约单 因为编辑暂存也会有预约id
   if (idsObj.value.appointmentBizId && type == 'submit') {
@@ -1084,7 +1069,18 @@ const handleSubmit = async type => {
     }
     submitLoading.value = true
     // 编辑预约单
-    editAppointmentDetail(submitAppointmentObj.value).then(res => {
+    // editAppointmentDetail(submitAppointmentObj.value).then(res => {
+    //   if (res.code == 200) {
+    //     submitLoading.value = false
+    //     editStatus.value = true
+    //     getAppointmentInfo(idsObj.value.appointmentBizId)
+    //     proxy.$message.success('修改预约单成功')
+    //   } else {
+    //     submitLoading.value = false
+    //   }
+    // })
+    try {
+      const res = await editAppointmentDetail(submitAppointmentObj.value)
       if (res.code == 200) {
         submitLoading.value = false
         editStatus.value = true
@@ -1093,7 +1089,11 @@ const handleSubmit = async type => {
       } else {
         submitLoading.value = false
       }
-    })
+    } catch (error) {
+      console.error('修改请求异常:', error)
+      submitLoading.value = false
+    }
+    return
   }
   // 新增预约暂存
   if (type == 'storage') {
@@ -1103,7 +1103,17 @@ const handleSubmit = async type => {
     submitAppointmentObj.value.apiAppointmentInfoDto.fnaNo = props.processDetail.fnaNo
     submitLoading.value = true
     // 暂存预约单
-    storageAppointment(submitAppointmentObj.value).then(res => {
+    // storageAppointment(submitAppointmentObj.value).then(res => {
+    //   if (res.code == 200) {
+    //     submitLoading.value = false
+    //     proxy.$message.success('预约暂存成功')
+    //     router.push({ path: '/sign/appointment' })
+    //   } else {
+    //     submitLoading.value = false
+    //   }
+    // })
+    try {
+      const res = await storageAppointment(submitAppointmentObj.value)
       if (res.code == 200) {
         submitLoading.value = false
         proxy.$message.success('预约暂存成功')
@@ -1111,13 +1121,28 @@ const handleSubmit = async type => {
       } else {
         submitLoading.value = false
       }
-    })
+    } catch (error) {
+      console.error('暂存请求异常:', error)
+      submitLoading.value = false
+    }
   }
+
   // 编辑状态下预约暂存
   if (type == 'editStorage') {
     submitLoading.value = true
     // 暂存预约单
-    appointmentEditStorage(submitAppointmentObj.value).then(res => {
+    // appointmentEditStorage(submitAppointmentObj.value).then(res => {
+    //   if (res.code == 200) {
+    //     submitLoading.value = false
+    //     proxy.$message.success('预约暂存提交成功')
+    //     editStatus.value = true
+    //     getAppointmentInfo(idsObj.value.appointmentBizId)
+    //   } else {
+    //     submitLoading.value = false
+    //   }
+    // })
+    try {
+      const res = await appointmentEditStorage(submitAppointmentObj.value)
       if (res.code == 200) {
         submitLoading.value = false
         proxy.$message.success('预约暂存提交成功')
@@ -1126,7 +1151,10 @@ const handleSubmit = async type => {
       } else {
         submitLoading.value = false
       }
-    })
+    } catch (error) {
+      console.error('预约暂存请求异常:', error)
+      submitLoading.value = false
+    }
   }
 }
 const handleEdit = () => {