合并test最新分支代码

4548137e · yuzhenWang · 7f6b6010 · 4548137e · 4548137e · 4548137e
Commit 4548137e authored Dec 24, 2025 by yuzhenWang
9 changed files
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -95,3 +95,19 @@ export function getClientUser(data) {
    data: data
  })
 }
+// 银行列表
+export function getBankList(data) {
+  return request({
+    url: '/base/api/bank/page',
+    method: 'post',
+    data: data
+  })
+}
+// 转介人列表
+export function getUserSaleExpandList(data) {
+  return request({
+    url: '/insurance/base/api/userSaleExpand/page',
+    method: 'post',
+    data: data
+  })
+}
--- a/src/api/sign/appointment.js
+++ b/src/api/sign/appointment.js
@@ -222,3 +222,4 @@ export function delSigleAppointment(appointmentBizId) {
    method: 'delete'
  })
 }
--- a/src/formJson/appointmentInfo.js
+++ b/src/formJson/appointmentInfo.js
@@ -115,7 +115,7 @@ const appointmentInfo = [
    moudleType: 'referrerDtoList',
    dataLength: 1, //设置dataLength,用于控制子级dom的个数，子级保存一个样例数据，便于加子级数据
    showTable: true,
-    showMoudle: true, //模块是否展示
+    showMoudle: false, //模块是否展示
    addChildren: true, //是否可以新增子级dom
    addChildrenTxt: '陪同转介人', //新增按钮得文本
    fatherRequired: false, //父级必填,代表个人资料这个模块有必填项
@@ -268,7 +268,7 @@ const appointmentInfo = [
        lg: 8 //栅格布局份数
      },
      {
-        label: '开户时间段(止,先选择开始时间)',
+        label: '开户时间(止)',
        key: 'openAccountEndTime',
        domType: 'DatePicker',
        required: false,
@@ -330,6 +330,7 @@ const appointmentInfo = [
        inputType: 'textarea',
        required: false,
        maxLength: 300,
+        rows: 5, //文本域行数
        disabled: false,
        placeholder: '请输入',
        show: true,
@@ -339,26 +340,42 @@ const appointmentInfo = [
        lg: 24 //栅格布局份数
      },
      {
-        label: '',
+        label: '所需资料',
-        title: '所需资料',
+        key: 'materials',
-        key: 'information',
+        domType: 'Input',
-        domType: 'Div',
+        inputType: 'textarea',
        required: false,
-        maxLength: 30,
+        maxLength: 300,
+        rows: 5, //文本域行数
        disabled: false,
        placeholder: '请输入',
        show: true,
-        informationList: [
+        labelPosition: 'top', //标签的位置
-          { name: '1、身份证' },
-          { name: '2、港澳通行证/护照' },
-          { name: '3、出生证明（18岁以下受保人）' },
-          { name: '4、结婚证（如夫妻为对方支付保费）' },
-          { name: '5、通关小白条' }
-        ],
        labelWidth: '120px', //标签宽度
        sm: 24, //栅格布局份数
        lg: 24 //栅格布局份数
      }
+      // {
+      //   label: '',
+      //   title: '所需资料',
+      //   key: 'information',
+      //   domType: 'Div',
+      //   required: false,
+      //   maxLength: 30,
+      //   disabled: false,
+      //   placeholder: '请输入',
+      //   show: true,
+      //   informationList: [
+      //     { name: '1、身份证' },
+      //     { name: '2、港澳通行证/护照' },
+      //     { name: '3、出生证明（18岁以下受保人）' },
+      //     { name: '4、结婚证（如夫妻为对方支付保费）' },
+      //     { name: '5、通关小白条' }
+      //   ],
+      //   labelWidth: '120px', //标签宽度
+      //   sm: 24, //栅格布局份数
+      //   lg: 24 //栅格布局份数
+      // }
    ]
  }
  // 业务信息

--- a/src/formJson/productPlan.js
+++ b/src/formJson/productPlan.js
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -9,7 +9,9 @@ const useDictStore = defineStore('dict', {
    insureCompanyList: [], //保险公司数据
    clientUserList: [], //用户数据，转介人
    dictTypeLists: [], //字典列表，根据请求得不同会变化，所以使用之前需要使用useDictLists请求数据
-    signNameList: []
+    signNameList: [],
+    bankList: [], //银行列表
+    userSaleExpandList: [] //最新转介人列表
  }),
  actions: {
    // 获取字典
@@ -84,6 +86,14 @@ const useDictStore = defineStore('dict', {
    // 设置签单人姓名列表
    setSignNameList(nameList) {
      this.signNameList = nameList
+    },
+    //设置银行列表
+    setBankList(list) {
+      this.bankList = list
+    },
+    //设置最新转介人列表
+    setUserSaleExpandList(list) {
+      this.userSaleExpandList = list
    }
  }
 })

--- a/src/views/sign/FnaList/edit.vue
+++ b/src/views/sign/FnaList/edit.vue
@@ -128,7 +128,13 @@ import AppointmentEdit from '@/views/sign/appointment/appointmentEdit'
 import useUserStore from '@/store/modules/user'
 import useDictStore from '@/store/modules/dict'
 import { addFna, getProcessDetail, updateProcess, getCustomerDetail } from '@/api/sign/fna'
-import { listTenantUser, getInsuranceProductList, getAdditionalProductList } from '@/api/common'
+import {
+  listTenantUser,
+  getInsuranceProductList,
+  getAdditionalProductList,
+  getBankList,
+  getUserSaleExpandList
+} from '@/api/common'
 import Customer from './components/customer'
 import FanForm from './components/fanForm'
@@ -246,6 +252,38 @@ const getDictsData = async () => {
    })
    dictStore.setAdditionalProductList(response3.data.records)
  }
+  const params4 = {
+    pageNo: 1,
+    pageSize: 99999
+  }
+  const response4 = await getBankList(params4)
+  if (response4.code == 200) {
+    response4.data.records = response4.data.records.map(item => {
+      return {
+        ...item,
+        label: item.bankName,
+        value: item.bankBizId
+      }
+    })
+    dictStore.setBankList(response4.data.records)
+  }
+  const params5 = {
+    pageNo: 1,
+    pageSize: 99999
+  }
+  const response5 = await getUserSaleExpandList(params5)
+  if (response5.code == 200) {
+    response5.data.records = response5.data.records.map(item => {
+      return {
+        ...item,
+        label: item.realName,
+        value: item.userSaleBizId
+      }
+    })
+    dictStore.setUserSaleExpandList(response5.data.records)
+  }
  // 请求每个流程中所涉及到的字典值数据
  proxy.useDictLists([
    'csf_employment',

--- a/src/views/sign/appointment/appointmentEdit.vue
+++ b/src/views/sign/appointment/appointmentEdit.vue
@@ -111,6 +111,10 @@
                  @policyEditSuccess="getPolicyDetail"
                  :pageSource="pageSource"
                  :showSubmitBtn="showSubmitBtn"
+                  :tabIndex="tabsList.findIndex(t => t.name === 'productPlan')"
+                  anchorContainer=".appointmentTabPaneBox"
+                  :fatherTabName="tabName"
+                  :editStatus="editStatus"
                />
              </div>
              <div v-if="tab.name === 'policyholder'">
@@ -330,7 +334,13 @@ import {
  uploadExcel
 } from '@/api/sign/appointment'
 import { getPolicyfollow, getPolicyInfo, signName } from '@/api/sign/underwritingMain'
-import { listTenantUser, getInsuranceProductList, getAdditionalProductList } from '@/api/common'
+import {
+  listTenantUser,
+  getInsuranceProductList,
+  getAdditionalProductList,
+  getBankList,
+  getUserSaleExpandList
+} from '@/api/common'
 import { Check, Edit } from '@element-plus/icons-vue'
 import { ref, nextTick, onUnmounted } from 'vue'
@@ -381,7 +391,7 @@ const policyNo = ref('') //新单跟进保单号
 const currentPolicyholderInfo = ref({}) //存储下投保人信息，受保人模块要用到
 const tabsList = ref([
  {
-    label: '预约信息',
+    label: '签约信息',
    name: 'appointmentInfo',
    id: 1,
    key: 'appointmentBizId'
@@ -638,17 +648,17 @@ const getDictsData = async () => {
    pageSize: 10
  }
-  // const response2 = await getInsuranceProductList(params2)
+  const response2 = await getInsuranceProductList(params2)
-  // if (response2.code == 200) {
+  if (response2.code == 200) {
-  //   response2.data.records = response2.data.records.map(item => {
+    response2.data.records = response2.data.records.map(item => {
-  //     return {
+      return {
-  //       ...item,
+        ...item,
-  //       label: item.productName,
+        label: item.productName,
-  //       value: item.productBizId
+        value: item.productBizId
-  //     }
+      }
-  //   })
+    })
-  //   dictStore.setInsureProductList(response2.data.records)
+    dictStore.setInsureProductList(response2.data.records)
-  // }
+  }
  const params3 = {
    pageNo: 1,
    pageSize: 10
@@ -665,7 +675,39 @@ const getDictsData = async () => {
    })
    dictStore.setAdditionalProductList(response3.data.records)
  }
+  const params4 = {
+    pageNo: 1,
+    pageSize: 99999
+  }
+  const response4 = await getBankList(params4)
+  if (response4.code == 200) {
+    response4.data.records = response4.data.records.map(item => {
+      return {
+        ...item,
+        label: item.bankName,
+        value: item.bankBizId
+      }
+    })
+    dictStore.setBankList(response4.data.records)
+  }
+  const params5 = {
+    pageNo: 1,
+    pageSize: 99999
+  }
+  const response5 = await getUserSaleExpandList(params5)
+  if (response5.code == 200) {
+    console.log('response5', response5)
+    response5.data.records = response5.data.records.map(item => {
+      return {
+        ...item,
+        label: item.realName,
+        value: item.userSaleBizId
+      }
+    })
+    dictStore.setUserSaleExpandList(response5.data.records)
+  }
  proxy.useDictLists([
    'csf_employment',
    'sys_no_yes',
@@ -764,13 +806,14 @@ const isArray = value => {
 const isObject = value => {
  return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
-const handleSubmit = type => {
+const handleSubmit = async type => {
  // 提交得时候要拿到各个步骤得表单数据
  if (appointmentInfoRef.value) {
-    submitAppointmentObj.value.apiAppointmentInfoDto =
+    const result = await appointmentInfoRef.value[0].handleFormValues()
-      appointmentInfoRef.value[0].handleFormValues()
+    submitAppointmentObj.value.apiAppointmentInfoDto = result
    if (!submitAppointmentObj.value.apiAppointmentInfoDto) return
  }
  if (productPlanRef.value) {
    submitAppointmentObj.value.apiProductPlanInfoDto = productPlanRef.value[0].handleSubmitForm()
  }
@@ -952,7 +995,7 @@ watch(
        tabsList.value = [
          {
-            label: '预约信息',
+            label: '签约信息',
            name: 'appointmentInfo',
            id: 1,
            key: 'appointmentBizId'
@@ -1000,7 +1043,7 @@ watch(
        // getAppointmentInfo(idsObj.value.appointmentBizId)
        tabsList.value = [
          {
-            label: '预约信息',
+            label: '签约信息',
            name: 'appointmentInfo',
            id: 1,
            key: 'appointmentBizId'

--- a/src/views/sign/appointment/components/appointmentInfo.vue
+++ b/src/views/sign/appointment/components/appointmentInfo.vue
--- a/src/views/sign/appointment/components/productPlan.vue
+++ b/src/views/sign/appointment/components/productPlan.vue