Commit c1efa700 by zhangxingmin

Merge remote-tracking branch 'origin/dev' into prod

parents 5d442064 7b806698
...@@ -388,196 +388,6 @@ const appointmentInfo = [ ...@@ -388,196 +388,6 @@ const appointmentInfo = [
// } // }
] ]
} }
// 业务信息
// {
// fatherTitle: '业务信息',
// type: 'object',
// key: 'business',
// labelPosition: 'top', //标签的位置
// showMoudle: true, //模块是否展示
// // description: '证件信息至少填写一项',
// data: [
// {
// label: '业务编号',
// key: 'businessNo',
// domType: 'Input',
// inputType: 'text',
// required: false,
// maxLength: 20,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '签单员账号',
// key: 'businessRepresentAccount1',
// domType: 'Input',
// inputType: 'text',
// required: false,
// maxLength: 20,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '签单员姓名',
// key: 'businessRepresentName1',
// domType: 'Input',
// inputType: 'text',
// required: false,
// maxLength: 20,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '签单员电话号码',
// key: 'businessRepresentMobile1',
// domType: 'arrowRight',
// required: false,
// disabled: false,
// placeholder: '请填写',
// show: true,
// drawerType: 'phone',
// businessRepresentMobile1: {}, //带有区号得电话一定要有一个和key一样得对象用于收集区号和号码
// code: 'businessRepresentMobile1Code',
// maxLength: 20,
// labelPosition: 'top', //标签的位置
// labelWidth: '180px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '签单员邮箱',
// key: 'businessRepresentEmail1',
// domType: 'Input',
// inputType: 'text',
// maxLength: 30,
// required: false,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// }
// ]
// },
// 基础信息
// {
// fatherTitle: '基础信息',
// type: 'object',
// key: 'basic',
// showMoudle: true, //模块是否展示
// // description: '证件信息至少填写一项',
// data: [
// {
// label: '意向预约时间',
// key: 'intentionAppointmentTime',
// domType: 'datetimePicker',
// required: true,
// disabled: false,
// placeholder: '请选择',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '是否有用车需求',
// key: 'isUseCar',
// domType: 'Select',
// required: false,
// disabled: false,
// placeholder: '请选择',
// dictType: 'sys_no_yes',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// }
// ]
// },
// 陪同顾问信息
// {
// fatherTitle: '转介人信息',
// type: 'object',
// key: 'consult',
// showMoudle: false, //模块是否展示
// data: [
// {
// label: '姓名',
// key: 'accompanyName',
// domType: 'Input',
// inputType: 'text',
// required: false,
// maxLength: 30,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '手机',
// key: 'accompanyMobile',
// domType: 'arrowRight',
// required: false,
// disabled: false,
// placeholder: '请填写',
// show: true,
// labelPosition: 'top', //标签的位置
// drawerType: 'phone',
// accompanyMobile: {}, //带有区号得电话一定要有一个和key一样得对象用于收集区号和号码
// code: 'accompanyMobileCode',
// maxLength: 20,
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// },
// {
// label: '邮箱',
// key: 'accompanyEmail',
// domType: 'Input',
// inputType: 'text',
// maxLength: 30,
// required: false,
// disabled: false,
// placeholder: '请输入',
// show: true,
// labelPosition: 'top', //标签的位置
// labelWidth: '120px', //标签宽度
// sm: 12, //栅格布局份数
// lg: 8 //栅格布局份数
// }
// ]
// },
// 其他情况
// {
// fatherTitle: '其他情况',
// type: 'object',
// key: 'other',
// showMoudle: true, //模块是否展示
// data: []
// },
] ]
export default appointmentInfo export default appointmentInfo
...@@ -57,18 +57,20 @@ const customer = [ ...@@ -57,18 +57,20 @@ const customer = [
required: true required: true
}, },
{ {
label: '是否长期有效',
prop: 'isPermanent',
type: 'radioGroup',
required: false
},
{
label: '证件有效期', label: '证件有效期',
prop: 'certificateValidityPeriod', prop: 'certificateValidityPeriod',
type: 'datePicker', type: 'datePicker',
timeType: 'daterange', timeType: 'daterange',
custom: true,
placeholder: '请选择证件有效期', placeholder: '请选择证件有效期',
required: true required: true,
}, width:300
{
label: '是否长期有效',
prop: 'isPermanent',
type: 'radioGroup',
required: false
} }
], ],
data: [] data: []
......
...@@ -404,6 +404,8 @@ function getProcessInfo(fnaBizId, changeTab, currentTab) { ...@@ -404,6 +404,8 @@ function getProcessInfo(fnaBizId, changeTab, currentTab) {
item.status = '0' item.status = '0'
} }
}) })
console.log('客户资料新增成功', tabsList.value)
csf_fna_status._object.csf_fna_status.forEach(item => { csf_fna_status._object.csf_fna_status.forEach(item => {
if (item.value == res.data.status) { if (item.value == res.data.status) {
processInfo.value.status = item.label processInfo.value.status = item.label
......
...@@ -886,6 +886,40 @@ const getDictsData = async () => { ...@@ -886,6 +886,40 @@ const getDictsData = async () => {
dictStore.setSignPeopleList(response7.data.records) dictStore.setSignPeopleList(response7.data.records)
} }
} }
// 获取下拉框所需要得数据
const getDictsLabelData = async () => {
proxy.useDictLists([
'csf_employment',
'sys_no_yes',
'bx_currency_type',
'csf_liquid_asset_type',
'csf_premium_funding_source',
'csf_customer_type',
'csf_customer_title',
'sys_gender',
'csf_marriage',
'csf_education',
'csf_id_type',
'csf_ap_apply_type',
'csf_ap_meeting_point',
'csf_ap_first_issue',
'csf_ap_dividend',
'csf_ap_frequency',
'csf_ap_rel',
'csf_ap_registration',
'csf_ap_exercise',
'csf_ap_risk',
'csf_ap_movie',
'csf_ap_game',
'csf_ap_policy_transfer',
'wj_question_first_category',
'wj_question_second_category',
'csf_ap_status',
'md_bank',
'oss_data_type',
'oss_data_person'
])
}
// Tab切换前的验证 // Tab切换前的验证
const beforeTabLeave = async (activeTabName, oldTabName) => { const beforeTabLeave = async (activeTabName, oldTabName) => {
foldInsurantInfo.value = false foldInsurantInfo.value = false
...@@ -1094,6 +1128,7 @@ if (route.query.appointmentNo && route.query.source == 'appointmentList') { ...@@ -1094,6 +1128,7 @@ if (route.query.appointmentNo && route.query.source == 'appointmentList') {
processInfo.value = route.query processInfo.value = route.query
idsObj.value.appointmentBizId = route.query.appointmentBizId idsObj.value.appointmentBizId = route.query.appointmentBizId
getDictsData() getDictsData()
// getDictsLabelData()
setTimeout(() => { setTimeout(() => {
// 请求预约单聚合详情 // 请求预约单聚合详情
getAppointmentInfo(idsObj.value.appointmentBizId, true) getAppointmentInfo(idsObj.value.appointmentBizId, true)
......
...@@ -348,6 +348,41 @@ ...@@ -348,6 +348,41 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="签约公司"
prop="contractingCompanyName"
align="center"
>
<template #default="scope">
<el-select
v-model="scope.row.contractingCompanyName"
filterable
remote
reserve-keyword
placeholder="请选择"
:remote-method="
query => searchSelectList(query, 'contractingCompanyName')
"
:loading="searchLoadingStates['contractingCompanyName']"
:disabled="editStatus"
@change="
handleTableSelectChange(
father,
scope.row,
'contractingCompanyName'
)
"
>
<el-option
v-for="item in searchOptions['contractingCompanyName'] || []"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column width="60px" align="center" label="操作"> <el-table-column width="60px" align="center" label="操作">
<template #default="scope"> <template #default="scope">
<el-icon <el-icon
...@@ -500,7 +535,12 @@ import { ...@@ -500,7 +535,12 @@ import {
getItineraryDetail, getItineraryDetail,
getAppointmentExprot getAppointmentExprot
} from '@/api/sign/appointment' } from '@/api/sign/appointment'
import { getBankList, getAllSignList, getUserSaleExpandList } from '@/api/common' import {
getBankList,
getAllSignList,
getUserSaleExpandList,
insuranceReconciliationCompany
} from '@/api/common'
import CommonForm from '@/views/components/commonForm' import CommonForm from '@/views/components/commonForm'
import CommonDialog from '@/components/commonDialog' import CommonDialog from '@/components/commonDialog'
import CardOne from '@/components/formCard/cardOne' import CardOne from '@/components/formCard/cardOne'
...@@ -827,12 +867,11 @@ const viewHistory = () => { ...@@ -827,12 +867,11 @@ const viewHistory = () => {
} }
} }
const handleTableSelectChange = (father, row, key) => { const handleTableSelectChange = (father, row, key) => {
console.log('选择了', row, key)
searchOptions.value[key].forEach(item => { searchOptions.value[key].forEach(item => {
console.log('item', item) console.log('item', item)
if (row[key] == item.value) { if (row[key] == item.value) {
row[key] = item.label row[key] = item.label
row.userBizId = item.userBizId // row.userBizId = item.userBizId
if (key == 'name') { if (key == 'name') {
row.userSignBizId = item.value row.userSignBizId = item.value
row.practiceCode = item.practiceCode row.practiceCode = item.practiceCode
...@@ -842,6 +881,8 @@ const handleTableSelectChange = (father, row, key) => { ...@@ -842,6 +881,8 @@ const handleTableSelectChange = (father, row, key) => {
row.cardType = item.cardType row.cardType = item.cardType
} else if (key == 'realName') { } else if (key == 'realName') {
row.userSaleBizId = item.value row.userSaleBizId = item.value
} else if (key == 'contractingCompanyName') {
row.contractingCompanyId = item.value
} }
} }
}) })
...@@ -954,6 +995,23 @@ const searchSelectList = async (query, key) => { ...@@ -954,6 +995,23 @@ const searchSelectList = async (query, key) => {
}) })
searchOptions.value[key] = response5.data.records searchOptions.value[key] = response5.data.records
} }
} else if (key == 'contractingCompanyName') {
const params5 = {
pageNo: 1,
pageSize: 10,
realName: queryString
}
const response5 = await insuranceReconciliationCompany(params5)
if (response5.code == 200) {
response5.data.records = response5.data.records.map(item => {
return {
...item,
label: item.name,
value: item.reconciliationCompanyBizId
}
})
searchOptions.value[key] = response5.data.records
}
} }
} catch (error) { } catch (error) {
console.error(` 搜索失败`, error) console.error(` 搜索失败`, error)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment