Browse Source

物资管理中日期查询表单修复

wyn 2 tháng trước cách đây
mục cha
commit
29c42fbd3d

+ 2 - 1
src/views/material/Inspectionrecords/index.vue

@@ -70,7 +70,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-
+          @clear="handleClearTime(checkDate)"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="检查结果" prop="status">

+ 4 - 2
src/views/material/coll/index.vue

@@ -61,7 +61,7 @@
           value-format="YYYY-MM-DD HH:mm:ss"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           @change="handleClearLoanTime"
-
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="归还人" prop="restitutionUserName">
@@ -83,7 +83,7 @@
           value-format="YYYY-MM-DD HH:mm:ss"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           @change="handleClearRestitutionTime"
-
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
@@ -267,6 +267,8 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields()
   queryParams.loanTimeStart = null
   queryParams.loanTimeEnd = null
+  queryParams.restitutionTimeStart = null
+  queryParams.restitutionTimeEnd = null
   handleQuery()
 }
 

+ 8 - 7
src/views/material/information/index.vue

@@ -110,6 +110,7 @@
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           :picker-options="pickerOptions"
+          @clear="handleClearTime(createTime)"
           class="!w-240px"
         />
       </el-form-item>
@@ -563,11 +564,11 @@ const handlePropertyChange = () => {
   queryParams.recordId = undefined
 }
 
-// /** 日期清空处理 */
-// const handleClearTime = (value: any) => {
-//   if (value == null) {
-//     queryParams.startExpirationDate = undefined
-//     queryParams.endExpirationDate = undefined
-//   }
-// }
+/** 日期清空处理 */
+const handleClearTime = (value: any) => {
+  if (value == null) {
+    queryParams.startExpirationDate = undefined
+    queryParams.endExpirationDate = undefined
+  }
+}
 </script>

+ 2 - 2
src/views/material/inspectionplan/index.vue

@@ -42,8 +42,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          @change="handleClearTime"
-
+          @change="handleClearTime(createTime)"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="检察员" prop="checkUserName">

+ 9 - 5
src/views/material/replacementrecords/index.vue

@@ -88,8 +88,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :shortcuts="dateShortcuts"
+          @change="handleClearTime(createTime)"
           class="!w-240px"
-          @change="handleClearTime"
         />
       </el-form-item>
       <el-form-item>
@@ -151,9 +151,8 @@
 import * as ReplaceApi from '@/api/material/replace/index'
 import * as lockerApi from '@/api/material/lockers/index'
 import * as TypeApi from '@/api/material/type'
-import { dateFormatter } from '@/utils/formatTime'
+import { getDateRange} from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
-import router from "@/router";
 defineOptions({ name: 'MaterialReplaceRecord' })
 
 const { t } = useI18n() // 国际化
@@ -224,9 +223,11 @@ const getList = async () => {
   try {
     // 格式化日期
     if (Array.isArray(createTime.value) && createTime.value.length === 2) {
-      queryParams.startTime = dateFormatter(createTime.value[0])
-      queryParams.endTime = dateFormatter(createTime.value[1])
+      const [startTime, endTime] = getDateRange(createTime.value[0], createTime.value[1])
+      queryParams.startTime = startTime
+      queryParams.endTime = endTime
     }
+
     if(props.cabinetId||props.recordId){
       queryParams.cabinetId = Number(props.cabinetId)
       if(props.recordId){
@@ -245,6 +246,7 @@ const getList = async () => {
     if (route.query.cabinetId || props.cabinetId) {
       visibleSelect.value = true
     }
+    console.log(queryParams,'查询参数')
     const data = await ReplaceApi.listChangeRecord(queryParams)
     changeRecordList.value = data.list
     total.value = data.total
@@ -277,6 +279,8 @@ const queryFormRef=ref()
 /** 重置按钮操作 */
 const resetQuery = () => {
   createTime.value = []
+  queryParams.startTime = undefined
+  queryParams.endTime = undefined
   queryFormRef.value?.resetFields()
   handleQuery()
 }