Commit 3ca79bd7 by yuzhenWang

Merge branch 'wyz' into 'test'

修复应收款管理时间清空报错

See merge request !177
parents 5e404fa5 3500ffb2
...@@ -783,7 +783,7 @@ const loadTableData = async () => { ...@@ -783,7 +783,7 @@ const loadTableData = async () => {
try { try {
console.log('searchParams.entryDate', searchParams.entryDate) console.log('searchParams.entryDate', searchParams.entryDate)
if (searchParams.entryDate.length > 0) { if (searchParams.entryDate && searchParams.entryDate.length > 0) {
searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01` searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01` searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
} else { } else {
...@@ -793,7 +793,6 @@ const loadTableData = async () => { ...@@ -793,7 +793,6 @@ const loadTableData = async () => {
const params = { const params = {
...searchParams, ...searchParams,
commissionDateStart: searchParams.commissionDateStart || undefined, commissionDateStart: searchParams.commissionDateStart || undefined,
commissionDateEnd: searchParams.commissionDateEnd || undefined, commissionDateEnd: searchParams.commissionDateEnd || undefined,
...@@ -827,7 +826,7 @@ const getStatics = async () => { ...@@ -827,7 +826,7 @@ const getStatics = async () => {
const searchParams = searchFormRef.value.getFormData() || {} const searchParams = searchFormRef.value.getFormData() || {}
try { try {
if (searchParams.entryDate.length > 0) { if (searchParams.entryDate && searchParams.entryDate.length > 0) {
searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01` searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01` searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
} else { } else {
......
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