From 758702a2ac946110c46ec35dc62c8a1ccd4aab00 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 11 Nov 2025 14:59:13 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/discountApply/index.vue    | 33 +++++---
 src/views/business/handlingOrder/index.vue    | 32 +++++---
 .../claimAndRefund/receive/receiveApply.vue   | 32 +++++---
 .../claimAndRefund/receive/receiveManage.vue  | 31 ++++---
 .../receiveByCq/receiveApply.vue              | 30 ++++---
 .../receiveByCq/receiveManage.vue             | 29 ++++---
 src/views/material/cost/costDecreaseList.vue  | 33 +++++---
 .../lease/apply/component/outbound.vue        | 25 +++---
 .../lease/apply/component/picking.vue         | 25 +++---
 src/views/material/query/backQuery.vue        | 38 +++++----
 src/views/material/query/repairAuditQuery.vue | 38 +++++----
 src/views/material/query/repairQuery.vue      | 38 +++++----
 .../material/repair/repairTest/index.vue      | 42 ++++++----
 .../material/repair/scrapLedger/detail.vue    | 38 +++++----
 src/views/material/report/backReport.vue      | 35 +++++---
 .../material/report/goodsEntryReport.vue      | 35 +++++---
 src/views/material/report/repairReport.vue    | 35 +++++---
 src/views/material/report/scrapReport.vue     | 39 +++++----
 .../material/report/testedInBoundReport.vue   | 35 +++++---
 .../equipment/equipmentTracking/index.vue     | 81 ++++++++++++-------
 .../repair-testing/material-return/index.vue  | 30 ++++---
 .../repair-testing/one-machine/index.vue      | 30 ++++---
 .../repair-testing/repair-accessory/index.vue | 30 ++++---
 .../engineering-in-use/index.vue              | 32 +++++---
 24 files changed, 539 insertions(+), 307 deletions(-)

diff --git a/src/views/business/discountApply/index.vue b/src/views/business/discountApply/index.vue
index 70188979..86c0da85 100644
--- a/src/views/business/discountApply/index.vue
+++ b/src/views/business/discountApply/index.vue
@@ -43,17 +43,24 @@
             <el-form-item prop="agreementCode">
                 <el-input v-model="queryParams.agreementCode" placeholder="请输入协议号" clearable disabled />
             </el-form-item>
-
-            <el-form-item label="选择时间范围" prop="time" label-width="120px">
+            <el-form-item label="选择时间范围" prop="startTime" label-width="120px">
                 <el-date-picker
-                    v-model="queryParams.time"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    style="width: 350px"
-                ></el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
 
             <div>
@@ -430,7 +437,9 @@ export default {
                 agreementCode: '',
                 time: null,
                 maName: null,
-                typeName: null
+                typeName: null,
+                startTime: null,
+                endTime: null,
             },
 
             // 多选框选中数据
@@ -583,8 +592,8 @@ export default {
                 maName: this.queryParams.maName,
                 typeName: this.queryParams.typeName,
                 agreementId: this.queryParams.agreementId,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1]
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime
             }
 
             getReliefList(params).then(response => {
diff --git a/src/views/business/handlingOrder/index.vue b/src/views/business/handlingOrder/index.vue
index 0475b46c..b0174614 100644
--- a/src/views/business/handlingOrder/index.vue
+++ b/src/views/business/handlingOrder/index.vue
@@ -1,16 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="日期">
+      <el-form-item label="日期" prop="startTime">
         <el-date-picker
-          v-model="queryParams.time"
-          type="daterange"
+          v-model="queryParams.startTime"
           value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          style="width: 240px"
-        ></el-date-picker>
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
       </el-form-item>
       <el-form-item label="关键字" prop="keyWord">
         <el-input
@@ -250,7 +258,9 @@ export default {
         pageSize: 10,
         time: null,
         keyWord: '',
-        taskStatus: ''
+        taskStatus: '',
+        startTime: '',
+        endTime: ''
       },
       //新增弹窗
       open: false,
@@ -348,8 +358,8 @@ export default {
       this.loading = true
       const params = {
         keyWord: this.queryParams.keyWord,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum
       }
diff --git a/src/views/claimAndRefund/receive/receiveApply.vue b/src/views/claimAndRefund/receive/receiveApply.vue
index 26d71230..2859a7c5 100644
--- a/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/src/views/claimAndRefund/receive/receiveApply.vue
@@ -55,18 +55,24 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-
-            <el-form-item label="申请日期">
+            <el-form-item label="申请日期" prop="startTime">
                 <el-date-picker
-                    v-model="queryParams.time"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    style="width: 240px"
-                >
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item>
                 <el-button
@@ -360,6 +366,8 @@ export default {
 
                 types: 1, // 1申请列表 2审核列表
                 keyWord: '',
+                startTime: null,
+                endTime: null,
             },
             unitList: [], //来往单位集合
             proList: [], //工程集合
@@ -379,8 +387,8 @@ export default {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
                 keyWord: this.queryParams.keyWord,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 types: this.queryParams.types,
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
diff --git a/src/views/claimAndRefund/receive/receiveManage.vue b/src/views/claimAndRefund/receive/receiveManage.vue
index d622bc60..262a098e 100644
--- a/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/src/views/claimAndRefund/receive/receiveManage.vue
@@ -55,17 +55,24 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="申请日期" prop="time">
+            <el-form-item label="申请日期" prop="startTime">
                 <el-date-picker
-                    v-model="queryParams.time"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    style="width: 240px"
-                >
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item>
                 <el-button
@@ -489,6 +496,8 @@ export default {
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
+                startTime: '',
+                endTime: '',
             },
             user: {},
             unitList: [],
@@ -560,8 +569,8 @@ export default {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
                 keyWord: this.queryParams.keyword,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 types: this.queryParams.types,
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
diff --git a/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index a99b0f4b..89254e45 100644
--- a/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -8,16 +8,24 @@
             v-show="showSearch"
             label-width="80px"
         >
-            <el-form-item label="申请日期">
+            <el-form-item label="申请日期" prop="startTime">
                 <el-date-picker
-                    v-model="queryParams.time"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                >
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item label="领料单位">
                 <el-select
@@ -379,6 +387,8 @@ export default {
                 proId: null, //工程id
 
                 types: 1, // 1申请列表 2审核列表
+                startTime: null,
+                endTime: null,
             },
             unitList: [], //来往单位集合
             proList: [], //工程集合
@@ -398,8 +408,8 @@ export default {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
                 keyWord: this.queryParams.keyWord,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 types: this.queryParams.types,
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
diff --git a/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 406da9ad..9320e5e9 100644
--- a/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -8,15 +8,24 @@
             v-show="showSearch"
             label-width="80px"
         >
-            <el-form-item label="申请日期" prop="time">
+            <el-form-item label="申请日期" prop="startTime">
                 <el-date-picker
-                    v-model="queryParams.time"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                ></el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item label="领料单位" prop="unitId">
                 <el-select
@@ -508,6 +517,8 @@ export default {
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
+                startTime: '',
+                endTime: '',
             },
             user: {},
             unitList: [],
@@ -579,8 +590,8 @@ export default {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
                 keyWord: this.queryParams.keyword,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 types: this.queryParams.types,
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
diff --git a/src/views/material/cost/costDecreaseList.vue b/src/views/material/cost/costDecreaseList.vue
index d6b7aa83..ac030235 100644
--- a/src/views/material/cost/costDecreaseList.vue
+++ b/src/views/material/cost/costDecreaseList.vue
@@ -24,17 +24,24 @@
             <el-form-item prop="agreementCode">
                 <el-input v-model="queryParams.agreementCode" placeholder="请输入协议号" clearable disabled/>
             </el-form-item>
-
-            <el-form-item label="选择时间范围" prop="time" label-width="120px">
-              <el-date-picker
-                    v-model="queryParams.time"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    type="daterange"
+            <el-form-item label="选择时间范围" prop="startTime" label-width="120px">
+                <el-date-picker
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    style="width: 350px"
-                ></el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
 
       <div>
@@ -370,6 +377,8 @@ export default {
         agreementId: '',
         agreementCode: '',
         time:null,
+        startTime: null,
+        endTime: null,
       },
 
       // 多选框选中数据
@@ -530,8 +539,8 @@ export default {
         deviceName: this.queryParams.deviceName,
         typeName: this.queryParams.typeName,
         agreementId: this.queryParams.agreementId,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
       }
 
         getReliefList(params).then((response) => {
diff --git a/src/views/material/lease/apply/component/outbound.vue b/src/views/material/lease/apply/component/outbound.vue
index 81721472..faef6d12 100644
--- a/src/views/material/lease/apply/component/outbound.vue
+++ b/src/views/material/lease/apply/component/outbound.vue
@@ -333,18 +333,23 @@
             >
                 <el-form inline>
                     <!-- 搜索表单 -->
-                    <el-form-item label="时间">
+                    <el-form-item label="时间" prop="startTime">
                         <el-date-picker
-                            clearable
-                            type="daterange"
-                            v-model="outTime"
-                            style="width: 240px"
-                            range-separator="至"
+                            v-model="leaseOutDetailParams.startTime"
                             value-format="yyyy-MM-dd"
-                            end-placeholder="结束日期"
-                            start-placeholder="开始日期"
-                            placeholder="请选择出库日期"
-                            @change="onOutTimeChange"
+                            type="date"
+                            placeholder="开始日期"
+                            style="width: 130px"
+                        />
+                    </el-form-item>
+                    <el-form-item>-</el-form-item>
+                    <el-form-item prop="endTime">
+                        <el-date-picker
+                            v-model="leaseOutDetailParams.endTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="结束日期"
+                            style="width: 130px"
                         />
                     </el-form-item>
                     <el-form-item>
diff --git a/src/views/material/lease/apply/component/picking.vue b/src/views/material/lease/apply/component/picking.vue
index 81721472..faef6d12 100644
--- a/src/views/material/lease/apply/component/picking.vue
+++ b/src/views/material/lease/apply/component/picking.vue
@@ -333,18 +333,23 @@
             >
                 <el-form inline>
                     <!-- 搜索表单 -->
-                    <el-form-item label="时间">
+                    <el-form-item label="时间" prop="startTime">
                         <el-date-picker
-                            clearable
-                            type="daterange"
-                            v-model="outTime"
-                            style="width: 240px"
-                            range-separator="至"
+                            v-model="leaseOutDetailParams.startTime"
                             value-format="yyyy-MM-dd"
-                            end-placeholder="结束日期"
-                            start-placeholder="开始日期"
-                            placeholder="请选择出库日期"
-                            @change="onOutTimeChange"
+                            type="date"
+                            placeholder="开始日期"
+                            style="width: 130px"
+                        />
+                    </el-form-item>
+                    <el-form-item>-</el-form-item>
+                    <el-form-item prop="endTime">
+                        <el-date-picker
+                            v-model="leaseOutDetailParams.endTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="结束日期"
+                            style="width: 130px"
                         />
                     </el-form-item>
                     <el-form-item>
diff --git a/src/views/material/query/backQuery.vue b/src/views/material/query/backQuery.vue
index 28ef8642..0c7ea8a5 100644
--- a/src/views/material/query/backQuery.vue
+++ b/src/views/material/query/backQuery.vue
@@ -1,16 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item prop="time">
+      <el-form-item prop="startTime">
         <el-date-picker
-          v-model="queryParams.time"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          type="daterange"
+          v-model="queryParams.startTime"
           value-format="yyyy-MM-dd"
-          style="width: 240px"
-        ></el-date-picker>
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
       </el-form-item>
       <el-form-item prop="keyWord">
         <el-input
@@ -223,13 +231,13 @@ export default {
     // 获取列表
     async getList() {
       this.loading = true
-      if (this.queryParams.time && this.queryParams.time.length > 0) {
-        this.queryParams.startTime = this.queryParams.time[0]
-        this.queryParams.endTime = this.queryParams.time[1]
-      }else{
-        this.queryParams.startTime=undefined
-        this.queryParams.endTime=undefined
-      }
+      // if (this.queryParams.time && this.queryParams.time.length > 0) {
+      //   this.queryParams.startTime = this.queryParams.time[0]
+      //   this.queryParams.endTime = this.queryParams.time[1]
+      // }else{
+      //   this.queryParams.startTime=undefined
+      //   this.queryParams.endTime=undefined
+      // }
       const res = await getBackQueryList(this.queryParams)
       this.tableList = res.data.rows
       this.total = res.data.total
diff --git a/src/views/material/query/repairAuditQuery.vue b/src/views/material/query/repairAuditQuery.vue
index 76b662dc..5d86d3f1 100644
--- a/src/views/material/query/repairAuditQuery.vue
+++ b/src/views/material/query/repairAuditQuery.vue
@@ -1,16 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item prop="time">
+      <el-form-item prop="startTime">
         <el-date-picker
-          v-model="queryParams.time"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          type="daterange"
+          v-model="queryParams.startTime"
           value-format="yyyy-MM-dd"
-          style="width: 240px"
-        ></el-date-picker>
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
       </el-form-item>
       <el-form-item prop="keyWord">
         <el-input
@@ -206,13 +214,13 @@ export default {
     // 获取列表
     async getList() {
       this.loading = true
-      if (this.queryParams.time && this.queryParams.time.length > 0) {
-        this.queryParams.startTime = this.queryParams.time[0]
-        this.queryParams.endTime = this.queryParams.time[1]
-      }else{
-        this.queryParams.startTime=undefined
-        this.queryParams.endTime=undefined
-      }
+      // if (this.queryParams.time && this.queryParams.time.length > 0) {
+      //   this.queryParams.startTime = this.queryParams.time[0]
+      //   this.queryParams.endTime = this.queryParams.time[1]
+      // }else{
+      //   this.queryParams.startTime=undefined
+      //   this.queryParams.endTime=undefined
+      // }
       const res = await getRepairAuditQueryList(this.queryParams)
       this.tableList = res.data.rows
       this.total = res.data.total
diff --git a/src/views/material/query/repairQuery.vue b/src/views/material/query/repairQuery.vue
index 29e1cc6e..57a7847c 100644
--- a/src/views/material/query/repairQuery.vue
+++ b/src/views/material/query/repairQuery.vue
@@ -1,16 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item prop="time">
+      <el-form-item prop="startTime">
         <el-date-picker
-          v-model="queryParams.time"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          type="daterange"
+          v-model="queryParams.startTime"
           value-format="yyyy-MM-dd"
-          style="width: 240px"
-        ></el-date-picker>
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
       </el-form-item>
       <el-form-item prop="keyWord">
         <el-input
@@ -241,13 +249,13 @@ export default {
     // 获取列表
     async getList() {
       this.loading = true
-      if (this.queryParams.time && this.queryParams.time.length > 0) {
-        this.queryParams.startTime = this.queryParams.time[0]
-        this.queryParams.endTime = this.queryParams.time[1]
-      }else{
-        this.queryParams.startTime=undefined
-        this.queryParams.endTime=undefined
-      }
+      // if (this.queryParams.time && this.queryParams.time.length > 0) {
+      //   this.queryParams.startTime = this.queryParams.time[0]
+      //   this.queryParams.endTime = this.queryParams.time[1]
+      // }else{
+      //   this.queryParams.startTime=undefined
+      //   this.queryParams.endTime=undefined
+      // }
       const res = await getRepairQueryList(this.queryParams)
       this.tableList = res.data.rows
       this.total = res.data.total
diff --git a/src/views/material/repair/repairTest/index.vue b/src/views/material/repair/repairTest/index.vue
index b1468a0d..d6ea3a01 100644
--- a/src/views/material/repair/repairTest/index.vue
+++ b/src/views/material/repair/repairTest/index.vue
@@ -1,17 +1,25 @@
 <template>
     <div class="app-container" id="">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item prop="time">
-            <el-date-picker
-                v-model="queryParams.time"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                style="width: 240px"
-            ></el-date-picker>
-        </el-form-item>
+        <el-form-item prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
+      </el-form-item>
         <el-form-item prop="keyWord">
           <el-input
             v-model="queryParams.keyWord"
@@ -156,7 +164,9 @@ export default {
                 proId: null,
                 keyWord: null,
                 typeName: null, //物资名称
-                statusName: null //状态
+                statusName: null, //状态
+                startTime: null,
+                endTime: null,
             },
         }
     },
@@ -238,8 +248,8 @@ export default {
                   keyWord: this.queryParams.keyWord,
                   typeName: this.queryParams.typeName,
                   statusName: this.queryParams.statusName,
-                  startTime: this.queryParams.time && this.queryParams.time[0],
-                  endTime: this.queryParams.time && this.queryParams.time[1],
+                  startTime: this.queryParams.startTime,
+                  endTime: this.queryParams.endTime,
                   pageSize: this.queryParams.pageSize,
                   pageNum: this.queryParams.pageNum
               }
@@ -290,8 +300,8 @@ export default {
             keyWord: this.queryParams.keyWord,
             typeName: this.queryParams.typeName,
             statusName: this.queryParams.statusName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/repair/scrapLedger/detail.vue b/src/views/material/repair/scrapLedger/detail.vue
index 27b20408..646355cc 100644
--- a/src/views/material/repair/scrapLedger/detail.vue
+++ b/src/views/material/repair/scrapLedger/detail.vue
@@ -8,16 +8,24 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item prop="time">
-          <el-date-picker
-              v-model="queryParams.time"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              style="width: 240px"
-          ></el-date-picker>
+      <el-form-item prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
+        />
       </el-form-item>
       <el-form-item  prop="keyWord">
           <el-input
@@ -134,6 +142,8 @@ export default {
         keyWord: null,
         pageNum: 1,
         pageSize: 10,
+        startTime: null,
+        endTime: null,
       },
     };
   },
@@ -162,8 +172,8 @@ export default {
       const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum
       }
@@ -204,8 +214,8 @@ export default {
         const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
       }
       this.download(
         "/material/scrap_apply_details/exportScrapDetailsList",
diff --git a/src/views/material/report/backReport.vue b/src/views/material/report/backReport.vue
index 2e0781ab..29837dc2 100644
--- a/src/views/material/report/backReport.vue
+++ b/src/views/material/report/backReport.vue
@@ -1,15 +1,24 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item  prop="dateRange">
+            <el-form-item prop="startTime">
                 <el-date-picker
-                    v-model="dateRange"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item  prop="keyWord">
                 <el-input
@@ -140,6 +149,8 @@
             pageNum: 1,
             pageSize: 10,
             keyWord:undefined,
+            startTime: '',
+            endTime: '',
         },
         // 总条数
         total: 0,
@@ -196,8 +207,8 @@
             this.loading = true
             const params = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
@@ -210,8 +221,8 @@
             this.total = res.data.total;
             let param = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
             }
             const response = await getBackInputListNoPageApi(param)
                 let obj = {
@@ -250,7 +261,7 @@
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/bm_report/exportBackInputList",
-                {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
+                { ...this.queryParams },
                 `退料报表_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue
index e22e8696..c874d2ad 100644
--- a/src/views/material/report/goodsEntryReport.vue
+++ b/src/views/material/report/goodsEntryReport.vue
@@ -1,15 +1,24 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item  prop="dateRange">
+            <el-form-item prop="startTime">
                 <el-date-picker
-                    v-model="dateRange"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item  prop="status">
                  <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
@@ -340,6 +349,8 @@
             pageSize: 10,
             status: '',
             keyWord:undefined,
+            startTime: '',
+            endTime: '',
         },
         // 总条数
         total: 0,
@@ -417,8 +428,8 @@
             this.loading = true
             const params = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 status: this.queryParams.status,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
@@ -432,8 +443,8 @@
             this.total = res.data.total;
             let param = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 status: this.queryParams.status,
             }
             const response = await getPurChaseReportListNoPageApi(param)
@@ -479,7 +490,7 @@
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/bm_report/exportPurChaseReportList",
-                {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
+                { ...this.queryParams },
                 `新购入库报表_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/material/report/repairReport.vue b/src/views/material/report/repairReport.vue
index b7c49893..68873935 100644
--- a/src/views/material/report/repairReport.vue
+++ b/src/views/material/report/repairReport.vue
@@ -1,15 +1,24 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item  prop="dateRange">
+            <el-form-item prop="startTime">
                 <el-date-picker
-                    v-model="dateRange"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item  prop="keyWord">
                 <el-input
@@ -144,6 +153,8 @@
             pageNum: 1,
             pageSize: 10,
             keyWord:undefined,
+            startTime: '',
+            endTime: '',
         },
         // 总条数
         total: 0,
@@ -200,8 +211,8 @@
             this.loading = true
             const params = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
@@ -214,8 +225,8 @@
             this.total = res.data.total;
             let param = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
             }
             const response = await getRepairListNoPageApi(param)
                 let obj = {
@@ -257,7 +268,7 @@
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/bm_report/exportRepairList",
-                {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
+                { ...this.queryParams },
                 `维修报表_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/material/report/scrapReport.vue b/src/views/material/report/scrapReport.vue
index 79196001..eb52ef83 100644
--- a/src/views/material/report/scrapReport.vue
+++ b/src/views/material/report/scrapReport.vue
@@ -9,15 +9,24 @@
             label-width="68px"
             @submit.native.prevent
         >
-            <el-form-item prop="dateRange">
+            <el-form-item prop="startTime">
                 <el-date-picker
-                    v-model="dateRange"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                ></el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item prop="keyWord">
                 <el-input
@@ -160,7 +169,9 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
-                keyWord: undefined
+                keyWord: undefined,
+                startTime: '',
+                endTime: '',
             },
             // 总条数
             total: 0,
@@ -217,8 +228,8 @@ export default {
             this.loading = true
             const params = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
@@ -231,8 +242,8 @@ export default {
             this.total = res.data.total
             let param = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1]
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
             }
             const response = await getScrapListNoPageApi(param)
             let obj = {
@@ -271,9 +282,7 @@ export default {
             this.download(
                 '/material/bm_report/exportScrapList',
                 {
-                    keyWord: this.queryParams.keyWord,
-                    startTime: this.dateRange && this.dateRange[0],
-                    endTime: this.dateRange && this.dateRange[1]
+                    ...this.queryParams,
                 },
                 `报废报表_${currentTime}.xlsx`
             )
diff --git a/src/views/material/report/testedInBoundReport.vue b/src/views/material/report/testedInBoundReport.vue
index 8a8bc446..46816d31 100644
--- a/src/views/material/report/testedInBoundReport.vue
+++ b/src/views/material/report/testedInBoundReport.vue
@@ -1,15 +1,24 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item  prop="dateRange">
+            <el-form-item prop="startTime">
                 <el-date-picker
-                    v-model="dateRange"
-                    type="daterange"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                </el-date-picker>
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
+                />
             </el-form-item>
             <el-form-item  prop="keyWord">
                 <el-input
@@ -140,6 +149,8 @@
             pageNum: 1,
             pageSize: 10,
             keyWord:undefined,
+            startTime: '',
+            endTime: '',
         },
         // 总条数
         total: 0,
@@ -196,8 +207,8 @@
             this.loading = true
             const params = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
@@ -210,8 +221,8 @@
             this.total = res.data.total;
             let param = {
                 keyWord: this.queryParams.keyWord,
-                startTime: this.dateRange && this.dateRange[0],
-                endTime: this.dateRange && this.dateRange[1],
+                startTime: this.queryParams.startTime,
+                endTime: this.queryParams.endTime,
             }
             const response = await getRepairInputListNoPageApi(param)
                 let obj = {
@@ -252,7 +263,7 @@
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/bm_report/exportRepairInputList",
-                {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
+                { ...this.queryParams },
                 `修饰入库报表_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/materialsStation/equipment/equipmentTracking/index.vue b/src/views/materialsStation/equipment/equipmentTracking/index.vue
index 84c94ee0..62ac618d 100644
--- a/src/views/materialsStation/equipment/equipmentTracking/index.vue
+++ b/src/views/materialsStation/equipment/equipmentTracking/index.vue
@@ -48,44 +48,65 @@
       </el-form-item>
 
       <!-- 日期范围 -->
-      <el-form-item label="本次检验时间" prop="thisCheckTimeRange">
+      <el-form-item label="本次检验时间" prop="checkStartTime">
         <el-date-picker
-          v-model="queryParams.thisCheckTimeRange"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          clearable
+          v-model="queryParams.checkStartTime"
           value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="checkEndTime">
+        <el-date-picker
+          v-model="queryParams.checkEndTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
         />
       </el-form-item>
 
       <!-- 日期范围 -->
-      <el-form-item label="下次检验时间" prop="nextCheckTimeRange">
+      <el-form-item label="下次检验时间" prop="nextStartTime">
         <el-date-picker
-          v-model="queryParams.nextCheckTimeRange"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          clearable
+          v-model="queryParams.nextStartTime"
           value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="nextEndTime">
+        <el-date-picker
+          v-model="queryParams.nextEndTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
         />
       </el-form-item>
 
       <!-- 日期范围 -->
-      <el-form-item label="进站时间" prop="inputTimeRange">
+      <el-form-item label="进站时间" prop="startTime">
         <el-date-picker
-          v-model="queryParams.inputTimeRange"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          clearable
+          v-model="queryParams.startTime"
           value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
+          type="date"
+          placeholder="开始日期"
+          style="width: 130px"
+        />
+      </el-form-item>
+      <el-form-item>-</el-form-item>
+      <el-form-item prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="结束日期"
+          style="width: 130px"
         />
       </el-form-item>
 
@@ -295,12 +316,12 @@ export default {
     async getList() {
       console.log('列表-查询', this.queryParams)
       const loading = this.$loading({ text: '加载中...' })
-      this.queryParams.startTime = this.queryParams.inputTimeRange ? this.queryParams.inputTimeRange[0] : ''
-      this.queryParams.endTime = this.queryParams.inputTimeRange ? this.queryParams.inputTimeRange[1] : ''
-      this.queryParams.checkStartTime = this.queryParams.thisCheckTimeRange? this.queryParams.thisCheckTimeRange[0] : ''
-      this.queryParams.checkEndTime = this.queryParams.thisCheckTimeRange? this.queryParams.thisCheckTimeRange[1] : ''
-      this.queryParams.nextStartTime = this.queryParams.nextCheckTimeRange? this.queryParams.nextCheckTimeRange[0] : ''
-      this.queryParams.nextEndTime = this.queryParams.nextCheckTimeRange? this.queryParams.nextCheckTimeRange[1] : ''
+      // this.queryParams.startTime = this.queryParams.inputTimeRange ? this.queryParams.inputTimeRange[0] : ''
+      // this.queryParams.endTime = this.queryParams.inputTimeRange ? this.queryParams.inputTimeRange[1] : ''
+      // this.queryParams.checkStartTime = this.queryParams.thisCheckTimeRange? this.queryParams.thisCheckTimeRange[0] : ''
+      // this.queryParams.checkEndTime = this.queryParams.thisCheckTimeRange? this.queryParams.thisCheckTimeRange[1] : ''
+      // this.queryParams.nextStartTime = this.queryParams.nextCheckTimeRange? this.queryParams.nextCheckTimeRange[0] : ''
+      // this.queryParams.nextEndTime = this.queryParams.nextCheckTimeRange? this.queryParams.nextCheckTimeRange[1] : ''
       try {
         const params = { ...this.queryParams }
         const res = await getMachineInfoApi(params)
diff --git a/src/views/repair-testing/material-return/index.vue b/src/views/repair-testing/material-return/index.vue
index ef890c2d..5e50e957 100644
--- a/src/views/repair-testing/material-return/index.vue
+++ b/src/views/repair-testing/material-return/index.vue
@@ -5,15 +5,23 @@
         <el-form size="small" :model="queryParams" ref="queryFormRef">
             <el-row :gutter="20">
                 <el-col :span="6">
-                    <el-form-item>
+                    <el-form-item prop="startTime">
                         <el-date-picker
-                            v-model="time"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
+                            v-model="queryParams.startTime"
                             value-format="yyyy-MM-dd"
-                            style="width: 100%"
+                            type="date"
+                            placeholder="开始日期"
+                            style="width: 130px"
+                        />
+                    </el-form-item>
+                    <el-form-item>-</el-form-item>
+                    <el-form-item prop="endTime">
+                        <el-date-picker
+                            v-model="queryParams.endTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="结束日期"
+                            style="width: 130px"
                         />
                     </el-form-item>
                 </el-col>
@@ -145,7 +153,9 @@ export default {
                 typeName: '',
                 typeModelName: '',
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                startTime: '',
+                endTime: ''
             },
             tableColumn: [
                 { label: '协议号', prop: 'agreementCode' , showTooltip: true},
@@ -190,8 +200,8 @@ export default {
             try {
                 const queryParams = {
                     ...this.queryParams,
-                    startTime: this.time && this.time.length > 0 ? this.time[0] : '',
-                    endTime: this.time && this.time.length > 0 ? this.time[1] : ''
+                    // startTime: this.time && this.time.length > 0 ? this.time[0] : '',
+                    // endTime: this.time && this.time.length > 0 ? this.time[1] : ''
                 }
 
                 const res = await getTableListApi(queryParams)
diff --git a/src/views/repair-testing/one-machine/index.vue b/src/views/repair-testing/one-machine/index.vue
index 457b1f91..df9fc0f5 100644
--- a/src/views/repair-testing/one-machine/index.vue
+++ b/src/views/repair-testing/one-machine/index.vue
@@ -5,15 +5,23 @@
         <el-form size="small" :model="queryParams" ref="queryFormRef">
             <el-row :gutter="20">
                 <el-col :span="6">
-                    <el-form-item>
+                    <el-form-item prop="startTime">
                         <el-date-picker
-                            v-model="time"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
+                            v-model="queryParams.startTime"
                             value-format="yyyy-MM-dd"
-                            style="width: 100%"
+                            type="date"
+                            placeholder="开始日期"
+                            style="width: 130px"
+                        />
+                    </el-form-item>
+                    <el-form-item>-</el-form-item>
+                    <el-form-item prop="endTime">
+                        <el-date-picker
+                            v-model="queryParams.endTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="结束日期"
+                            style="width: 130px"
                         />
                     </el-form-item>
                 </el-col>
@@ -137,7 +145,9 @@ export default {
                 typeName: '',
                 typeModelName: '',
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                startTime: null,
+                endTime: null
             },
             tableColumn: [
                 { label: '协议号', prop: 'agreementCode', showTooltip: true },
@@ -171,8 +181,8 @@ export default {
         async getTableList() {
             const queryParams = {
                 ...this.queryParams,
-                startTime: this.time && this.time.length > 0 ? this.time[0] : '',
-                endTime: this.time && this.time.length > 0 ? this.time[1] : ''
+                // startTime: this.time && this.time.length > 0 ? this.time[0] : '',
+                // endTime: this.time && this.time.length > 0 ? this.time[1] : ''
             }
 
             const res = await getTableListApi(queryParams)
diff --git a/src/views/repair-testing/repair-accessory/index.vue b/src/views/repair-testing/repair-accessory/index.vue
index 5028e9bc..c2de0d21 100644
--- a/src/views/repair-testing/repair-accessory/index.vue
+++ b/src/views/repair-testing/repair-accessory/index.vue
@@ -5,15 +5,23 @@
         <el-form size="small" :model="queryParams" ref="queryFormRef">
             <el-row :gutter="20">
                 <el-col :span="6">
-                    <el-form-item>
+                    <el-form-item label="申请日期" prop="startTime">
                         <el-date-picker
-                            v-model="time"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
+                            v-model="queryParams.startTime"
                             value-format="yyyy-MM-dd"
-                            style="width: 100%"
+                            type="date"
+                            placeholder="开始日期"
+                            style="width: 130px"
+                        />
+                    </el-form-item>
+                    <el-form-item>-</el-form-item>
+                    <el-form-item prop="endTime">
+                        <el-date-picker
+                            v-model="queryParams.endTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="结束日期"
+                            style="width: 130px"
                         />
                     </el-form-item>
                 </el-col>
@@ -146,7 +154,9 @@ export default {
                 typeName: '',
                 typeModelName: '',
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                startTime: '',
+                endTime: ''
             },
             tableColumn: [
                 { label: '维修单号', prop: 'repairCode' , showTooltip: true},
@@ -187,8 +197,8 @@ export default {
         async getTableList() {
             const queryParams = {
                 ...this.queryParams,
-                startTime: this.time && this.time.length > 0 ? this.time[0] : '',
-                endTime: this.time && this.time.length > 0 ? this.time[1] : ''
+                // startTime: this.time && this.time.length > 0 ? this.time[0] : '',
+                // endTime: this.time && this.time.length > 0 ? this.time[1] : ''
             }
 
             const res = await getTableListApi(queryParams)
diff --git a/src/views/warning-analysis/engineering-in-use/index.vue b/src/views/warning-analysis/engineering-in-use/index.vue
index 37f49791..d902ae46 100644
--- a/src/views/warning-analysis/engineering-in-use/index.vue
+++ b/src/views/warning-analysis/engineering-in-use/index.vue
@@ -2,17 +2,23 @@
     <!-- 工程在用检修预警 -->
     <div class="app-container">
         <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
-            <el-form-item label="时间范围" prop="timeRange">
+            <el-form-item label="时间范围" prop="startTime">
                 <el-date-picker
-                    clearable
-                    type="daterange"
-                    format="yyyy-MM-dd"
-                    style="width: 240px"
-                    range-separator="至"
+                    v-model="queryParams.startTime"
                     value-format="yyyy-MM-dd"
-                    end-placeholder="结束日期"
-                    start-placeholder="开始日期"
-                    v-model="queryParams.timeRange"
+                    type="date"
+                    placeholder="开始日期"
+                    style="width: 130px"
+                />
+            </el-form-item>
+            <el-form-item>-</el-form-item>
+            <el-form-item prop="endTime">
+                <el-date-picker
+                    v-model="queryParams.endTime"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="结束日期"
+                    style="width: 130px"
                 />
             </el-form-item>
             <el-form-item label="关键字" prop="keyWord">
@@ -121,7 +127,9 @@ export default {
                 keyWord: '', // 关键字
                 thirdTypeId: '',
                 typeId: '',
-                timeRange: [] // 日期范围
+                timeRange: [], // 日期范围
+                startTime: '',
+                endTime: ''
             },
             typeIds: [],
 
@@ -183,8 +191,8 @@ export default {
             try {
                 const params = {
                     ...this.queryParams,
-                    startTime: this.queryParams.timeRange[0] || '',
-                    endTime: this.queryParams.timeRange[1] || ''
+                    // startTime: this.queryParams.timeRange[0] || '',
+                    // endTime: this.queryParams.timeRange[1] || ''
                 }
                 const res = await getUseMaintenanceWarningApi(params)
                 console.log('🚀 ~ 获取列表 ~ res:', res)

From 89b88e07e38ace4a32624ff2c9be4cb0e94f9f78 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 11 Nov 2025 15:46:57 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/lease/apply/component/homeApply.vue    | 4 ++--
 src/views/material/lease/outBound/index.vue               | 8 ++++----
 src/views/material/repair/partUsing/index.vue             | 4 ++--
 src/views/material/repair/projectRepairing/index.vue      | 4 ++--
 src/views/material/repair/testRecord/index.vue            | 4 ++--
 src/views/material/stquery/deviceInBound.vue              | 4 ++--
 src/views/material/stquery/deviceOutBound.vue             | 4 ++--
 src/views/material/stquery/deviceUsingHistory.vue         | 4 ++--
 src/views/material/stquery/deviceUsingRecord.vue          | 4 ++--
 .../toolsLease/apply/component/homeApply.vue              | 4 ++--
 .../toolsLease/outBound/component/homeApply.vue           | 4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 21b4ae05..9f75d62b 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -1172,8 +1172,8 @@ export default {
       const params = {
         keyWord: this.queryParams.keyWord,
         taskStatus: this.queryParams.taskStatus,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
         statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4]
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 65c1a68a..a61bf7f7 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -1095,8 +1095,8 @@ export default {
         const currentTime = formatTime(new Date())
         const params = {
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum,
           hasSign: 1
@@ -1128,8 +1128,8 @@ export default {
         const currentTime = formatTime(new Date())
         const params = {
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum,
           hasSign: 1
diff --git a/src/views/material/repair/partUsing/index.vue b/src/views/material/repair/partUsing/index.vue
index 342e0f64..ed5ed150 100644
--- a/src/views/material/repair/partUsing/index.vue
+++ b/src/views/material/repair/partUsing/index.vue
@@ -316,8 +316,8 @@ export default {
             keyWord: this.queryParams.keyWord,
             typeName: this.queryParams.typeName,
             statusName: this.queryParams.statusName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/repair/projectRepairing/index.vue b/src/views/material/repair/projectRepairing/index.vue
index 35858c2f..4c58585b 100644
--- a/src/views/material/repair/projectRepairing/index.vue
+++ b/src/views/material/repair/projectRepairing/index.vue
@@ -213,8 +213,8 @@ export default {
         const params = {
             keyWord: this.queryParams.keyWord,
             statusName: this.queryParams.statusName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/repair/testRecord/index.vue b/src/views/material/repair/testRecord/index.vue
index 57988372..e74f5306 100644
--- a/src/views/material/repair/testRecord/index.vue
+++ b/src/views/material/repair/testRecord/index.vue
@@ -554,8 +554,8 @@ export default {
             keyWord: this.queryParams.keyWord,
             typeName: this.queryParams.typeName,
             statusName: this.queryParams.statusName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/stquery/deviceInBound.vue b/src/views/material/stquery/deviceInBound.vue
index e080ff4a..8e007e95 100644
--- a/src/views/material/stquery/deviceInBound.vue
+++ b/src/views/material/stquery/deviceInBound.vue
@@ -237,8 +237,8 @@ export default {
             inputType: this.queryParams.inputType,
             typeName: this.queryParams.typeName,
             typeModelName: this.queryParams.typeModelName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/stquery/deviceOutBound.vue b/src/views/material/stquery/deviceOutBound.vue
index fdcc0d09..efd3eac7 100644
--- a/src/views/material/stquery/deviceOutBound.vue
+++ b/src/views/material/stquery/deviceOutBound.vue
@@ -391,8 +391,8 @@ export default {
             typeName: this.queryParams.typeName,
             typeModelName: this.queryParams.typeModelName,
             firstTypeIdList: this.queryParams.firstTypeIdList,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/stquery/deviceUsingHistory.vue b/src/views/material/stquery/deviceUsingHistory.vue
index 59673ed3..408b593c 100644
--- a/src/views/material/stquery/deviceUsingHistory.vue
+++ b/src/views/material/stquery/deviceUsingHistory.vue
@@ -338,8 +338,8 @@ export default {
             keyWord: this.queryParams.keyWord,
             typeName: this.queryParams.typeName,
             statusName: this.queryParams.statusName,
-            startTime: this.queryParams.time && this.queryParams.time[0],
-            endTime: this.queryParams.time && this.queryParams.time[1],
+            startTime: this.queryParams.startTime,
+            endTime: this.queryParams.endTime,
             pageSize: this.queryParams.pageSize,
             pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue
index f0b592d8..07151079 100644
--- a/src/views/material/stquery/deviceUsingRecord.vue
+++ b/src/views/material/stquery/deviceUsingRecord.vue
@@ -383,8 +383,8 @@ export default {
           keyWord: this.queryParams.keyWord,
           typeName: this.queryParams.typeName,
           isSlt: this.queryParams.isSlt,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum
         }
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
index 81837f07..03a4bb5d 100644
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@@ -806,8 +806,8 @@ export default {
       const params = {
         keyWord: this.queryParams.keyWord,
         taskStatus: this.queryParams.taskStatus,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
         statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4]
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
index 4564eb13..c7f0ee3b 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@@ -800,8 +800,8 @@ export default {
       const params = {
         keyWord: this.queryParams.keyWord,
         taskStatus: this.queryParams.taskStatus,
-        startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1],
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
         statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4]

From 1903f17edf4d2a6e11b128364238b73b2f6ca364 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 11 Nov 2025 15:52:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=96=B0=E8=B4=AD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/part/partAccept/index.vue           | 2 +-
 src/views/material/part/partAcceptTwo/index.vue        | 2 +-
 src/views/material/part/partArrived/component/home.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/material/part/partAccept/index.vue b/src/views/material/part/partAccept/index.vue
index 9d63d8bd..bd8c260b 100644
--- a/src/views/material/part/partAccept/index.vue
+++ b/src/views/material/part/partAccept/index.vue
@@ -442,7 +442,7 @@ import { getToken } from '@/utils/auth'
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/part_arrived/export",
-                { ...this.queryParams},
+                { ...this.queryParams, taskStage: 2},
                 `配件新购到货_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/material/part/partAcceptTwo/index.vue b/src/views/material/part/partAcceptTwo/index.vue
index 00b5407f..4f7a1194 100644
--- a/src/views/material/part/partAcceptTwo/index.vue
+++ b/src/views/material/part/partAcceptTwo/index.vue
@@ -455,7 +455,7 @@ import { getToken } from '@/utils/auth'
           const currentTime = formatTime(new Date());
             this.download(
                 "/material/part_arrived/export",
-                { ...this.queryParams},
+                { ...this.queryParams, taskStage: 2},
                 `配件新购到货_${currentTime}.xlsx`
             );
         },
diff --git a/src/views/material/part/partArrived/component/home.vue b/src/views/material/part/partArrived/component/home.vue
index a736c41b..b4cea269 100644
--- a/src/views/material/part/partArrived/component/home.vue
+++ b/src/views/material/part/partArrived/component/home.vue
@@ -675,7 +675,7 @@ export default {
       const currentTime = formatTime(new Date());
       this.download(
         "/material/part_arrived/export",
-        { ...this.queryParams},
+        { ...this.queryParams, taskStage: 1},
         `配件新购到货__${currentTime}.xlsx`
       );
     },

From 44736e59814519bfc3f740f9262abb1d2a86f41d Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 11 Nov 2025 17:34:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=87=BA=E9=97=A8=E8=AF=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/exitPermit/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/business/exitPermit/index.vue b/src/views/business/exitPermit/index.vue
index 22dc1e9d..45679422 100644
--- a/src/views/business/exitPermit/index.vue
+++ b/src/views/business/exitPermit/index.vue
@@ -52,7 +52,7 @@
       </el-table-column>
       <el-table-column label="物资" align="center" prop="material" show-overflow-tooltip />
       <el-table-column label="车牌号" align="center" width="300" prop="carCode" show-overflow-tooltip />
-     <el-table-column label="单号" align="center" width="200" prop="code" show-overflow-tooltip />
+     <el-table-column label="领料单号" align="center" width="200" prop="code" show-overflow-tooltip />
       <el-table-column label="日期" align="center" width="200" prop="addDate" show-overflow-tooltip />
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
       <el-table-column label="操作" align="center" width="280">
@@ -295,7 +295,7 @@ export default {
     handleAdd() {
       this.resetForm();
       this.open = true;
-      this.form.addDate = new Date().toLocaleDateString('zh-CN')
+      this.form.addDate = new Date().toISOString().slice(0, 10)
       this.$nextTick(() => {
         this.$refs.form.clearValidate()
       })
@@ -304,12 +304,13 @@ export default {
 
     // 重置表单
     resetForm() {
-      this.form = {
-        linkMan: '',
-        proName: '',
-        carCode: '',
-        reserveDate: ''
-      };
+      // this.form = {
+      //   linkMan: '',
+      //   proName: '',
+      //   carCode: '',
+      //   reserveDate: '',
+      //   addDate: ''
+      // };
       if (this.$refs.form) {
         this.$refs.form.resetFields();
       }

From 70052e6716ceed63fd41c51d7b33479692690ce4 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 12 Nov 2025 10:45:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolsBack/back/outRecord.vue              | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/materialsStation/toolsBack/back/outRecord.vue b/src/views/materialsStation/toolsBack/back/outRecord.vue
index 3fb7cdef..c2739db5 100644
--- a/src/views/materialsStation/toolsBack/back/outRecord.vue
+++ b/src/views/materialsStation/toolsBack/back/outRecord.vue
@@ -260,7 +260,9 @@ export default {
         departName:'',//项目部
         proName:'',//工程名称
         subUnitName:'',//分包单位
-        teamName:''//班组名称
+        teamName:'',//班组名称
+        startTime: null,
+        endTime: null
       },
 
       //在库弹窗
@@ -283,7 +285,9 @@ export default {
     const end = new Date()
     let start = new Date()
     start.setMonth(start.getMonth() - 1)
-    this.queryParams.timeRange = [this.format(start), this.format(end)]
+    // this.queryParams.timeRange = [this.format(start), this.format(end)]
+    this.queryParams.startTime = this.format(start)
+    this.queryParams.endTime = this.format(end)
     this.getImpUnitOptions()
     this.handleImpUnitChange()
     this.handleDepartChange()
@@ -449,8 +453,8 @@ export default {
       this.loading = true
       const params = {
         keyWord: this.queryParams.keyWord,
-        startTime: this.queryParams.timeRange ? this.queryParams.timeRange[0] : null,
-        endTime: this.queryParams.timeRange ? this.queryParams.timeRange[1] : null,
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
         impUnitName:this.queryParams.impUnitName,
@@ -470,8 +474,8 @@ export default {
         console.log(this.tableList)
         let param = {
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.timeRange ? this.queryParams.timeRange[0] : null,
-          endTime: this.queryParams.timeRange ? this.queryParams.timeRange[1] : null,
+          startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
           impUnitName:this.queryParams.impUnitName,
           departName:this.queryParams.departName,
           proName:this.queryParams.proName,
@@ -527,7 +531,9 @@ export default {
       const end = new Date()
       let start = new Date()
       start.setMonth(start.getMonth() - 1)
-      this.queryParams.timeRange = [this.format(start), this.format(end)]
+      // this.queryParams.timeRange = [this.format(start), this.format(end)]
+      this.queryParams.startTime = this.format(start)
+      this.queryParams.endTime = this.format(end)
       this.resetForm('queryForm')
       this.getImpUnitOptions()
       this.handleImpUnitChange()

From 82276a731cae229325bdbda50d5772ff4b743bda Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 12 Nov 2025 12:24:33 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repair/repairManage/component/home.vue    | 15 ++++++++
 .../testExamine/component/homeApply.vue       | 38 +++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 795a0df5..25fbba91 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -49,6 +49,9 @@
             <el-col :span="1.5">
                 <el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
             </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleDetailsExport">导出明细</el-button>
+          </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -681,6 +684,18 @@ export default {
                 `维修任务单_${currentTime}.xlsx`,
             )
         },
+      handleDetailsExport() {
+        const currentTime = formatTime(new Date());
+        this.download(
+          'material/repair/exportDetails',
+          {
+            ...this.queryParams,
+            // startTime:this.queryParams.time[0],
+            // endTime:this.queryParams.time[1]
+          },
+          `维修任务详情单_${currentTime}.xlsx`,
+        )
+      },
         //查看维修任务单
        async handlePrint(row) {
             const res = await getRepairDocumentInfo(row.taskId);
diff --git a/src/views/material/repair/testExamine/component/homeApply.vue b/src/views/material/repair/testExamine/component/homeApply.vue
index 79f6f05d..54cf97e7 100644
--- a/src/views/material/repair/testExamine/component/homeApply.vue
+++ b/src/views/material/repair/testExamine/component/homeApply.vue
@@ -102,6 +102,16 @@
           >导出
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleDetailsExport"
+        >导出明细
+        </el-button>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -317,15 +327,15 @@ export default {
     onDictReady(dict) {
       // 获取repair_task_status的所有选项，并过滤出有效的选项（值为10、11、12）
       const allOptions = dict.type.repair_task_status || []
-      const validOptions = allOptions.filter(item => 
+      const validOptions = allOptions.filter(item =>
         item.value == 10 || item.value == 11 || item.value == 12
       )
-      
+
       // 如果有有效选项，设置第一个为默认值
       if (validOptions.length > 0) {
         this.queryParams.taskStatus = validOptions[0].value
       }
-      
+
       // 执行查询
       this.getList()
     },
@@ -543,6 +553,28 @@ export default {
         `修试审核_${currentTime}.xlsx`
       );
     },
+    handleDetailsExport() {
+      const formatTime = (date) => {
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, '0');
+        const day = String(date.getDate()).padStart(2, '0');
+        const hours = String(date.getHours()).padStart(2, '0');
+        const minutes = String(date.getMinutes()).padStart(2, '0');
+        const seconds = String(date.getSeconds()).padStart(2, '0');
+        return `${year}${month}${day}_${hours}${minutes}${seconds}`;
+      };
+
+      const currentTime = formatTime(new Date());
+      this.download(
+        "/material/repair/exportAuditDetails",
+        {
+          ...this.queryParams,
+          // startTime: this.queryParams.time && this.queryParams.time[0],
+          // endTime: this.queryParams.time && this.queryParams.time[1],
+        },
+        `修试审核详情_${currentTime}.xlsx`
+      );
+    },
 
     //发布按钮
     handleSend(row) {