pdf剩余页面调整

src/components/PDF/fundsPDF.vue

@@ -11,26 +11,26 @@
         </div>
         <div style="border: 1px solid black">
           <div style="display: flex; border-bottom: 1px solid black">
-            <div style="width: 126px; border-right: 1px solid black; padding: 8px">创建人</div>
-            <div style="width: calc(100% - 126px); padding: 8px">
+            <div style="width: 80px; border-right: 1px solid black; padding: 8px">创建人</div>
+            <div style="flex: 1; padding: 8px">
               {{ dictValueLabel(printDetails.createUser, userList) }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
-            <div style="width: 126px; border-right: 1px solid black; padding: 8px">创建人部门</div>
-            <div style="width: calc(100% - 126px); padding: 8px">
+            <div style="width: 80px; border-right: 1px solid black; padding: 8px">创建人部门</div>
+            <div style="flex: 1; padding: 8px">
               {{ printDetails.deptName }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black" v-if="printDetails.type !== '3'">
-            <div style="width: 126px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">费用明细</div>
-            <div style="width: calc(100% - 126px)">
+            <div style="width: 80px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">费用明细</div>
+            <div style="flex: 1">
               <div style="border-bottom: 1px solid black; display: flex">
-                <div style="width: 80px; padding: 4px 8px; border-right: 1px solid black; text-align: center">费用类型</div>
-                <div style="width: 120px; padding: 4px 8px; border-right: 1px solid black; text-align: center">关联合同</div>
-                <div style="width: calc(100% - 360px); padding: 4px 8px; border-right: 1px solid black; text-align: center">款项说明</div>
-                <div style="width: 60px; padding: 4px 8px; border-right: 1px solid black; text-align: center">货币</div>
-                <div style="width: 100px; padding: 4px 8px; text-align: center">付款金额</div>
+                <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; text-align: center">费用类型</div>
+                <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; text-align: center">关联合同</div>
+                <div style="width: calc(100% - 270px); padding: 4px 8px; border-right: 1px solid black; text-align: center">款项说明</div>
+                <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; text-align: center">货币</div>
+                <div style="width: 75px; padding: 4px 8px; text-align: center">付款金额</div>
               </div>
               <template v-if="printDetails.accountRequestFundsDetailList && printDetails.accountRequestFundsDetailList.length > 0">
                 <div v-for="(item, index) in printDetails.accountRequestFundsDetailList" :key="index">
@@ -38,19 +38,19 @@
                     :style="
                       index + 1 !== printDetails.accountRequestFundsDetailList.length ? 'border-bottom: 1px solid black;  display: flex' : ' display: flex'
                     ">
-                    <div style="width: 80px; padding: 4px 8px; border-right: 1px solid black; text-align: center">
+                    <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; text-align: center">
                       {{ dictValueLabel(item.costType, fundsCostType) }}
                     </div>
-                    <div style="width: 120px; padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
+                    <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
                       {{ item.contractCode }}
                     </div>
-                    <div style="width: calc(100% - 360px); padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
+                    <div style="width: calc(100% - 270px); padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
                       {{ item.remarks }}
                     </div>
-                    <div style="width: 60px; padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
+                    <div style="width: 65px; padding: 4px 8px; border-right: 1px solid black; display: flex; align-items: center">
                       {{ dictValueLabel(printDetails.currency, accountCurrency) }}
                     </div>
-                    <div style="width: 100px; padding: 4px 8px; display: flex; align-items: center">
+                    <div style="width: 75px; padding: 4px 8px; display: flex; align-items: center">
                       {{ item.amount }}
                     </div>
                   </div>
@@ -59,8 +59,8 @@
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black" v-else>
-            <div style="width: 126px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">费用明细</div>
-            <div style="width: calc(100% - 126px)">
+            <div style="width: 80px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">费用明细</div>
+            <div style="flex: 1">
               <div style="border-bottom: 1px solid black; display: flex">
                 <div style="width: 80px; padding: 4px 8px; border-right: 1px solid black; text-align: center">费用类型</div>
                 <div style="width: 120px; padding: 4px 8px; border-right: 1px solid black; text-align: center">关联合同</div>
@@ -99,8 +99,8 @@
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black" v-if="printDetails.type !== '3'">
-            <div style="width: 126px; border-right: 1px solid black; padding: 8px">总报销金额</div>
-            <div style="width: calc(100% - 126px); display: flex">
+            <div style="width: 80px; border-right: 1px solid black; padding: 8px">总报销金额</div>
+            <div style="flex: 1; display: flex">
               <div style="width: calc(100% - 100px); padding: 8px; border-right: 1px solid black">
                 {{ NumberToChinese(computeMoney("amount")) }}
               </div>
@@ -111,8 +111,8 @@
           </div>
           <div v-else>
             <div style="display: flex; border-bottom: 1px solid black">
-              <div style="width: 126px; border-right: 1px solid black; padding: 8px">核销总金额</div>
-              <div style="width: calc(100% - 126px); display: flex">
+              <div style="width: 80px; border-right: 1px solid black; padding: 8px">核销总金额</div>
+              <div style="flex: 1; display: flex">
                 <div style="width: calc(100% - 80px); padding: 8px; border-right: 1px solid black">
                   {{ NumberToChinese(computeMoney("amount")) }}
                 </div>
@@ -122,8 +122,8 @@
               </div>
             </div>
             <div style="display: flex; border-bottom: 1px solid black">
-              <div style="width: 126px; border-right: 1px solid black; padding: 8px">预支总金额</div>
-              <div style="width: calc(100% - 126px); display: flex">
+              <div style="width: 80px; border-right: 1px solid black; padding: 8px">预支总金额</div>
+              <div style="flex: 1; display: flex">
                 <div style="width: calc(100% - 80px); padding: 8px; border-right: 1px solid black">
                   {{ NumberToChinese(computeMoney("advanceAmount")) }}
                 </div>
@@ -133,8 +133,8 @@
               </div>
             </div>
             <div style="display: flex; border-bottom: 1px solid black">
-              <div style="width: 126px; border-right: 1px solid black; padding: 8px">差额 (核销 - 预支)</div>
-              <div style="width: calc(100% - 126px); display: flex">
+              <div style="width: 80px; border-right: 1px solid black; padding: 8px">差额 (核销 - 预支)</div>
+              <div style="flex: 1; display: flex">
                 <div style="width: calc(100% - 80px); padding: 8px; border-right: 1px solid black">
                   {{ NumberToChinese(computeBalance()) }}
                 </div>
@@ -145,14 +145,14 @@
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
-            <div style="width: 126px; border-right: 1px solid black; padding: 8px">单据数量</div>
-            <div style="width: calc(100% - 126px); padding: 8px">
+            <div style="width: 80px; border-right: 1px solid black; padding: 8px">单据数量</div>
+            <div style="flex: 1; padding: 8px">
               {{ printDetails.quantity }}
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
-            <div style="width: 126px; border-right: 1px solid black; padding: 0 8px; display: flex; align-items: center">收款信息</div>
-            <div style="width: calc(100% - 126px)">
+            <div style="width: 80px; border-right: 1px solid black; padding: 0 8px; display: flex; align-items: center">收款信息</div>
+            <div style="flex: 1">
               <div style="border-bottom: 1px solid black; display: flex">
                 <div style="width: 19%; padding: 0 8px; border-right: 1px solid black; text-align: center">支付方式</div>
                 <div style="width: 27%; padding: 0 8px; border-right: 1px solid black; text-align: center">收款方户名</div>
@@ -176,14 +176,14 @@
             </div>
           </div>
           <div style="display: flex; border-bottom: 1px solid black">
-            <div style="width: 126px; border-right: 1px solid black; padding: 8px">电子发票(PDF/JPG)</div>
-            <div style="width: calc(100% - 126px); padding: 8px">
+            <div style="width: 80px; border-right: 1px solid black; padding: 8px">电子发票(PDF/JPG)</div>
+            <div style="flex:1; padding: 8px">
               {{ printDetails.electronicInvoiceText }}
             </div>
           </div>
           <div style="display: flex">
-            <div style="width: 126px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">审批流程</div>
-            <div style="width: calc(100% - 126px)">
+            <div style="width: 80px; border-right: 1px solid black; padding: 4px 8px; display: flex; align-items: center">审批流程</div>
+            <div style="flex: 1">
               <template v-if="printDetails.recordList && printDetails.recordList.length > 0">
                 <div v-for="(item, index) in printDetails.recordList" :key="index">
                   <div

src/components/PDF/purchasePDF.vue

@@ -45,25 +45,25 @@
         </div>
         <table border="1" style="width: 100%" class="table">
           <tr>
-            <td style="width: 70px">序号</td>
+            <td style="width: 50px">序号</td>
             <td>品名</td>
             <td>规格型号</td>
             <td style="width: 60px">单位</td>
             <td style="width: 60px">数量</td>
-            <td style="width: 100px">单价</td>
-            <td style="width: 100px">金额</td>
+            <td style="width: 80px">单价</td>
+            <td style="width: 80px">金额</td>
           </tr>
           <tr v-for="(row, index) in pdfData.purchaseDetailList" :key="row.id">
-            <td style="width: 70px">{{ index + 1 }}</td>
+            <td style="width: 50px">{{ index + 1 }}</td>
             <td>{{ row.productName }}</td>
             <td>{{ row.productSpec }}</td>
             <td style="width: 60px">{{ row.productUnitName }}</td>
             <td style="width: 60px">{{ row.count }}</td>
-            <td style="width: 100px">
+            <td style="width: 80px">
               <span v-if="pdfData.currency">{{ pdfData.currency }}</span
               >{{ row.price }}
             </td>
-            <td style="width: 100px">
+            <td style="width: 80px">
               <span v-if="pdfData.currency">{{ pdfData.currency }}</span
               >{{ row.amount }}
             </td>

src/views/finance/fundManage/accountPayment/index.vue

@@ -138,7 +138,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
+    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="640px">
       <div id="printMe">
         <FundsPDF v-if="rowData.type != '20'" :rowData="rowData"></FundsPDF>
         <PaymentPDF v-else :rowData="rowData"></PaymentPDF>

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -298,6 +298,7 @@ const sourceList = ref({
     keyword: "",
     settlementStatus: "",
     userId: "",
+    isArrival:'1',
   },
 });
 const loading = ref(false);

src/views/salesMange/shipmentMange/document/index.vue

@@ -695,7 +695,7 @@
           >
             <thead>
               <tr>
-                <td style="width: 100px">
+                <td style="width: 80px">
                   项目
                   <br />
                   ITEM NO.
@@ -706,13 +706,13 @@
                   DESCRIPTION OF GOODS
                 </td>
 
-                <td style="width: 100px">
+                <td style="width: 80px">
                   单位
                   <br />
                   UNIT
                 </td>
 
-                <td style="width: 100px; border-right: 0">
+                <td style="width: 80px; border-right: 0">
                   数量
                   <br />
                   QUANTITY
@@ -760,7 +760,7 @@
           >
             <thead>
               <tr>
-                <td style="width: 100px" v-if="[2, 3].includes(openStatus)">
+                <td style="width: 80px" v-if="[2, 3].includes(openStatus)">
                   项目
                   <br />
                   ITEM NO.
@@ -771,13 +771,13 @@
                   DESCRIPTION OF GOODS
                 </td>
                 <template v-if="[3].includes(openStatus)">
-                  <td style="width: 100px">
+                  <td style="width: 80px">
                     单位
                     <br />
                     UNIT
                   </td>
                 </template>
-                <td style="width: 100px">
+                <td style="width: 80px">
                   数量
                   <br />
                   QUANTITY
@@ -786,7 +786,7 @@
                 </td>
 
                 <template v-if="[2, 3].includes(openStatus)">
-                  <td style="width: 100px">
+                  <td style="width: 80px">
                     单价
                     <br />
                     UNIT PRICE
@@ -798,7 +798,7 @@
                       )
                     }}
                   </td>
-                  <td style="width: 100px; border-right: 0">
+                  <td style="width: 80px; border-right: 0">
                     总价
                     <br />
                     TOTAL PRICE