From cafa401d158725f02e143e85c956723f43444068 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 3 Sep 2025 09:20:10 +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/views/material/cost/component/leaseCostRangeReportHome.vue | 2 +-
 src/views/material/cost/component/lostReportHome.vue           | 2 +-
 src/views/material/cost/component/repairReportHome.vue         | 2 +-
 src/views/material/cost/component/reportHome.vue               | 2 +-
 src/views/material/cost/component/unreportHome.vue             | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/material/cost/component/leaseCostRangeReportHome.vue b/src/views/material/cost/component/leaseCostRangeReportHome.vue
index 0c44c4c1..265f952f 100644
--- a/src/views/material/cost/component/leaseCostRangeReportHome.vue
+++ b/src/views/material/cost/component/leaseCostRangeReportHome.vue
@@ -30,7 +30,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="tableList" border stripe>
+        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
             <el-table-column label="序号" align="center" type="index" width="60">
                 <template slot-scope="scope">
                     <span>{{ scope.$index + 1 }}</span>
diff --git a/src/views/material/cost/component/lostReportHome.vue b/src/views/material/cost/component/lostReportHome.vue
index b30bb2c2..6b20a7b3 100644
--- a/src/views/material/cost/component/lostReportHome.vue
+++ b/src/views/material/cost/component/lostReportHome.vue
@@ -42,7 +42,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="tableList" border stripe>
+        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
             <el-table-column label="序号" align="center" type="index" width="60">
                 <template slot-scope="scope">
                     <span>{{
diff --git a/src/views/material/cost/component/repairReportHome.vue b/src/views/material/cost/component/repairReportHome.vue
index f171b038..a71b6197 100644
--- a/src/views/material/cost/component/repairReportHome.vue
+++ b/src/views/material/cost/component/repairReportHome.vue
@@ -42,7 +42,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="tableList" border stripe>
+        <el-table v-loading="loading" :data="tableList" border stripe :max-height="650">
             <el-table-column label="序号" align="center" type="index" width="60">
                 <template slot-scope="scope">
                     <span>{{
diff --git a/src/views/material/cost/component/reportHome.vue b/src/views/material/cost/component/reportHome.vue
index 78710774..766eba01 100644
--- a/src/views/material/cost/component/reportHome.vue
+++ b/src/views/material/cost/component/reportHome.vue
@@ -42,7 +42,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="tableList" >
+        <el-table v-loading="loading" :data="tableList" :max-height="650">
             <el-table-column label="序号" align="center" type="index" width="60">
                 <template slot-scope="scope">
                     <span>{{
diff --git a/src/views/material/cost/component/unreportHome.vue b/src/views/material/cost/component/unreportHome.vue
index 053fa5f8..d1b1f495 100644
--- a/src/views/material/cost/component/unreportHome.vue
+++ b/src/views/material/cost/component/unreportHome.vue
@@ -29,7 +29,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="tableList" >
+        <el-table v-loading="loading" :data="tableList" :max-height="650">
             <el-table-column label="序号" align="center" type="index" width="60">
                 <template slot-scope="scope">
                     <span>{{
@@ -128,6 +128,7 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
+            :page-sizes="[10, 50, 200, 500, 2000]"
             @pagination="getList"
             />
 

From b416e2135a586a764b812963fbcf10888a70f85d Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 3 Sep 2025 11:14:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolsLease/outBound/component/addToolsApply.vue            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index 337c4d47..3fd58b98 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -701,14 +701,13 @@ export default {
             this.maForm.phone = this.maForm.relPhone
             await this.$modal
               .confirm('是否确认保存当前页面')
-              .then(function () {})
               .then(() => {
+                this.loading = true
                 this.maForm.isOut = isOut
                 this.maForm.createBy = sessionStorage.getItem('userName')
                 if (this.isEdit) {
                   this.maForm.leaseProjectId = this.maForm.projectId
                   console.log('编辑')
-                  this.loading = true
                   updateApplyInfo({
                     leaseApplyDetailsList: this.equipmentList,
                     leaseApplyInfo: this.maForm