From 19609d09313bf89f8a5f32dacd4ebd34c51e5f3d Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 23 Dec 2024 18:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/apply/component/addToolsApply.vue   | 11 ++++++--
 .../lease/apply/component/homeApply.vue       | 25 ++++++++-----------
 .../lease/apply/component/queryToolsApply.vue |  4 +--
 src/views/material/lease/outBound/index.vue   | 21 ++++++----------
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index 0a8b68a1..6221976a 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -137,7 +137,7 @@
               controls-position="right" type="number"
               style="width: 100%"
               :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.preNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.preNum=Number(v.replace(/[^\d]/g,'')))"
-          ></el-input>
+              ></el-input>
         </template>
       </el-table-column>
 
@@ -456,7 +456,7 @@ export default {
           for (let z of deviceTypeList) {
             if (z.data.typeId === i) {
               const obj = JSON.parse(JSON.stringify(z.data));
-              obj.preNum = 1;
+              obj.preNum = 0;
               if(obj.storageNum<=0){
                 let index = this.deviceType.length;
                 if(index==1){
@@ -550,6 +550,13 @@ export default {
       if (this.equipmentList.length > 0) {
         this.$refs["maForm"].validate(async (valid) => {
           if (valid) {
+              for(let i = 0;i<this.equipmentList.length;i++){
+                if(this.equipmentList[i].preNum<=0){
+                  this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `);
+                  return
+                }
+              }
+            
             console.log("projectId", this.projectTemp);
             await getAgreement({
               unitId: this.maForm.unitId,
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 434ba39d..36dee6ee 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -120,14 +120,14 @@
       </el-table-column>
       <el-table-column
         align="center"
-        width="160"
+        width="100"
         label="申请时间"
         prop="createTime"
-        :show-overflow-tooltip="true"
+       
       />
       <el-table-column
         label="申请人"
-        width="150"
+        width="100"
         align="center"
         prop="createBy"
         :show-overflow-tooltip="true"
@@ -136,32 +136,35 @@
         label="租赁单位"
         align="center"
         prop="leaseUnit"
+        width="150px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="租赁工程"
         align="center"
         prop="leaseProject"
+        width="150px"
         :show-overflow-tooltip="true"
       />
-      <!-- <el-table-column
+      <el-table-column
         label="领料物资类型"
         align="center"
-        prop="leaseType"
+        prop="maTypeNames"
         width="110px"
         :show-overflow-tooltip="true"
-      /> -->
+      />
       <el-table-column
         label="协议号"
         align="center"
         prop="agreementCode"
+        width="140"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="租赁申请单号"
         align="center"
         prop="code"
-        width="110px"
+        width="140px"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -180,14 +183,6 @@
         width="120px"
         :show-overflow-tooltip="true"
       />
-
-      <el-table-column
-        label="操作时间"
-        align="center"
-        width="160"
-        prop="updateTime"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column
         label="状态"
         align="center"
diff --git a/src/views/material/lease/apply/component/queryToolsApply.vue b/src/views/material/lease/apply/component/queryToolsApply.vue
index 975216cc..b88cca76 100644
--- a/src/views/material/lease/apply/component/queryToolsApply.vue
+++ b/src/views/material/lease/apply/component/queryToolsApply.vue
@@ -238,8 +238,8 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "/material/purchase_check_info/exportDetails",
-        { taskId: this.taskId },
+        "/material/lease_apply_info/exportDetails",
+        { id: this.id },
         `领料申请详情_${new Date().getTime()}.xlsx`
       );
     },
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index d06d81a0..e8bd73c9 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -72,10 +72,9 @@
       </el-table-column>
       <el-table-column
         align="center"
-        width="160"
+        width="100"
         label="申请时间"
         prop="createTime"
-        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="申请人"
@@ -88,32 +87,35 @@
         label="租赁单位"
         align="center"
         prop="leaseUnit"
+        width="150px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="租赁工程"
         align="center"
         prop="leaseProject"
+        width="150px"
         :show-overflow-tooltip="true"
       />
-      <!-- <el-table-column
+      <el-table-column
         label="领料物资类型"
         align="center"
-        prop="leaseType"
+        prop="maTypeNames"
         width="110px"
         :show-overflow-tooltip="true"
-      /> -->
+      />
       <el-table-column
         label="协议号"
         align="center"
         prop="agreementCode"
+        width="140px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="租赁申请单号"
         align="center"
         prop="code"
-        width="110px"
+        width="140px"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -151,13 +153,6 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column
-        label="操作时间"
-        align="center"
-        width="160"
-        prop="updateTime"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column
         label="状态"
         align="center"