From c494514932644f9781fd82ab7f1fcb050c9811fe Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Sun, 13 Jul 2025 10:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../back/component/dialogFormByCq.vue         | 12 ++++++++++--
 .../toolsLease/apply/component/homeApply.vue  | 13 +++++++++++--
 .../outBound/component/homeApply.vue          | 19 +++++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue b/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue
index 6d4492ed..8bf0d6a1 100644
--- a/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue
+++ b/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue
@@ -10,7 +10,7 @@
   >
     <div id="printcontent" style="height: 600px; overflow-y: scroll; padding: 0 20px">
       <vue-easy-print tableShow ref="printRef">
-        <div id="checkId">
+        <div id="checkId" class="print-table">
           <div style="text-align: center; font-weight: 600; font-size: 16px">机具设备退料单</div>
           <div class="info" style="margin-top: 10px; display: flex; align-items: center">
             <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
@@ -133,7 +133,7 @@
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
         <vue-easy-print tableShow ref="remarksPrintRef">
-          <div id="checkIdTwo">
+          <div id="checkIdTwo" class="print-table">
             <div class="remarks_box">
               <div class="remarks_box_title">退料编码明细</div>
             </div>
@@ -356,4 +356,12 @@ export default {
     /* 打印内容的样式 */
   }
 }
+.print-table {
+  table,
+  th,
+  td {
+    border: 1.5px solid black;
+    border-collapse: collapse;
+  }
+}
 </style>
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
index 93015f6f..0cacfc4e 100644
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@@ -217,7 +217,7 @@
     <el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
       <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
         <vue-easy-print tableShow ref="remarksPrintRef">
-          <div id="checkIdTwo">
+          <div id="checkIdTwo" class="print-table">
             <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">领料单</div>
             <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
@@ -312,7 +312,7 @@
     <!-- 编码管理查看弹窗 -->
     <el-dialog :title="titleView" :visible.sync="showView" width="800px" append-to-body>
       <div style="overflow-y: scroll">
-        <vue-easy-print tableShow ref="remarksPrintRefView" class="print">
+        <vue-easy-print tableShow ref="remarksPrintRefView" class="print-table">
           <div class="title" style="text-align: center; font-weight: 600; font-size: 16px; margin-bottom: 20px">
             领料单编号明细
           </div>
@@ -485,6 +485,7 @@ export default {
     },
 
     codeInfo(row) {
+      console.log('🚀 ~ codeInfo ~ row:', row)
       this.showView = true
       this.titleView = '查看'
       this.getListViewInfo = row.maCodeVoList
@@ -567,4 +568,12 @@ export default {
   width: 100px;
   height: 40px;
 }
+.print-table {
+  table,
+  th,
+  td {
+    border: 1.5px solid black;
+    border-collapse: collapse;
+  }
+}
 </style>
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
index 250db547..29187990 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@@ -174,7 +174,7 @@
     <el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
       <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
         <vue-easy-print tableShow ref="remarksPrintRef">
-          <div id="checkIdTwo">
+          <div id="checkIdTwo" class="print-table">
             <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">领料单</div>
             <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
@@ -268,7 +268,7 @@
     <!-- 编码管理查看弹窗 -->
     <el-dialog :title="titleView" :visible.sync="showView" width="800px" append-to-body>
       <div style="overflow-y: scroll">
-        <vue-easy-print tableShow ref="remarksPrintRefView" class="print">
+        <vue-easy-print tableShow ref="remarksPrintRefView" class="print-table">
           <div class="title" style="text-align: center; font-weight: 600; font-size: 16px; margin-bottom: 20px">
             领料单编号明细
           </div>
@@ -415,11 +415,13 @@ export default {
 
     //打开领料单
     async handleLld(row) {
+      this.leaseApplyDetails = []
+      this.leaseApplyData = {}
       this.title = '领料单'
       this.open = true
       var ids = row.id
       const res = await getApplyInfo(ids)
-      this.leaseApplyDetails = res.data.leaseOutDetailsList
+      this.leaseApplyDetails = res.data.leaseApplyDetailsList
       this.leaseApplyData = res.data.leaseApplyInfo
     },
 
@@ -440,9 +442,10 @@ export default {
     },
 
     codeInfo(row) {
+      console.log('🚀 ~ codeInfo ~ row:', row)
       this.showView = true
       this.titleView = '查看'
-      this.getListViewInfo = row.maCodeList
+      this.getListViewInfo = row.maCodeVoList
     },
 
     //打印
@@ -526,4 +529,12 @@ export default {
   width: 100px;
   height: 40px;
 }
+.print-table {
+  table,
+  th,
+  td {
+    border: 1.5px solid black;
+    border-collapse: collapse;
+  }
+}
 </style>