异常管理模块下接口修改对联调，修复查询功能

src/views/Exceptions/Exception/index.vue

@@ -42,12 +42,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_EXCEPTION_STATUS)"
             :key="dict.value"
@@ -65,8 +60,9 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          class="!w-240px"
+          @clear="handleClearTime(createTime)"
         />
-
       </el-form-item>
       <el-form-item label="异常解除时间">
         <el-date-picker
@@ -77,22 +73,27 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          class="!w-240px"
+          @clear="handleClearTime2(handleTime)"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          重置
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="exceptionList"
-    >
-      <el-table-column label="编号" align="center" prop="misplaceId" />
+    <el-table v-loading="loading" :data="exceptionList">
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="物资柜" align="center" prop="loanFromName" />
       <el-table-column label="物资名称" align="center" prop="materialsName" />
       <el-table-column label="归还柜" align="center" prop="restitutionToName" />
@@ -102,8 +103,16 @@
           <dict-tag :type="DICT_TYPE.MATERIAL_EXCEPTION_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="异常发生时间" align="center" prop="occurTime" :formatter="dateFormatter" />
-      <el-table-column label="异常解除时间" align="center" prop="handleTime" :formatter="dateFormatter" />
+      <el-table-column
+        label="异常发生时间"
+        align="center"
+        prop="occurTime"
+      />
+      <el-table-column
+        label="异常解除时间"
+        align="center"
+        prop="handleTime"
+      />
     </el-table>
     <Pagination
       v-model:total="total"
@@ -116,10 +125,10 @@
 
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,getDateRange } from '@/utils/formatTime'
 import * as ExceptionApi from '@/api/material/exception'
 import * as CabinetApi from '@/api/material/information'
-import {returnExceptionPage} from "@/api/material/exception";
+import { returnExceptionPage } from '@/api/material/exception'
 
 defineOptions({ name: 'MaterialException' })
 
@@ -155,13 +164,19 @@ const getList = async () => {
   loading.value = true
   try {
     // 处理时间范围
-    if (createTime.value?.length === 2) {
-      queryParams.startTime = dateFormatter(createTime.value[0])
-      queryParams.endTime = dateFormatter(createTime.value[1])
+    // if (createTime.value?.length == 2) {
+    //   queryParams.startTime = getDateRange(createTime.value[0])
+    //   queryParams.endTime = getDateRange(createTime.value[1])
+    // }
+    if (Array.isArray(createTime.value) && createTime.value.length == 2) {
+      const [startTime, endTime] = getDateRange(createTime.value[0], createTime.value[1])
+      queryParams.startTime = startTime
+      queryParams.endTime = endTime
     }
-    if (handleTime.value?.length === 2) {
-      queryParams.handleStartTime = dateFormatter(handleTime.value[0])
-      queryParams.handleEndTime = dateFormatter(handleTime.value[1])
+    if (Array.isArray(handleTime.value) && handleTime.value?.length == 2) {
+      const [startTime, endTime] = getDateRange(handleTime.value[0], handleTime.value[1])
+      queryParams.handleStartTime = startTime
+      queryParams.handleEndTime = endTime
     }
     const data = await ExceptionApi.returnExceptionPage(queryParams)
     exceptionList.value = data.list
@@ -175,7 +190,7 @@ const getList = async () => {
 const getCabinetList = async () => {
   const data = await CabinetApi.getMaterialsCabinets({ pageNo: 1, pageSize: -1 })
   if (data?.list) {
-    cabinets.value = data.list.map(item => ({
+    cabinets.value = data.list.map((item) => ({
       value: item.id,
       label: item.cabinetName
     }))
@@ -192,25 +207,29 @@ const handleQuery = () => {
 const resetQuery = () => {
   createTime.value = null
   handleTime.value = null
+  queryParams.startTime = undefined
+  queryParams.endTime = undefined
+  queryParams.handleStartTime = undefined
+  queryParams.handleEndTime = undefined
   queryFormRef.value?.resetFields()
   handleQuery()
 }
 
-// /** 清空时间范围 */
-// const handleClearTime = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.startTime = undefined
-//     queryParams.endTime = undefined
-//   }
-// }
-//
-// /** 清空处理时间范围 */
-// const handleClearTime2 = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.handleStartTime = undefined
-//     queryParams.handleEndTime = undefined
-//   }
-// }
+/** 清空时间范围 */
+const handleClearTime = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.startTime = undefined
+    queryParams.endTime = undefined
+  }
+}
+
+/** 清空处理时间范围 */
+const handleClearTime2 = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.handleStartTime = undefined
+    queryParams.handleEndTime = undefined
+  }
+}
 
 /** 初始化 */
 onMounted(async () => {

src/views/Exceptions/doorException/index.vue

@@ -47,6 +47,7 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          @clear="handleClearTime(createTime)"
           class="!w-290px"
         />
       </el-form-item>
@@ -59,6 +60,7 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          @clear="handleClearTime2(handleTime)"
           class="!w-290px"
         />
       </el-form-item>
@@ -75,15 +77,15 @@
       v-loading="loading"
       :data="exceptionList"
     >
-      <el-table-column label="编号" align="center" prop="misplaceId" />
-      <el-table-column label="物资柜" align="center" prop="loanFromName" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="物资柜" align="center" prop="exceptionCategoryName" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MATERIAL_EXCEPTION_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="异常发生时间" align="center" prop="occurTime" :formatter="dateFormatter" />
-      <el-table-column label="异常解除时间" align="center" prop="handleTime" :formatter="dateFormatter" />
+      <el-table-column label="异常发生时间" align="center" prop="raiseTime" />
+      <el-table-column label="异常解除时间" align="center" prop="handleTime" />
     </el-table>
     <Pagination
       v-model:total="total"
@@ -96,7 +98,7 @@
 
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,getDateRange } from '@/utils/formatTime'
 import * as doorExceptionApi from '@/api/material/doorException'
 import * as CabinetApi from '@/api/material/information'
 import {doorExceptionPage} from "@/api/material/doorException";
@@ -151,10 +153,10 @@ const queryParams = reactive({
   exceptionType: '1',
   loanFromId: undefined,
   status: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  handleStartTime: undefined,
-  handleEndTime: undefined
+  startRaiseTime: undefined,
+  endRaiseTime: undefined,
+  startHandleTime: undefined,
+  endHandleTime: undefined
 })
 
 const queryFormRef = ref() // 搜索的表单
@@ -164,13 +166,15 @@ const getList = async () => {
   loading.value = true
   try {
     // 处理时间范围
-    if (createTime.value?.length === 2) {
-      queryParams.startTime = dateFormatter(createTime.value[0])
-      queryParams.endTime = dateFormatter(createTime.value[1])
+    if (Array.isArray(createTime.value) && createTime.value?.length == 2) {
+      const [startTime, endTime] = getDateRange(createTime.value[0], createTime.value[1])
+      queryParams.startRaiseTime = startTime
+      queryParams.endRaiseTime = endTime
     }
-    if (handleTime.value?.length === 2) {
-      queryParams.handleStartTime = dateFormatter(handleTime.value[0])
-      queryParams.handleEndTime = dateFormatter(handleTime.value[1])
+    if (Array.isArray(handleTime.value) && handleTime.value?.length == 2) {
+      const [startTime, endTime] = getDateRange(handleTime.value[0], handleTime.value[1])
+      queryParams.startHandleTime = startTime
+      queryParams.endHandleTime = endTime
     }
     const data = await doorExceptionApi.doorExceptionPage(queryParams)
     exceptionList.value = data.list
@@ -201,25 +205,29 @@ const handleQuery = () => {
 const resetQuery = () => {
   createTime.value = null
   handleTime.value = null
+  queryParams.startRaiseTime = undefined
+  queryParams.endRaiseTime = undefined
+  queryParams.startHandleTime = undefined
+  queryParams.endHandleTime = undefined
   queryFormRef.value?.resetFields()
   handleQuery()
 }
 
-// /** 清空时间范围 */
-// const handleClearTime = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.startTime = undefined
-//     queryParams.endTime = undefined
-//   }
-// }
-//
-// /** 清空处理时间范围 */
-// const handleClearTime2 = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.handleStartTime = undefined
-//     queryParams.handleEndTime = undefined
-//   }
-// }
+/** 清空时间范围 */
+const handleClearTime = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.startRaiseTime = undefined
+    queryParams.endRaiseTime = undefined
+  }
+}
+
+/** 清空处理时间范围 */
+const handleClearTime2 = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.startHandleTime = undefined
+    queryParams.endHandleTime = undefined
+  }
+}
 
 /** 初始化 */
 onMounted(async () => {

src/views/Exceptions/manualException/index.vue

@@ -79,8 +79,8 @@
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
-
+          class="!w-240px"
+          @clear="handleClearTime(raiseTime)"
         />
       </el-form-item>
       <el-form-item label="异常解除时间">
@@ -92,12 +92,19 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
+          class="!w-240px"
+          @clear="handleClearTime2(handleTime)"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          重置
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -110,14 +117,14 @@
       <el-radio-button label="third">已处理</el-radio-button>
     </el-radio-group>
 
-    <el-table
-      v-loading="loading"
-      :data="exceptionList"
-    >
-      <el-table-column label="编号" align="center" prop="exceptionId" />
+    <el-table v-loading="loading" :data="exceptionList">
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="异常分类" align="center" prop="exceptionCategory">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CLASSIFICATION_OF_EXCEPTIONS" :value="scope.row.exceptionCategory" />
+          <dict-tag
+            :type="DICT_TYPE.CLASSIFICATION_OF_EXCEPTIONS"
+            :value="scope.row.exceptionCategory"
+          />
         </template>
       </el-table-column>
       <el-table-column label="异常来源" align="center" prop="sourceName" />
@@ -129,8 +136,18 @@
           <dict-tag :type="DICT_TYPE.MANUAL_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="异常发生时间" align="center" prop="raiseTime" :formatter="dateFormatter" />
-      <el-table-column label="异常解除时间" align="center" prop="handleTime" :formatter="dateFormatter" />
+      <el-table-column
+        label="异常发生时间"
+        align="center"
+        prop="raiseTime"
+
+      />
+      <el-table-column
+        label="异常解除时间"
+        align="center"
+        prop="handleTime"
+
+      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button link type="primary" @click="handleCheck(scope.row)">查看</el-button>
@@ -151,10 +168,10 @@
 
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,getDateRange } from '@/utils/formatTime'
 import * as ExceptionApi from '@/api/material/manualException'
 import ExceptionDetail from './ExceptionDetail.vue'
-import {listManualException} from "@/api/material/manualException";
+import { listManualException } from '@/api/material/manualException'
 
 defineOptions({ name: 'MaterialManualException' })
 
@@ -218,7 +235,8 @@ const queryParams = reactive({
   endHandleTime: undefined,
   startRaiseTime: undefined,
   endRaiseTime: undefined,
-  status: undefined
+  status: undefined,
+  isUpload:1 //区分人工异常喝物资柜门异常，1是人工
 })
 
 const queryFormRef = ref() // 搜索的表单
@@ -235,13 +253,15 @@ const getList = async () => {
   loading.value = true
   try {
     // 处理时间范围
-    if (raiseTime.value?.length === 2) {
-      queryParams.startRaiseTime = dateFormatter(raiseTime.value[0])
-      queryParams.endRaiseTime = dateFormatter(raiseTime.value[1])
+    if (Array.isArray(raiseTime.value) && raiseTime.value?.length == 2) {
+      const [startTime, endTime] = getDateRange(raiseTime.value[0], raiseTime.value[1])
+      queryParams.startRaiseTime = startTime
+      queryParams.endRaiseTime = endTime
     }
-    if (handleTime.value?.length === 2) {
-      queryParams.startHandleTime = dateFormatter(handleTime.value[0])
-      queryParams.endHandleTime = dateFormatter(handleTime.value[1])
+    if (Array.isArray(handleTime.value) && handleTime.value?.length == 2) {
+      const [startTime, endTime] = getDateRange(handleTime.value[0], handleTime.value[1])
+      queryParams.startHandleTime = startTime
+      queryParams.endHandleTime = endTime
     }
     const data = await ExceptionApi.listManualException(queryParams)
     exceptionList.value = data.list
@@ -261,25 +281,29 @@ const handleQuery = () => {
 const resetQuery = () => {
   raiseTime.value = null
   handleTime.value = null
+  queryParams.startRaiseTime = undefined
+  queryParams.endRaiseTime = undefined
+  queryParams.startHandleTime = undefined
+  queryParams.endHandleTime = undefined
   queryFormRef.value?.resetFields()
   handleQuery()
 }
 
-// /** 清空时间范围 */
-// const handleClearTime = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.startRaiseTime = undefined
-//     queryParams.endRaiseTime = undefined
-//   }
-// }
-//
-// /** 清空处理时间范围 */
-// const handleClearTime2 = (value: [Date, Date] | null) => {
-//   if (!value) {
-//     queryParams.startHandleTime = undefined
-//     queryParams.endHandleTime = undefined
-//   }
-// }
+/** 清空时间范围 */
+const handleClearTime = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.startRaiseTime = undefined
+    queryParams.endRaiseTime = undefined
+  }
+}
+
+/** 清空处理时间范围 */
+const handleClearTime2 = (value: [Date, Date] | null) => {
+  if (!value) {
+    queryParams.startHandleTime = undefined
+    queryParams.endHandleTime = undefined
+  }
+}
 
 /** 查看详情 */
 const handleCheck = (row: any) => {