Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/components/PDF/paymentPDF.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="pdfDom" style="width: 776px">
+    <div id="pdfDom" style="font-family: 'msyh';">
       <div style="padding: 60px; font-size: 12px !important; color: black">
         <div style="font-size: 16px; text-align: center; padding: 8px">
           <span
@@ -14,28 +14,28 @@
         <div style="border: 1px solid black">
           <div style="display: flex; border-bottom: 1px solid black">
             <div
-              style="width: 150px; border-right: 1px solid black; padding: 8px"
+              style="width: 80px; border-right: 1px solid black; padding: 8px"
             >
               创建人
             </div>
-            <div style="width: calc(100% - 150px); padding: 8px">
+            <div style="width: calc(100% - 80px); padding: 8px">
               {{ dictValueLabel(printDetails.createUser, userList) }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
-              style="width: 150px; border-right: 1px solid black; padding: 8px"
+              style="width: 80px; border-right: 1px solid black; padding: 8px"
             >
               创建人部门
             </div>
-            <div style="width: calc(100% - 150px); padding: 8px">
+            <div style="width: calc(100% - 80px); padding: 8px">
               {{ dictValueLabel(printDetails.deptId, deptList) }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
               style="
-                width: 150px;
+                width: 80px;
                 border-right: 1px solid black;
                 padding: 4px 8px;
                 display: flex;
@@ -44,7 +44,7 @@
             >
               费用明细
             </div>
-            <div style="width: calc(100% - 150px)">
+            <div style="width: calc(100% - 80px)">
               <div style="border-bottom: 1px solid black; display: flex">
                 <div
                   style="
@@ -58,7 +58,7 @@
                 </div>
                 <div
                   style="
-                    width: calc(100% - 340px);
+                    width: calc(100% - 260px);
                     padding: 4px 8px;
                     border-right: 1px solid black;
                     text-align: center;
@@ -68,7 +68,7 @@
                 </div>
                 <div
                   style="
-                    width: 80px;
+                    width: 60px;
                     padding: 4px 8px;
                     border-right: 1px solid black;
                     text-align: center;
@@ -76,7 +76,7 @@
                 >
                   货币
                 </div>
-                <div style="width: 140px; padding: 4px 8px; text-align: center">
+                <div style="width: 80px; padding: 4px 8px; text-align: center">
                   付款金额
                 </div>
               </div>
@@ -110,7 +110,7 @@
                     </div>
                     <div
                       style="
-                        width: calc(100% - 340px);
+                        width: calc(100% - 260px);
                         padding: 4px 8px;
                         border-right: 1px solid black;
                         display: flex;
@@ -121,7 +121,7 @@
                     </div>
                     <div
                       style="
-                        width: 80px;
+                        width: 60px;
                         padding: 4px 8px;
                         border-right: 1px solid black;
                         display: flex;
@@ -132,7 +132,7 @@
                     </div>
                     <div
                       style="
-                        width: 140px;
+                        width: 80px;
                         padding: 4px 8px;
                         display: flex;
                         align-items: center;
@@ -147,11 +147,11 @@
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
-              style="width: 150px; border-right: 1px solid black; padding: 8px"
+              style="width: 80px; border-right: 1px solid black; padding: 8px"
             >
               总报销金额
             </div>
-            <div style="width: calc(100% - 150px); display: flex">
+            <div style="width: calc(100% - 80px); display: flex">
               <div
                 style="
                   width: calc(100% - 140px);
@@ -166,18 +166,18 @@
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
-              style="width: 150px; border-right: 1px solid black; padding: 8px"
+              style="width: 80px; border-right: 1px solid black; padding: 8px"
             >
               单据数量
             </div>
-            <div style="width: calc(100% - 150px); padding: 8px">
+            <div style="width: calc(100% - 80px); padding: 8px">
               {{ printDetails.receiptsNum }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
               style="
-                width: 150px;
+                width: 80px;
                 border-right: 1px solid black;
                 padding: 0 8px;
                 display: flex;
@@ -186,7 +186,7 @@
             >
               收款信息
             </div>
-            <div style="width: calc(100% - 150px)">
+            <div style="width: calc(100% - 80px)">
               <div style="border-bottom: 1px solid black; display: flex">
                 <div
                   style="
@@ -200,7 +200,7 @@
                 </div>
                 <div
                   style="
-                    width: 27%;
+                    width: 22%;
                     padding: 0 8px;
                     border-right: 1px solid black;
                     text-align: center;
@@ -210,7 +210,7 @@
                 </div>
                 <div
                   style="
-                    width: 27%;
+                    width: 20%;
                     padding: 0 8px;
                     border-right: 1px solid black;
                     text-align: center;
@@ -218,7 +218,7 @@
                 >
                   开户行
                 </div>
-                <div style="width: 27%; padding: 0 8px; text-align: center">
+                <div style="width: 39%; padding: 0 8px; text-align: center">
                   收款方账号
                 </div>
               </div>
@@ -236,7 +236,7 @@
                 </div>
                 <div
                   style="
-                    width: 27%;
+                    width: 22%;
                     padding: 0 8px;
                     border-right: 1px solid black;
                     display: flex;
@@ -247,7 +247,7 @@
                 </div>
                 <div
                   style="
-                    width: 27%;
+                    width: 20%;
                     padding: 0 8px;
                     border-right: 1px solid black;
                     display: flex;
@@ -258,7 +258,7 @@
                 </div>
                 <div
                   style="
-                    width: 27%;
+                    width: 39%;
                     padding: 0 8px;
                     display: flex;
                     align-items: center;
@@ -271,18 +271,18 @@
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
             <div
-              style="width: 150px; border-right: 1px solid black; padding: 8px"
+              style="width: 80px; border-right: 1px solid black; padding: 8px"
             >
               电子发票(PDF/JPG)
             </div>
-            <div style="width: calc(100% - 150px); padding: 8px">
+            <div style="width: calc(100% - 80px); padding: 8px">
               {{ printDetails.electronicInvoiceText }}
             </div>
           </div>
           <div style="display: flex">
             <div
               style="
-                width: 150px;
+                width: 80px;
                 border-right: 1px solid black;
                 padding: 4px 8px;
                 display: flex;
@@ -291,7 +291,7 @@
             >
               审批流程
             </div>
-            <div style="width: calc(100% - 150px)">
+            <div style="width: calc(100% - 80px)">
               <template
                 v-if="
                   printDetails.recordList && printDetails.recordList.length > 0

src/views/purchaseManage/purchasePayment/payment/index.vue

@@ -22,7 +22,7 @@
       </template>
     </byTable>
 
-    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
+    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="640px">
       <PaymentPDF :rowData="rowData"></PaymentPDF>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>