lilei 2 vuotta sitten
vanhempi
commit
5e1dfe75b5

+ 1 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -218,7 +218,7 @@ export default {
           _this.$message.info(res.message)
           _this.spinning = false
         },
-        {
+        this.nowType == 'dbPrint' ? null : {
           billType: 'ALLOCATE',
           billSn: objs.allocateSn,
           billNo: objs.allocateNo,

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -584,7 +584,7 @@ export default {
           _this.$message.info(res.message)
           _this.spinning = false
         },
-        {
+        this.nowType == 'dbPrint' ? null : {
           billType: 'ALLOCATE',
           billSn: objs.allocateSn,
           billNo: objs.allocateNo,

+ 9 - 9
src/views/salesManagement/receiptPrint/printModel.vue

@@ -3,10 +3,10 @@
   <div>
     <a-spin :spinning="spinning" tip="Loading..." style="height: 60vh;overflow: auto;width: 100%;padding:20px 40px;">
       <div id="sendGood-print" v-if="detail" >
-        <table ref="printBox" cellspacing="0" cellpadding="0" style="border-collapse: collapse;width: 565pt;margin:0 auto;">
+        <table ref="printBox" cellspacing="0" cellpadding="0" style="border-collapse: collapse;width: 562pt;margin:0 auto;">
           <tr>
             <td>
-              <div class="print-box" style="width: 565pt;font-size: 10pt;">
+              <div class="print-box" style="width: 562pt;font-size: 10pt;margin:0 auto;">
                 <h1 style="text-align:center;margin:0.5cm 0">销 售 收 款 凭 证</h1>
                 <div style="display:flex;align-item:center;justify-content: space-between;flex-wrap: wrap;line-height: 20pt;">
                   <div style="width: 50%;">客户名称:{{ detail.settleClientName||'--' }}</div>
@@ -22,13 +22,13 @@
                 <div v-for="(fcItem,index) in financeBookList" :key="fcItem.bookSn">
                   <div style="line-height: 30pt;">共 {{ financeBookList.length }} 个财务收款单,以下是第 {{ index+1 }} 个</div>
                   <div>
-                    <table border="1" style="width: 565pt;border-collapse: collapse;text-align: center;">
+                    <table border="1" style="width: 562pt;border-collapse: collapse;text-align: center;">
                       <tr>
                         <th style="line-height: 24pt;width: 50pt;background:#f6f6f6;">序号</th>
                         <th style="line-height: 24pt;width: 60pt;background:#f6f6f6;">日期</th>
                         <th style="line-height: 24pt;width: 100pt;background:#f6f6f6;">客户信息</th>
                         <th style="line-height: 24pt;width: 100pt;background:#f6f6f6;">收款信息</th>
-                        <th style="line-height: 24pt;width: 100pt;background:#f6f6f6;">汇入银行</th>
+                        <th style="line-height: 24pt;width: 97pt;background:#f6f6f6;">汇入银行</th>
                         <th style="line-height: 24pt;width: 60pt;background:#f6f6f6;">足额打款</th>
                         <th style="line-height: 24pt;width: 95pt;background:#f6f6f6;">备注</th>
                       </tr>
@@ -48,7 +48,7 @@
                           余款抵扣:{{ item.balanceAmount }}<br>
                           跨月打款:{{ item.nextMonthAmount }}
                         </td>
-                        <td style="padding:3pt;width: 94pt;">
+                        <td style="padding:3pt;width: 91pt;">
                           {{ item.bankAccount }}<br>
                           {{ item.bankName }}<br>
                         </td>
@@ -57,19 +57,19 @@
                       </tr>
                     </table>
                     <div style="line-height: 30pt;">附:钉钉审批明细</div>
-                    <table border="1" style="width: 565pt;border-collapse: collapse;text-align: center;">
+                    <table border="1" style="width: 562pt;border-collapse: collapse;text-align: center;">
                       <tr>
                         <th style="line-height: 24pt;width: 110pt;background:#f6f6f6;">人员姓名</th>
                         <th style="line-height: 24pt;width: 110pt;background:#f6f6f6;">人员类型</th>
                         <th style="line-height: 24pt;width: 110pt;background:#f6f6f6;">状态</th>
-                        <th style="line-height: 24pt;width: 120pt;background:#f6f6f6;">审批意见</th>
+                        <th style="line-height: 24pt;width: 117pt;background:#f6f6f6;">审批意见</th>
                         <th style="line-height: 24pt;width: 115pt;background:#f6f6f6;">操作时间</th>
                       </tr>
                       <tr v-for="(item,six) in fcItem.processInstanceTaskList" :key="six+'-processInstanceTask'">
                         <td style="padding:3pt;width: 104pt;">{{ item.userName||'--' }}</td>
                         <td style="padding:3pt;width: 104pt;">{{ item.userType||'--' }}</td>
                         <td style="padding:3pt;width: 104pt;">{{ item.state||'--' }}</td>
-                        <td style="padding:3pt;width: 114pt;">{{ item.remark||'--' }}</td>
+                        <td style="padding:3pt;width: 111pt;">{{ item.remark||'--' }}</td>
                         <td style="padding:3pt;width: 109pt;">{{ item.date||'--' }}</td>
                       </tr>
                     </table>
@@ -115,7 +115,7 @@ export default {
       const html = document.getElementById('sendGood-print').innerHTML
       _this.spinning = true
       // html, type, callback, printLogParams
-      jGPrint(html, 'preview', function (res) {
+      jGPrint(html, 'print', function (res) {
         _this.spinning = false
         _this.handleCommonCancel()
         _this.$emit('printOk')