From 98e7d5a3fbcc0ec59a0c247566ed1d08e6a81a55 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 21 Jul 2025 16:48:19 +0800
Subject: [PATCH] =?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/utils/request.js                          |  6 ++--
 .../testExamine/component/queryToolsApply.vue |  4 +--
 .../repair/testedInBound/component/home.vue   | 31 +++++++++++++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index eaa679e9..7ecbdde0 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -33,9 +33,9 @@ service.interceptors.request.use(config => {
   const headers = config.headers || {}
   const {
     isToken = true,
-    encryptRequest = true,
-    checkIntegrity = true,
-    encryptResponse = true,
+    encryptRequest = false,
+    checkIntegrity = false,
+    encryptResponse = false,
     repeatSubmit = false
   } = headers
 
diff --git a/src/views/material/repair/testExamine/component/queryToolsApply.vue b/src/views/material/repair/testExamine/component/queryToolsApply.vue
index a86e13b7..42f0bf3a 100644
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/queryToolsApply.vue
@@ -51,13 +51,13 @@
       <el-table-column
         label="类型名称"
         align="center"
-        prop="specificationType"
+        prop="machineTypeName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="规格型号"
         align="center"
-        prop="machineTypeName"
+        prop="specificationType"
         :show-overflow-tooltip="true"
       />
       <el-table-column
diff --git a/src/views/material/repair/testedInBound/component/home.vue b/src/views/material/repair/testedInBound/component/home.vue
index 732a6c11..0b8cc0ac 100644
--- a/src/views/material/repair/testedInBound/component/home.vue
+++ b/src/views/material/repair/testedInBound/component/home.vue
@@ -8,6 +8,18 @@
       v-show="showSearch"
       label-width="68px"
     >
+      <el-form-item>
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 240px"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item prop="keyWord">
         <el-input
           v-model="queryParams.keyWord"
@@ -173,6 +185,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         keyWord: undefined,
+        time: [],
+        startTime: undefined,
+        endTime: undefined,
       },
       queryInBoundInfo:{
         pageNum: 1,
@@ -186,6 +201,10 @@ export default {
     };
   },
   created() {
+    const end = new Date()
+    let start = new Date()
+    start.setMonth(start.getMonth() - 1)
+    this.queryParams.time = [this.format(start), this.format(end)]
     if(this.$route.query.code){
       this.queryParams.keyWord=this.$route.query.code
     }
@@ -193,9 +212,17 @@ export default {
   },
   components: {},
   methods: {
+    format(date) {
+      const y = date.getFullYear()
+      const m = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${y}-${m}-${day}`
+    },
     /** 查询修试入库列表 */
     getList() {
       this.loading = true;
+      this.queryParams.startTime = this.queryParams.time ? this.queryParams.time[0] : '';
+      this.queryParams.endTime = this.queryParams.time ? this.queryParams.time[1] : '';
       getTestedListApi(this.queryParams).then((response) => {
         this.testedList = response.data.rows;
         this.total = response.data.total;
@@ -212,6 +239,10 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.keyWord = null;
+      const end = new Date()
+      let start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      this.queryParams.time = [this.format(start), this.format(end)]
       this.handleQuery();
     },
     //一级页面审核按钮