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

修复bug1

See merge request !21

src/formJson/applicant.js

@@ -520,7 +520,7 @@ const applicant = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入平均每月支出',
+        placeholder: '请输入',
         show: true,
         labelPosition: 'top', //标签的位置
         labelWidth: '120px', //标签宽度
@@ -612,7 +612,7 @@ const applicant = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入平均每月支出',
+        placeholder: '请输入',
         show: true,
         labelPosition: 'top', //标签的位置
         labelWidth: '120px', //标签宽度
@@ -722,7 +722,7 @@ const applicant = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入平均每月支出',
+        placeholder: '请输入',
         show: true,
         labelPosition: 'top', //标签的位置
         labelWidth: '120px', //标签宽度

src/formJson/appointmentInfo.js

@@ -267,11 +267,11 @@ const appointmentInfo = [
         lg: 8 //栅格布局份数
       },
       {
-        label: '离港时间',
+        label: '离港时间(先选择离港时间)',
         key: 'departureTime',
         domType: 'datetimePicker',
         required: false,
-        disabled: false,
+        disabled: true,
         placeholder: '请选择',
         show: true,
         labelPosition: 'top', //标签的位置
@@ -393,7 +393,7 @@ const appointmentInfo = [
       {
         label: '开户时间段(开始)',
         key: 'openAccountStartTime',
-        domType: 'datetimePicker',
+        domType: 'DatePicker',
         timeType: 'date',
         required: false,
         disabled: false,
@@ -405,11 +405,11 @@ const appointmentInfo = [
         lg: 8 //栅格布局份数
       },
       {
-        label: '开户时间段(结束)',
+        label: '开户时间段(结束,先选择开始时间)',
         key: 'openAccountEndTime',
-        domType: 'datetimePicker',
+        domType: 'DatePicker',
         required: false,
-        disabled: false,
+        disabled: true,
         placeholder: '请选择',
         show: true,
         labelPosition: 'top', //标签的位置

src/formJson/fnaForm.js

@@ -389,7 +389,7 @@ const fnaForm = [
     subTitle: '公司业务资料 (适用于公司老板跟股东)',
     data: [
       {
-        label: '公司過去兩年平均純利 (HKD)',
+        label: '公司過去兩年平均純利',
         key: 'averageNetProfit',
         domType: 'Input',
         inputType: 'text',
@@ -404,7 +404,7 @@ const fnaForm = [
         lg: 8 //栅格布局份数
       },
       {
-        label: '公司現時大約的總資產 (HKD)',
+        label: '公司現時大約的總資產',
         key: 'estimatedTotalAssets',
         domType: 'Input',
         inputType: 'text',
@@ -467,7 +467,7 @@ const fnaForm = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入金额(HKD)',
+        placeholder: '请输入',
         show: true,
         inputWidth: '300px',
         labelWidth: '800px', //标签宽度
@@ -483,7 +483,7 @@ const fnaForm = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入金额(HKD)',
+        placeholder: '请输入',
         show: true,
         inputWidth: '300px', //输入框宽度
         labelWidth: '260px', //标签宽度
@@ -507,7 +507,7 @@ const fnaForm = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入金额(HKD)',
+        placeholder: '请输入',
         show: true,
         inputWidth: '300px', //输入框宽度
         labelWidth: '220px', //标签宽度
@@ -522,7 +522,7 @@ const fnaForm = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入金额(HKD)',
+        placeholder: '请输入',
         show: true,
         labelWidth: '100px', //标签宽度
         sm: 18, //栅格布局份数
@@ -537,7 +537,7 @@ const fnaForm = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入说明',
+        placeholder: '请输入',
         show: true,
         labelWidth: '0px', //标签宽度
         sm: 6, //栅格布局份数

src/formJson/insured.js

@@ -627,7 +627,7 @@ const insured = [
         required: false,
         maxLength: 300,
         disabled: false,
-        placeholder: '请输入平均每月支出',
+        placeholder: '请输入',
         show: true,
         labelPosition: 'top', //标签的位置
         labelWidth: '120px', //标签宽度

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

@@ -332,7 +332,7 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column label="市值(HKD)" prop="marketValue" align="center">
+                  <el-table-column label="市值" prop="marketValue" align="center">
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.marketValue"
@@ -371,11 +371,7 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="自住用途之房地产市值(HKD)"
-                    prop="marketValue"
-                    align="center"
-                  >
+                  <el-table-column label="自住用途之房地产市值" prop="marketValue" align="center">
                     <template #default="scope">
                       <el-input
                         v-model="scope.row.marketValue"

src/views/sign/appointment/appointmentEdit.vue

@@ -775,7 +775,9 @@ const handleSubmit = type => {
         proxy.$message.success('修改预约单成功')
       }
     })
+    getAppointmentInfo(idsObj.value.appointmentBizId)
   }
+  // 预约暂存
   if (type == 'storage') {
     submitAppointmentObj.value.apiAppointmentInfoDto.customerBizId =
       props.processDetail.customerBizId
@@ -789,7 +791,6 @@ const handleSubmit = type => {
       }
     })
   }
-  getAppointmentInfo(idsObj.value.appointmentBizId)
 }
 
 //修改预约数据