From a6c8b960dc6289db46eb98e639a8ca943df0fc66 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 24 Apr 2025 16:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/apply/component/homeApply.vue  | 13 +++++++++++--
 src/views/material/ma/priceHistory/index.vue      |  2 +-
 src/views/material/ma/typeConfigKeeper/index.vue  | 15 ++++++++++++++-
 .../material/purchase/goodsAccept/detail.vue      |  4 ++--
 src/views/material/purchase/goodsEntry/detail.vue |  4 ++--
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index ac8e8809..17d8a36b 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -445,7 +445,7 @@ export default {
         endTime: this.queryParams.time && this.queryParams.time[1], 
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
-        statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus]:this.dict.type.lease_task_status.map(item => item.value)
+        statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus]:[1,2,3,4]
       };
       getListLeaseApply(params).then((response) => {
         this.typeList = response.data.rows;
@@ -605,9 +605,18 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
+      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], 
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+        statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus]:[1,2,3,4]
+      };
       this.download(
         "/material/lease_apply_info/export",
-        { ...this.queryParams },
+        { ...params },
         `领料申请_${new Date().getTime()}.xlsx`
       );
     },
diff --git a/src/views/material/ma/priceHistory/index.vue b/src/views/material/ma/priceHistory/index.vue
index 1f3f344f..8bead21d 100644
--- a/src/views/material/ma/priceHistory/index.vue
+++ b/src/views/material/ma/priceHistory/index.vue
@@ -243,7 +243,7 @@ export default {
       let queryTemp = this.queryParams;
       // queryTemp.level = 0;
       this.download(
-        "/material/ma_type/export",
+        "/material/ma_type/exportHistory",
         {
           ...queryTemp,
         },
diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue
index 1098b901..1a5675bc 100644
--- a/src/views/material/ma/typeConfigKeeper/index.vue
+++ b/src/views/material/ma/typeConfigKeeper/index.vue
@@ -329,6 +329,7 @@ export default {
         pageSize: 1000,
         displayBindRelationship: true,
         houseId: "",
+        keyword: "",
         // phonenumber: undefined,
         // status: undefined,
         // typeId: undefined
@@ -539,10 +540,22 @@ export default {
       this.dateRange = [];
       this.resetForm("queryForm");
       this.queryParams.typeId = undefined;
+      this.queryParams.userId = undefined;
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 1000;
-      this.queryParams.level = 0;
+      this.queryParams.level = 1;
       this.$refs.tree.setCurrentKey(null);
+      this.$refs.treeTwo.setCurrentKey(null);
+      if (
+          this.treeOptionsTwo.length > 0 &&
+          this.treeOptionsTwo[0].children.length > 0
+        ) {
+          const firstNode = this.treeOptionsTwo[0].children[0];
+          this.queryParams.typeId = firstNode.id;
+          this.queryParams.level = 1;
+          this.queryParams.houseId = firstNode.houseId;
+          this.getList();
+        }
       this.handleQuery();
     },
 
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index 65b5c90e..1286923f 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -2,7 +2,7 @@
   <div class="app-container" id="acceptDetail">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="类型规格：" prop="typeId">
-        <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable>
+        <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable  >
           <el-option
             v-for="dict in materialModelList"
             :key="dict.value"
@@ -512,7 +512,7 @@ export default {
     handleExport() {
       this.download(
         "/material/purchase_check_info/exportDetails",
-        { taskId: this.taskId },
+        { taskId: this.taskId, taskStage: 2,id:this.Id },
         `新购到货详情_${new Date().getTime()}.xlsx`
       );
     },
diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index 019b3d60..a8c3e5d6 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -524,8 +524,8 @@ export default {
       handleExport() {
         this.download(
           "/material/purchase_check_info/exportDetails",
-          { taskId: this.taskId },
-          `新购到货详情_${new Date().getTime()}.xlsx`
+          { taskId: this.taskId,taskStage:4,id:this.Id },
+          `新购入库详情_${new Date().getTime()}.xlsx`
         );
       },