Commit f30f70fa by yuzhenWang

Merge branch 'wyz' into 'test'

修复应付,应收,新单跟进bug

See merge request !185
parents fee54f23 cc636dca
......@@ -1560,7 +1560,7 @@ const handleCurrentChange = val => {
const loadTableData = async () => {
const searchParams = (await searchFormRef.value.getFormData()) || {}
loading.value = true
if (searchParams.payoutDate.length > 0) {
if (searchParams.payoutDate && searchParams.payoutDate.length > 0) {
searchParams.payoutDateStart = `${searchParams.payoutDate[0]}-01`
searchParams.payoutDateEnd = `${searchParams.payoutDate[1]}-01`
} else {
......
......@@ -529,7 +529,7 @@ const searchConfig = ref([
},
{
type: 'select',
prop: 'fortuneName',
prop: 'commissionType',
label: '入账项目',
dictType: 'csf_commission_type'
},
......@@ -783,8 +783,6 @@ const loadTableData = async () => {
const searchParams = searchFormRef.value.getFormData() || {}
loading.value = true
try {
console.log('searchParams.entryDate', searchParams.entryDate)
if (searchParams.entryDate && searchParams.entryDate.length > 0) {
searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
......
......@@ -691,7 +691,7 @@ const basicPlanFormConfig = ref([
insuranceCompanyBizIdList: [basicPlanFormData.value.insuranceCompanyBizId || ''],
pageNo: 1,
pageSize: 20,
productName: 'productName'
productName: ''
}),
placeholder: '请选择产品名称',
debounceWait: 500,
......
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