From 65a85b3d6393fa16ee18dc4c82c6eab016bfbb21 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 15 Jan 2026 10:11:48 +0800
Subject: [PATCH 1/2] =?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/api/ma/base.js                                   |  7 +++++++
 src/api/purchase/goodsArrived.js                     | 10 +++++++++-
 src/views/business/businessHandling/index.vue        | 12 ++++++------
 .../material/repair/repairManage/component/home.vue  |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/api/ma/base.js b/src/api/ma/base.js
index 89404410..e200a62c 100644
--- a/src/api/ma/base.js
+++ b/src/api/ma/base.js
@@ -210,6 +210,13 @@ export function getEquipmentThreeTypeThree() {
   })
 }
 
+export function equipmentThreeTypeLease() {
+  return request({
+    url: '/material/leaseTask/equipmentThreeTypeLease',
+    method: 'get',
+  })
+}
+
 // 规格型号-select
 export function getMaTypeOpt(data) {
   return request({
diff --git a/src/api/purchase/goodsArrived.js b/src/api/purchase/goodsArrived.js
index c0bbab9a..ab8caa19 100644
--- a/src/api/purchase/goodsArrived.js
+++ b/src/api/purchase/goodsArrived.js
@@ -105,6 +105,14 @@ export function equipmentTypeTree(query) {
   })
 }
 
+export function equipmentTypeLease(query) {
+  return request({
+    url: '/material/ma_type/equipmentTypeLease',
+    method: 'get',
+    params: query,
+  })
+}
+
 // 上传报告附件
 export function uploadPurchaseFile(data) {
   return request({
@@ -114,5 +122,5 @@ export function uploadPurchaseFile(data) {
   })
 }
 
-  
+
 
diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue
index a67e0e7d..bd1dc923 100644
--- a/src/views/business/businessHandling/index.vue
+++ b/src/views/business/businessHandling/index.vue
@@ -454,7 +454,7 @@
 </template>
 
 <script>
-import { equipmentTypeTree } from '@/api/purchase/goodsArrived'
+import {equipmentTypeLease} from '@/api/purchase/goodsArrived'
 import { getLeaseProjectListApi, getListUnite, getAgreement, getProjectList, getDepartNameList } from '@/api/lease/apply'
 import { getImpUnitListApi } from "@/api/materialsStation"
 import {
@@ -465,7 +465,7 @@ import {
   getLeaseTaskDetail,
   getCode
 } from '@/api/business/index'
-import { getEquipmentThreeTypeThree, getMaTypeOpt } from '@/api/ma/base'
+import {equipmentThreeTypeLease, getMaTypeOpt} from '@/api/ma/base'
 import { getAuditingDetailsApi } from '@/api/receive-apply/index.js'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -850,8 +850,8 @@ export default {
     // 获取物资名称-tree
     async getMaTypeNameOpt() {
       try {
-        const res = await getEquipmentThreeTypeThree()
-        console.log('🚀 ~ getEquipmentThreeTypeThree ~ res:', res)
+        const res = await equipmentThreeTypeLease()
+        console.log('🚀 ~ equipmentThreeTypeLease ~ res:', res)
         const filterData = (data, level = 1) => {
           return data.map(item => {
             if (level < 3 && item.children && item.children.length) {
@@ -1057,8 +1057,8 @@ export default {
     },
     /** 机具类型 */
     equipmentType() {
-      equipmentTypeTree().then(response => {
-        console.log('🚀 ~ equipmentTypeTree ~ response:', response)
+      equipmentTypeLease().then(response => {
+        console.log('🚀 ~ equipmentTypeLease ~ response:', response)
         this.equipmentTypeList = response.data
         // 处理并扁平化所有类型数据
         this.flattenTypeOptions = this.processTypeData(response.data)
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 5287b440..b2127713 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -75,7 +75,7 @@
             <!-- <el-table-column label="退料人电话" align="center" prop="phone" :show-overflow-tooltip="true"/> -->
             <el-table-column label="创建人" align="center" prop="createName" :show-overflow-tooltip="true"/>
             <el-table-column label="创建时间" align="center" width="100" prop="createTime" />
-            <el-table-column label="状态" align="center" width="110" :show-overflow-tooltip="true" prop="repairStatusCode">
+            <el-table-column label="状态" align="center" width="100" :show-overflow-tooltip="true" prop="repairStatusCode">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.repair_task_status" :value="scope.row.repairStatusCode"/>
                 </template>

From c06cd6dc0f33d903ccf909d3e03eec5735178ac7 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 15 Jan 2026 13:44:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/leasePublish/component/homeApply.vue    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/business/leasePublish/component/homeApply.vue b/src/views/business/leasePublish/component/homeApply.vue
index 02ec45a6..04302132 100644
--- a/src/views/business/leasePublish/component/homeApply.vue
+++ b/src/views/business/leasePublish/component/homeApply.vue
@@ -444,11 +444,19 @@ export default {
         const seconds = String(date.getSeconds()).padStart(2, '0');
         return `${year}${month}${day}_${hours}${minutes}${seconds}`;
       };
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        status: this.queryParams.taskStatus,
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+      };
 
       const currentTime = formatTime(new Date());
       this.download(
         "/material/leaseTask/exportPublish",
-        { ...this.queryParams },
+         params,
         `领料申请发布_${currentTime}.xlsx`
       );
     },
@@ -557,7 +565,7 @@ export default {
     async downloadPDF() {
       try {
         this.$modal.loading('正在生成PDF，请稍候...')
-        
+
         // 获取要转换的DOM元素
         const element = document.getElementById('print-content1')
         if (!element) {