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

修复签约信息组合时间bug See merge request !70

Merge branch 'feature-20250827wyz-写业务' into 'test'
修复签约信息组合时间bug See merge request !70
348daec9 · yuzhenWang · dd858657 · c7e18892 · 348daec9 · 348daec9
Commit 348daec9 authored Mar 09, 2026 by yuzhenWang
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 29 deletions

src/views/sign/appointment/appointmentEdit.vue
+8 -2

src/views/sign/appointment/components/appointmentInfo.vue
+14 -27

No files found.
--- a/src/views/sign/appointment/appointmentEdit.vue
+++ b/src/views/sign/appointment/appointmentEdit.vue
@@ -321,7 +321,7 @@
                  :policyMailing="policyDetailInfo.policyMailing"
                />
              </div>
-              <div v-if="tab.name === 'newpolicyTodo'">新单事项</div>
              <div v-if="tab.name === 'verifyPolicyInfo'">
                <VerifyPolicyInfo
                  :activeName="activeName"
@@ -752,7 +752,6 @@ function getCustomerInfo(customerBizId) {
 }
 // 获取各个流程所需要得字典数据
 const getDictsData = async () => {
  if (route.query.source == 'policyList') {
    const params4 = {
      pageNo: 1,
@@ -947,6 +946,13 @@ const handleSubmit = async type => {
    submitAppointmentObj.value.apiAppointmentInfoDto = result
    if (!submitAppointmentObj.value.apiAppointmentInfoDto) return
  }
+  console.log('====================================')
+  console.log(
+    'submitAppointmentObj.value.apiAppointmentInfoDto',
+    submitAppointmentObj.value.apiAppointmentInfoDto
+  )
+  console.log('====================================')
+  return
  if (productPlanRef.value) {
    submitAppointmentObj.value.apiProductPlanInfoDto =
      await productPlanRef.value[0].handleSubmitForm()

--- a/src/views/sign/appointment/components/appointmentInfo.vue
+++ b/src/views/sign/appointment/components/appointmentInfo.vue
@@ -16,7 +16,7 @@
      >
        <template #form-right>
          <el-form ref="appointmentInfoFormRef" :model="form" :rules="rules" label-width="120px">
-            <div v-for="father in processedAppointmentData">
+            <div v-for="(father, fIndex) in processedAppointmentData">
              <el-row style="margin-bottom: 10px" v-if="father.showMoudle" :id="father.anchorKey">
                <div class="formBox">
                  <CardOne :title="father.fatherTitle">
@@ -52,7 +52,7 @@
                    <template #content>
                      <!-- 不是表格 -->
                      <el-row :gutter="20" v-if="!father.showTable">
-                        <template v-for="child in father.data" :key="child.key">
+                        <template v-for="(child, cIndex) in father.data" :key="child.key">
                          <el-col
                            :sm="child.sm"
                            :lg="child.lg"
@@ -829,10 +829,9 @@ const changePageSize = val => {
  queryParams.value.pageSize = val
  viewHistory()
 }
 const timeValueChange = child => {
-  if (form.value[child.key]) {
+  if (!form.value[child.key]) {
-    child.finishTime = `${form.value[child.key]} ${child.timeValue}:00`
-  } else if (!form.value[child.key]) {
    proxy.$message.warning(`请先选择${child.label}日期`)
    child.timeValue = ''
  }
@@ -1058,6 +1057,7 @@ const disabledDate = (time, child) => {
  }
 }
 const handleDateClear = child => {
+  form.value[child.key] = ''
  if (child.key == 'openAccountStartTime' && !form.value['openAccountStartTime']) {
    form.value['openAccountEndTime'] = ''
    resetShow({ type: 'child', key: 'openAccountEndTime', status: true, flag: 'disabled' })
@@ -1070,28 +1070,11 @@ const handleDateClear = child => {
  }
 }
 const handleDateChange = child => {
-  // debugger;
  if (child.key == 'openAccountStartTime' && form.value['openAccountStartTime']) {
    resetShow({ type: 'child', key: 'openAccountEndTime', status: false, flag: 'disabled' })
    disabledDate(form.value['openAccountStartTime'], { key: 'openAccountEndTime' })
  }
-  // 拼接日期与时分
-  if (child.key == 'arrivalTime' && child.finishTime && child.finishTime.split(' ').length == 2) {
-    child.finishTime = `${form.value[child.key]} ${child.timeValue}:00`
-  } else if (
-    child.key == 'departureTime' &&
-    child.finishTime &&
-    child.finishTime.split(' ').length == 2
-  ) {
-    child.finishTime = `${form.value[child.key]} ${child.timeValue}:00`
-  } else if (
-    child.key == 'signDate' &&
-    child.finishTime &&
-    child.finishTime.split(' ').length == 2
-  ) {
-    child.finishTime = `${form.value[child.key]} ${child.timeValue}:00`
-    console.log('signDate', child.finishTime)
-  }
  // 离港时间在到港时间之前
  if (
    child.key == 'arrivalTime' &&
@@ -1203,8 +1186,6 @@ const processFormData = async () => {
    processedAppointmentData.value = processedData
    console.log('processedAppointmentData.value', processedAppointmentData.value)
  }
-  console.log('processedAppointmentData.value', processedAppointmentData.value)
-  console.log('form.value', form.value)
  anchorListReady.value = true
 }
@@ -1673,7 +1654,13 @@ const handleFormValues = () => {
                })
              }
              if (item1.compositionTime) {
-                submitObj[item1.key] = item1.finishTime
+                let dateTime = ''
+                if (item1.timeValue) {
+                  dateTime = proxy.formatToDateTime(`${form.value[item1.key]} ${item1.timeValue}`)
+                } else if (form.value[item1.key]) {
+                  dateTime = proxy.formatToDateTime(`${form.value[item1.key]}`)
+                }
+                submitObj[item1.key] = dateTime
              }
            })
          }
@@ -1710,7 +1697,7 @@ const handleFormValues = () => {
          }
        })
-        console.log('submitObj', submitObj)
+        console.log('submitObj表单值', submitObj)
        if (submitObj['departureTime']) {
          // 开始时间是否在结束时间之前
          if (