Procházet zdrojové kódy

物资检查计划查询功能和页面检查时间修改

wyn před 2 měsíci
rodič
revize
39c5a04634
1 změnil soubory, kde provedl 36 přidání a 30 odebrání
  1. 36 30
      src/views/material/Inspectionrecords/index.vue

+ 36 - 30
src/views/material/Inspectionrecords/index.vue

@@ -22,6 +22,7 @@
           v-model="queryParams.cabinetId"
           placeholder="请选择物资柜"
           clearable
+          @change="handleChangeCabinet"
           :disabled="visibleSelect"
           class="!w-240px"
         >
@@ -60,16 +61,16 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="检查时间" prop="createTime">
+      <el-form-item label="检查时间" prop="checkDate">
         <el-date-picker
-          v-model="createTime"
+          v-model="checkDate"
           type="datetimerange"
+          value-format="YYYY-MM-DD HH:mm:ss"
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-          @change="handleClearTime"
-          class="!w-240px"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+
         />
       </el-form-item>
       <el-form-item label="检查结果" prop="status">
@@ -140,7 +141,7 @@
           <span>{{ scope.row.materialsRfid || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查时间" align="center" prop="createTime" width="250" />
+      <el-table-column label="检查时间" align="center" prop="checkDate" width="250" />
       <el-table-column label="检查结果" align="center" prop="status">
         <template #default="scope">
           <dict-tag
@@ -223,7 +224,7 @@ const queryParams = reactive({
   materialsRfid: undefined,
   materialsName: undefined,
   loanState: undefined,
-  materialsCabinetId: undefined,
+  materialsId: undefined,
   materialsTypeId: undefined,
   startTime: undefined,
   endTime: undefined,
@@ -234,37 +235,40 @@ const queryParams = reactive({
   cabinetId: undefined
 })
 
-const createTime = ref(null) // 检查时间
+const checkDate = ref(null) // 检查时间
 const queryFormRef = ref() // 搜索的表单
-
+const handleChangeCabinet=(value)=>{
+  queryParams.cabinetId = value
+  console.log(value,'wuziId')
+}
 /** 查询检查记录列表 */
 const getList = async () => {
   loading.value = true
   try {
     // 处理时间范围
-    if (Array.isArray(createTime.value) && createTime.value.length == 2) {
-      const [startTime, endTime] = getDateRange(createTime.value[0], createTime.value[1])
+    if (Array.isArray(checkDate.value) && checkDate.value.length == 2) {
+      const [startTime, endTime] = getDateRange(checkDate.value[0], checkDate.value[1])
       queryParams.startTime = startTime
       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
+    //
+    // // 批量处理参数
+    // 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) {
@@ -314,7 +318,9 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  createTime.value = null
+  checkDate.value = null
+  queryParams.startTime = null
+  queryParams.endTime = null
   queryFormRef.value?.resetFields()
   handleQuery()
 }