Merge branch 'swhotfix' into test

c8127c83 · Sweet Zhang · 5bf74ff5 · ca25ec2e · c8127c83 · c8127c83
Commit c8127c83 authored Mar 09, 2026 by Sweet Zhang
8 changed files
--- a/src/formJson/fnaForm.js
+++ b/src/formJson/fnaForm.js
 const fnaForm = [
  // 介绍人信息
-  {
-    fatherTitle: '转介人信息',
-    keyType: 'Array',
-    key: 'brokerList',
-    anchorKey: 'brokerList',
-    moudleType: 'brokerList',
-    dataLength: 1,
-    showMoudle: true,
-    showTable: true,
-    addChildren: true,
-    addChildrenTxt: '转介人',
-    fatherRequired: false,
-    isOpen: false,
-    // 新增表格列配置
-    columns: [
-      {
-        label: '姓名',
-        prop: 'brokerName',
-        type: 'remoteSelect',
-        searchType: 'brokerName',
-        placeholder: '请输入关键词搜索',
-        required: false
-      },
-      {
-        label: '性别',
-        prop: 'brokerGender',
-        type: 'select',
-        dictType: 'sys_gender',
-        placeholder: '请选择',
-        required: false
-      },
-      {
-        label: '内部编号',
-        prop: 'brokerNumber',
-        type: 'input',
-        placeholder: '请输入',
-        required: false
-      },
-      {
-        label: '所属团队',
-        prop: 'brokerTeam',
-        type: 'remoteSelect',
-        searchType: 'brokerTeam',
-        placeholder: '请输入关键词搜索',
-        required: false
-      },
-      {
-        label: '分配比例',
-        prop: 'brokerRatio',
-        type: 'inputNumber',
-        placeholder: '请输入',
-        required: true
-      },
-      {
-        label: '备注',
-        prop: 'remark',
-        type: 'input',
-        placeholder: '请输入',
-        required: false
-      }
-    ],
-    data: [
  // {
-      //   brokerName: '',
+  //   fatherTitle: '转介人信息',
-      //   brokerGender: '',
+  //   keyType: 'Array',
-      //   brokerNumber: '',
+  //   key: 'brokerList',
-      //   brokerTeam: '',
+  //   anchorKey: 'brokerList',
-      //   brokerRatio: '',
+  //   moudleType: 'brokerList',
-      //   remark: ''
+  //   dataLength: 1,
+  //   showMoudle: true,
+  //   showTable: true,
+  //   addChildren: true,
+  //   addChildrenTxt: '转介人',
+  //   fatherRequired: false,
+  //   isOpen: false,
+  //   // 新增表格列配置
+  //   columns: [
+  //     {
+  //       label: '姓名',
+  //       prop: 'brokerName',
+  //       type: 'remoteSelect',
+  //       searchType: 'brokerName',
+  //       placeholder: '请输入关键词搜索',
+  //       required: false
+  //     },
+  //     {
+  //       label: '性别',
+  //       prop: 'brokerGender',
+  //       type: 'select',
+  //       dictType: 'sys_gender',
+  //       placeholder: '请选择',
+  //       required: false
+  //     },
+  //     {
+  //       label: '内部编号',
+  //       prop: 'brokerNumber',
+  //       type: 'input',
+  //       placeholder: '请输入',
+  //       required: false
+  //     },
+  //     {
+  //       label: '所属团队',
+  //       prop: 'brokerTeam',
+  //       type: 'remoteSelect',
+  //       searchType: 'brokerTeam',
+  //       placeholder: '请输入关键词搜索',
+  //       required: false
+  //     },
+  //     {
+  //       label: '分配比例',
+  //       prop: 'brokerRatio',
+  //       type: 'inputNumber',
+  //       placeholder: '请输入',
+  //       required: true
+  //     },
+  //     {
+  //       label: '备注',
+  //       prop: 'remark',
+  //       type: 'input',
+  //       placeholder: '请输入',
+  //       required: false
  //     }
-    ]
+  //   ],
-  },
+  //   data: [
+  //     // {
+  //     //   brokerName: '',
+  //     //   brokerGender: '',
+  //     //   brokerNumber: '',
+  //     //   brokerTeam: '',
+  //     //   brokerRatio: '',
+  //     //   remark: ''
+  //     // }
+  //   ]
+  // },
  // 受供养人信息
  {
    fatherTitle: '受供养人信息',

--- a/src/formJson/productPlan.js
+++ b/src/formJson/productPlan.js
@@ -9,6 +9,20 @@ const productPlan = [
    fatherRequired: true, //父级必填,代表个人资料这个模块有必填项
    data: [
      {
+        label: '出单经纪公司',
+        key: 'reconciliationCompanyName',
+        domType: 'SearchSelect',
+        required: false,
+        maxLength: 30,
+        disabled: false,
+        placeholder: '请输入',
+        show: true,
+        labelWidth: '120px', //标签宽度
+        sm: 12, //栅格布局份数
+        labelPosition: 'top', //标签的位置
+        lg: 8 //栅格布局份数
+      },
+      {
        label: '保险公司',
        key: 'companyName',
        domType: 'SearchSelect',
@@ -253,20 +267,6 @@ const productPlan = [
        lg: 8 //栅格布局份数
      },
      {
-        label: '出单经纪公司',
-        key: 'reconciliationCompanyName',
-        domType: 'SearchSelect',
-        required: false,
-        maxLength: 30,
-        disabled: false,
-        placeholder: '请输入',
-        show: true,
-        labelWidth: '120px', //标签宽度
-        sm: 12, //栅格布局份数
-        labelPosition: 'top', //标签的位置
-        lg: 8 //栅格布局份数
-      },
-      {
        label: '保单额度(重疾)',
        key: 'sumInsured',
        domType: 'Input',

--- a/src/views/financialCenter/receivables.vue
+++ b/src/views/financialCenter/receivables.vue
@@ -755,7 +755,7 @@ const receivableReportTableColumns = ref([
    { prop: 'commissionPeriod', label: '入账期数', sortable: true, width: '120', formatter: (row) => row.commissionPeriod || '-' },
    { prop: 'totalPeriod', label: '入账总期数', sortable: true, width: '120', formatter: (row) => row.totalPeriod || '-' },
    { prop: 'commissionDate', label: '入账日（估）', sortable: true, width: '130', },
-    { prop: 'commissionRatio', label: '预估入账比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
+    { prop: 'commissionRatio', label: '产品对应来佣率', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
    { prop: 'hkdAmount', label: '预估入账金额HKD', sortable: true, width: '120', formatter: (row) => formatCurrency(row.hkdAmount || 0) },
    { prop: 'paidRatio', label: '已入账比例', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' },
    { prop: 'paidAmount', label: '已入账金额HKD', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) },
@@ -777,7 +777,7 @@ const receivableReportItemTableColumns = ref([
    { prop: 'totalPeriod', label: '入账总期数', sortable: true, width: '120', formatter: (row) => row.totalPeriod || '-' },
    { prop: 'commissionName', label: '入账项目', sortable: true, width: '130', formatter: (row) => row.commissionName || '-' },
    { prop: 'commissionDate', label: '入账日（估）', sortable: true, width: '130', formatter: (row) => row.commissionDate || '-' },
-    { prop: 'commissionRatio', label: '预估入账比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
+    { prop: 'commissionRatio', label: '产品对应来佣率', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
    { prop: 'expectedAmount', label: '预估入账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.expectedAmount || 0) },
    { prop: 'paidRatio', label: '已入账比例', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' },
    { prop: 'paidAmount', label: '已入账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) },

--- a/src/views/sign/FnaList/components/fanForm.vue
+++ b/src/views/sign/FnaList/components/fanForm.vue
@@ -446,7 +446,7 @@ const searchSelectList = async (query, fieldKey, row) => {
      const params5 = {
        pageNo: 1,
        pageSize: 10,
-        queryContent: queryString
+        realName: queryString
      }
      const response5 = await getUserSaleExpandList(params5)
      if (response5.code == 200) {

--- a/src/views/sign/FnaList/index.vue
+++ b/src/views/sign/FnaList/index.vue
@@ -98,7 +98,7 @@
            width="200"
            show-overflow-tooltip
          />
-          <el-table-column label="新单编号" align="center" prop="policyId" />
+          <!-- <el-table-column label="新单编号" align="center" prop="policyId" /> -->
          <el-table-column label="保单号" align="center" prop="policyNo" width="150" />
          <el-table-column label="创建时间" sortable align="center" prop="createTime" width="200">

--- a/src/views/sign/appointment/index.vue
+++ b/src/views/sign/appointment/index.vue
@@ -270,7 +270,7 @@ const { bx_currency_type, csf_ap_status, csf_ap_meeting_point, csf_ap_frequency 
 const baseDropdownItems = [
  { label: '修改', value: 'edit', confirm: '' },
  {
-    label: '生成行程单',
+    label: '确认生成行程单',
    value: 'viewItinerary',
    confirm: '',
    // 只有当 row.status == 1 时才显示

--- a/src/views/sign/underwritingMain/index.vue
+++ b/src/views/sign/underwritingMain/index.vue
 <template>
  <div>
-    <CommonPage :operationBtnList='operationBtnList' :visibleDefaultButtons="visibleDefaultButtons"
+    <CommonPage :operationBtnList='operationBtnList' :visibleDefaultButtons="visibleDefaultButtons" v-loading.fullscreen.lock="statusLoading"
      :showSearchForm='true' :show-pagination='true' :total='pageTotal' :current-page='currentPage'
      :page-size='pageSize' @size-change='handleSizeChange' @current-change='handleCurrentChange'>
      <!-- 搜索区域 -->
@@ -45,7 +45,7 @@
    </CommonPage>
    <!-- 弹窗-->
    <CommonDialog dialogTitle='修改状态' dialogWidth='80%' :openDialog=editStatusDialogFlag :showAction='true'
-      :showClose='true' @close='editStatusDialogFlag = false' @confirm='handleEditStatusSubmit'  v-loading="statusLoading">
+      :showClose='true' @close='editStatusDialogFlag = false' @confirm='handleEditStatusSubmit'>
      <SearchForm ref="editStatusFormRef" :config="editStatusFormConfig" v-model="editStatusFormData" />
    </CommonDialog>
@@ -454,7 +454,9 @@ const handleSelect = async (e, row) => {
      }
      editStatusDialogFlag.value = true
      editStatusFormData.value = {
-        status: row.status
+        status: row.status,
+        effectiveDate:row.effectiveDate,
+        underwritingDate:row.underwritingDate
      }
      break
    case 'viewRelated':

--- a/src/views/sign/underwritingMain/policyDetail.vue
+++ b/src/views/sign/underwritingMain/policyDetail.vue
@@ -297,7 +297,13 @@ const introducerConfig = [
      }))
    }
  },
+{
+    type: 'input',
+    prop: 'brokerName',
+    label: '转介人姓名',
+    span: 4,
+    disabled: true
+  },
  // {
  //     type: 'select',
  //     prop: 'gender',