Merge branch 'feature-20250827wyz-写业务' into 'test'

Feature 20250827wyz 写业务

See merge request !89

src/views/sign/FnaList/components/customer.vue

@@ -468,7 +468,7 @@ const tableLoading = ref(false)
 const tableData = ref([])
 const total = ref(0)
 //计算默认显示的日期（18年前的今天）
-const defaultDisplayDate = ref(dayjs().subtract(19, 'year').toDate())
+const defaultDisplayDate = ref()
 
 // 地址组件菜单数据
 const addressMenuList = ref([
@@ -761,13 +761,11 @@ const handleDateChange = child => {
   }
 }
 const disabledDate = (time, child) => {
-  if (child.key == 'birthday') {
+  if (child.key == 'birthday' && props.activeName !== 'insurantInfo') {
     // 计算18年前的今天
     const eighteenYearsAgo = dayjs().subtract(19, 'year')
     // 禁用今天之后的日期和18年前的今天之后的日期
     return time.getTime() > Date.now() || time.getTime() > eighteenYearsAgo.valueOf()
-  } else {
-    return time.getTime() > Date.now()
   }
 }
 const exportInfo = () => {
@@ -1594,6 +1592,9 @@ watch(
   (newVal, oldVal) => {
     editStatus.value = false
     customerRightRef.value = null
+    if (newVal === 'customer' || newVal === 'policyholder') {
+      defaultDisplayDate.value = dayjs().subtract(19, 'year').toDate()
+    }
     if (newVal === 'customer') {
       processFormData()
       // if (JSON.stringify(customerForm.value) != '{}') {
@@ -1622,6 +1623,7 @@ watch(
         processFormData()
       }
     } else if (newVal === 'insurantInfo') {
+      defaultDisplayDate.value = dayjs().startOf('day')
       editStatus.value = props.fatherEditStatus
       if (JSON.stringify(insuredForm.value) != '{}') {
         form.value = JSON.parse(JSON.stringify(insuredForm.value))

src/views/sign/appointment/appointmentEdit.vue

@@ -49,14 +49,14 @@
               >编辑</el-button
             >
 
-            <el-button
+            <!-- <el-button
               type="primary"
               v-if="!editStatus"
               @click="handleSubmit('editStorage')"
               :disabled="submitLoading"
               :loading="submitLoading"
               >暂存</el-button
-            >
+            > -->
             <el-button
               v-if="!editStatus"
               type="success"
@@ -120,7 +120,7 @@
                 :loading="submitLoading"
                 >提交</el-button
               >
-              <el-button
+              <!-- <el-button
                 type="primary"
                 plain
                 v-if="!idsObj.appointmentBizId && source == 'fnaList'"
@@ -128,7 +128,7 @@
                 :disabled="submitLoading"
                 :loading="submitLoading"
                 >暂存</el-button
-              >
+              > -->
               <el-button
                 style="margin-left: 10px"
                 v-if="idsObj.appointmentBizId"
@@ -1070,6 +1070,8 @@ const handleSubmit = async type => {
             tab: 'appointment',
             type: 'add'
           })
+        } else {
+          submitLoading.value = false
         }
       })
     }
@@ -1088,6 +1090,8 @@ const handleSubmit = async type => {
         editStatus.value = true
         getAppointmentInfo(idsObj.value.appointmentBizId)
         proxy.$message.success('修改预约单成功')
+      } else {
+        submitLoading.value = false
       }
     })
   }
@@ -1104,6 +1108,8 @@ const handleSubmit = async type => {
         submitLoading.value = false
         proxy.$message.success('预约暂存成功')
         router.push({ path: '/sign/appointment' })
+      } else {
+        submitLoading.value = false
       }
     })
   }
@@ -1117,6 +1123,8 @@ const handleSubmit = async type => {
         proxy.$message.success('预约暂存提交成功')
         editStatus.value = true
         getAppointmentInfo(idsObj.value.appointmentBizId)
+      } else {
+        submitLoading.value = false
       }
     })
   }