物资清单和物资检查记录页面查询功能修改

src/views/material/Inspectionrecords/index.vue

@@ -252,23 +252,26 @@ const getList = async () => {
       queryParams.endTime = endTime
     }
     // // 定义字段配置，包含类型转换规则
-    // const paramConfig = {
-    //   planName: { type: 'string' },
-    //   planId: { type: 'number' },
-    //   cabinetId: { type: 'number' },
-    //   materialsCabinetId: { type: 'number' }
-    // } as const
-    //
-    // // 批量处理参数
-    // Object.entries(paramConfig).forEach(([field, { type }]) => {
-    //   const value = props[field] ?? route.query[field]
-    //
-    //   if (value !== undefined && value !== null && value !== '') {
-    //     queryParams[field] = type === 'number' ? Number(value) : String(value)
-    //   } else {
-    //     queryParams[field] = null
-    //   }
-    // })
+    const paramConfig = {
+      planName: { type: 'string' },
+      planId: { type: 'number' },
+      cabinetId: { type: 'number' },
+      materialsCabinetId: { type: 'number' }
+    } as const
+
+    // 批量处理参数
+    if(props.cabinetId||route.query.cabinetId){
+      Object.entries(paramConfig).forEach(([field, { type }]) => {
+        const value = props[field] ?? route.query[field]
+
+        if (value !== undefined && value !== null && value !== '') {
+          queryParams[field] = type === 'number' ? Number(value) : String(value)
+        } else {
+          queryParams[field] = null
+        }
+      })
+    }
+
 
     // 处理 cabinetId 的特殊逻辑
     if (route.query.cabinetId || props.cabinetId) {

src/views/material/information/MaterialForm.vue

@@ -72,6 +72,7 @@
               v-model="formData.expirationDate"
               type="date"
               placeholder="选择日期"
+              value-format="YYYY-MM-DD"
               :picker-options="pickerOptions"
               @change="handleClearTime"
               class="!w-348px"

src/views/material/information/index.vue

@@ -15,6 +15,7 @@
         <el-select
           v-model="queryParams.materialsCabinetId"
           :disabled="visibleSelect"
+          @change="handleChangeCanbinet"
           placeholder="请选择物资柜"
           class="!w-240px"
         >
@@ -104,11 +105,11 @@
           v-model="createTime"
           type="datetimerange"
           range-separator="-"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           :picker-options="pickerOptions"
-          @change="handleClearTime"
           class="!w-240px"
         />
       </el-form-item>
@@ -407,26 +408,29 @@ const filteredPropertyValues = computed(() => {
 const route=useRoute()
 // 初始化
 onMounted(async () => {
+// 设置初始值
+  setInitialCabinetId()
   await getList()
   await getTreeselect()
   await materialsCabinets()
 
-  // 设置初始值
-  setInitialCabinetId()
 })
 
 // 设置初始物资柜ID
 const setInitialCabinetId = () => {
-  if (props.cabinetId) {
+  if (props.cabinetId||route.query.cabinetId) {
     queryParams.materialsCabinetId = Number(props.cabinetId)
-    visibleSelect.value = true
-  } else if (route.query.cabinetId) {
     queryParams.materialsCabinetId = Number(route.query.cabinetId)
+    visibleSelect.value = true
   } else {
-    queryParams.materialsCabinetId = null
+    queryParams.materialsCabinetId = 1
   }
 }
-
+// 查询物资柜
+const handleChangeCanbinet=(value)=>{
+  console.log(value,'value')
+  queryParams.materialsCabinetId = Number(value)
+}
 // 监听物资柜数据变化，确保值能正确回显
 watch(
   () => cabinets.value,
@@ -450,12 +454,7 @@ const getList = async () => {
       queryParams.startExpirationDate = startTime
       queryParams.endExpirationDate = endTime
     }
-    if(route.query.cabinetId){
-      queryParams.materialsCabinetId = Number(route.query.cabinetId)
-    }else {
-      queryParams.materialsCabinetId =null
-    }
-
+    console.log(queryParams,'queryParams')
     const data = await MaterialApi.listMaterials(queryParams)
     materialsList.value = data.list
     total.value = data.total
@@ -561,11 +560,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>

src/views/material/lockers/index.vue

@@ -539,7 +539,7 @@ const handleLook = (row: any): void => {
   router.push({
     path: '/material/lockers/DetailsIndex',
     query: {
-      cabinetId: row.cabinetId,
+      cabinetId: row.id,
       cabinetName: row.cabinetName
     }
   })

src/views/material/replacementrecords/index.vue

@@ -151,11 +151,12 @@ import * as lockerApi from '@/api/material/lockers/index'
 import * as TypeApi from '@/api/material/type'
 import { dateFormatter } from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
+import router from "@/router";
 defineOptions({ name: 'MaterialReplaceRecord' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const route=useRoute()
 // 数据定义
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
@@ -164,7 +165,10 @@ const createTime = ref([]) // 创建时间
 const visibleSelect = ref(false) // 是否禁用物资柜选择
 const cabinets = ref([]) // 物资柜选项
 const materialstypeOptions = ref([]) // 物资类型选项
-
+const props = defineProps<{
+  cabinetId?: string
+  recordId?: string | number
+}>()
 // 查询参数
 const queryParams = reactive({
   pageNo: 1,
@@ -221,6 +225,24 @@ const getList = async () => {
       queryParams.startTime = dateFormatter(createTime.value[0])
       queryParams.endTime = dateFormatter(createTime.value[1])
     }
+    if(props.cabinetId||props.recordId){
+      queryParams.cabinetId = Number(props.cabinetId)
+      if(props.recordId){
+        queryParams.recordId = Number(props.recordId)
+      }
+
+    }
+    if(route.query.cabinetId||route.query.recordId){
+      queryParams.cabinetId = Number(route.query.cabinetId)
+      if(route.query.recordId){
+        queryParams.recordId = Number(route.query.recordId)
+
+      }
+    }
+    // 处理 cabinetId 的特殊逻辑
+    if (route.query.cabinetId || props.cabinetId) {
+      visibleSelect.value = true
+    }
     const data = await ReplaceApi.listChangeRecord(queryParams)
     changeRecordList.value = data.list
     total.value = data.total