Explorar el Código

Merge branch 'needNew-0723' into dev

huoyi hace 3 días
padre
commit
661453aa47
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      src/views/item/record/index.vue

+ 3 - 2
src/views/item/record/index.vue

@@ -329,8 +329,8 @@ function getList() {
329
   loading.value = true;
329
   loading.value = true;
330
   let params = {
330
   let params = {
331
     ...queryParams.value,
331
     ...queryParams.value,
332
-    beginTime: dateRange.value[0],
333
-    endTime: dateRange.value[1]
332
+    beginTime:dateRange.value.length>0?dateRange.value[0]:null, 
333
+    endTime: dateRange.value.length>0?dateRange.value[1]:null
334
   }
334
   }
335
   listRecord(params).then(response => {
335
   listRecord(params).then(response => {
336
     recordList.value = response.rows
336
     recordList.value = response.rows
@@ -399,6 +399,7 @@ function handleQuery() {
399
 /** 重置按钮操作 */
399
 /** 重置按钮操作 */
400
 function resetQuery() {
400
 function resetQuery() {
401
   proxy.resetForm("queryRef")
401
   proxy.resetForm("queryRef")
402
+  dateRange.value = []
402
   handleQuery()
403
   handleQuery()
403
 }
404
 }
404
 
405