Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -271,13 +271,19 @@ const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   try {
     const data = await kpglApi.queryContractInvoicePage(queryParams)
@@ -290,18 +296,24 @@ const getList = async () => {
 //统计信息
 const getStatics = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   const data = await kpglApi.getStatics(queryParams)
-  infoList.value[0].num = data.ykp
-  infoList.value[1].num = data.yhk
-  infoList.value[2].num = data.ykp - data.yhk
+  infoList.value[0].num = data?.ykp ?? 0
+  infoList.value[1].num = data?.yhk ?? 0
+  infoList.value[2].num = (data?.ykp ?? 0) - (data?.yhk ?? 0)
 }
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -299,13 +299,19 @@ const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   try {
     const data = await kpglApi.queryContractInvoicePage(queryParams)
@@ -318,18 +324,24 @@ const getList = async () => {
 //统计信息
 const getStatics = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   const data = await kpglApi.getStatics(queryParams)
-  infoList.value[0].num = data.ykp
-  infoList.value[1].num = data.yhk
-  infoList.value[2].num = data.ykp - data.yhk
+  infoList.value[0].num = data?.ykp ?? 0
+  infoList.value[1].num = data?.yhk ?? 0
+  infoList.value[2].num = (data?.ykp ?? 0) - (data?.yhk ?? 0)
 }
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

client/src/views/OaSystem/financialManagement/kpglPage/myIndex.vue

@@ -276,13 +276,19 @@ const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   try {
     const data = await kpglApi.queryContractInvoicePage(queryParams)
@@ -295,19 +301,25 @@ const getList = async () => {
 //统计信息
 const getStatics = async () => {
   loading.value = true
-  if (invoiceTime.value.length > 0) {
+  if (invoiceTime.value?.length > 0) {
     queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
     queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.invoiceOn = ''
+    queryParams.invoiceOff = ''
   }
-  if (returnTime.value.length > 0) {
+  if (returnTime.value?.length > 0) {
     queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  } else {
+    queryParams.returnOn = ''
+    queryParams.returnOff = ''
   }
   const data = await kpglApi.getStatics(queryParams)
   if (data) {
-    infoList.value[0].num = data.ykp
-    infoList.value[1].num = data.yhk
-    infoList.value[2].num = data.ykp - data.yhk
+    infoList.value[0].num = data.ykp ?? 0
+    infoList.value[1].num = data.yhk ?? 0
+    infoList.value[2].num = (data.ykp ?? 0) - (data.yhk ?? 0)
   }
 }
 const handleCurrentChange = (pageNo: number) => {