Merge branch 'wyz' into 'test'

修复新单跟进关联记录跳转到关联预约，预约信息详情不展示

See merge request !186

src/views/sign/appointment/appointmentEdit.vue

@@ -728,6 +728,7 @@ function getAppointmentInfo(appointmentBizId, changeTab) {
           activeName.value = 'appointmentInfo'
           activeName.value = 'appointmentInfo'
         }
         }
       }
       }
+      console.log('详情请求完')
     }
     }
   })
   })
 }
 }
@@ -1068,17 +1069,7 @@ const handleSubmit = async type => {
       submitAppointmentObj.value.source = 2
       submitAppointmentObj.value.source = 2
     }
     }
     submitLoading.value = true
     submitLoading.value = true
-    // 编辑预约单
-    // 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 {
     try {
       const res = await editAppointmentDetail(submitAppointmentObj.value)
       const res = await editAppointmentDetail(submitAppointmentObj.value)
       if (res.code == 200) {
       if (res.code == 200) {
@@ -1130,17 +1121,7 @@ const handleSubmit = async type => {
   // 编辑状态下预约暂存
   // 编辑状态下预约暂存
   if (type == 'editStorage') {
   if (type == 'editStorage') {
     submitLoading.value = true
     submitLoading.value = true
-    // 暂存预约单
-    // 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 {
     try {
       const res = await appointmentEditStorage(submitAppointmentObj.value)
       const res = await appointmentEditStorage(submitAppointmentObj.value)
       if (res.code == 200) {
       if (res.code == 200) {
@@ -1274,8 +1255,6 @@ watch(
         })
         })
       } else {
       } else {
         activeName.value = ''
         activeName.value = ''
-        getAppointmentInfo(idsObj.value.appointmentBizId)
-
         tabsList.value = [
         tabsList.value = [
           {
           {
             label: '签约信息',
             label: '签约信息',
@@ -1347,10 +1326,12 @@ watch(
             key: 'fnaBizId'
             key: 'fnaBizId'
           }
           }
         ]
         ]
+        getAppointmentInfo(idsObj.value.appointmentBizId, true)
       }
       }
-      nextTick(() => {
-        activeName.value = 'appointmentInfo'
-      })
+
+      // nextTick(() => {
+      //   activeName.value = 'appointmentInfo'
+      // })
     }
     }
   }
   }
 )
 )
@@ -1366,6 +1347,7 @@ const getPolicyDetail = tabName => {
           ...followRes.data,
           ...followRes.data,
           ...infoRes.data
           ...infoRes.data
         }
         }
+
         if (route.query.source == 'policyList') {
         if (route.query.source == 'policyList') {
           appointmentSummeryInfo.value.apiAppointmentInfoDto = JSON.parse(
           appointmentSummeryInfo.value.apiAppointmentInfoDto = JSON.parse(
             JSON.stringify(
             JSON.stringify(

src/views/sign/appointment/components/appointmentInfo.vue

@@ -1183,6 +1183,8 @@ const processFormData = async () => {
   }
   }
   // 编辑状态下回显值
   // 编辑状态下回显值
   if (props.idsObj.appointmentBizId) {
   if (props.idsObj.appointmentBizId) {
+    console.log('预约详情', props.apiAppointmentInfoDto)
+
     setFormValue(props.apiAppointmentInfoDto, processedData)
     setFormValue(props.apiAppointmentInfoDto, processedData)
     return
     return
   } else {
   } else {

src/views/sign/underwritingMain/policyDetail.vue

@@ -1279,7 +1279,8 @@ const viewRecordDetail = e => {
       type: 'edit',
       type: 'edit',
       status: newOrderData.value.status,
       status: newOrderData.value.status,
       source: 'newOrder',
       source: 'newOrder',
-      appointmentBizId: newOrderData.value.appointmentBizId
+      appointmentBizId: newOrderData.value.appointmentBizId,
+      appointmentNo: newOrderData.value.appointmentNo
     }
     }
   })
   })
 }
 }