lilei 1 سال پیش
والد
کامیت
31a4848847
2فایلهای تغییر یافته به همراه32 افزوده شده و 31 حذف شده
  1. 2 3
      src/views/salesManagement/receiptPrint/list.vue
  2. 30 28
      src/views/salesManagement/receiptPrint/printModel.vue

+ 2 - 3
src/views/salesManagement/receiptPrint/list.vue

@@ -321,14 +321,13 @@ export default {
         const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
         const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
         retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: rs })
         retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: rs })
       })
       })
-      console.log(retArr, '------------')
       this.handlePrint(retArr, 1, rows, bookSns)
       this.handlePrint(retArr, 1, rows, bookSns)
     },
     },
     // 获取授信西悉尼
     // 获取授信西悉尼
     getUseDetailInfo (list) {
     getUseDetailInfo (list) {
       let ret = ''
       let ret = ''
       list.map((k, i) => {
       list.map((k, i) => {
-        ret = ret + k.itemName + '(' + k.itemAmount + ')' + (i == list.length - 1 ? '' : ',')
+        ret = ret + k.itemName + '(' + k.itemAmount + ')' + (i == list.length - 1 ? '' : ',')
       })
       })
       return ret
       return ret
     },
     },
@@ -338,7 +337,7 @@ export default {
       if (auditList && auditList.taskVOList) {
       if (auditList && auditList.taskVOList) {
         const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人')
         const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人')
         auditLists.map((a, i) => {
         auditLists.map((a, i) => {
-          auditStr = auditStr + a.userName + '(' + a.state + ')' + (i == auditLists.length - 1 ? '' : ',')
+          auditStr = auditStr + a.userName + '(' + a.state + ')' + (i == auditLists.length - 1 ? '' : ',')
         })
         })
       }
       }
       return auditStr
       return auditStr

+ 30 - 28
src/views/salesManagement/receiptPrint/printModel.vue

@@ -11,63 +11,65 @@
           ref="printBox"
           ref="printBox"
           cellspacing="0"
           cellspacing="0"
           cellpadding="0"
           cellpadding="0"
-          style="border-collapse: collapse;width: 564pt;font-size:14px;">
+          style="border-collapse: collapse;width: 564pt;font-size:14px;line-height: normal;">
           <tr>
           <tr>
             <td>
             <td>
               <div class="print-box" style="width: 564pt;margin-left:1.5pt;">
               <div class="print-box" style="width: 564pt;margin-left:1.5pt;">
-                <div style="text-align:center;margin:5pt 0;font-size:22px;font-weight: bold;">收款通知单</div>
+                <div style="text-align:center;margin:5pt 0;font-size:20px;font-weight: bold;">收款通知单</div>
                 <div>
                 <div>
                   <div>
                   <div>
                     <table border="1" style="width: 564pt;border-collapse: collapse;text-align: center;">
                     <table border="1" style="width: 564pt;border-collapse: collapse;text-align: center;">
                       <tr>
                       <tr>
-                        <th style="width: 56pt;background:#f6f6f6;">日期</th>
-                        <th style="width: 62pt;background:#f6f6f6;">客户名称</th>
-                        <th style="width: 62pt;background:#f6f6f6;">营业执照名称</th>
-                        <th style="width: 54pt;background:#f6f6f6;">订单金额</th>
-                        <th style="width: 54pt;background:#f6f6f6;">收款金额</th>
-                        <th style="width: 54pt;background:#f6f6f6;">使用授信</th>
-                        <th style="width: 54pt;background:#f6f6f6;">余款抵扣</th>
-                        <th style="width: 54pt;background:#f6f6f6;">汇入银行</th>
-                        <th style="width: 54pt;background:#f6f6f6;">足额打款</th>
-                        <th style="width: 60pt;background:#f6f6f6;">说明</th>
+                        <th style="width: 36pt;background:#f6f6f6;">日期</th>
+                        <th style="width: 60pt;background:#f6f6f6;">客户名称</th>
+                        <th style="width: 60pt;background:#f6f6f6;">营业执照<br>名称</th>
+                        <th style="width: 52pt;background:#f6f6f6;">订单金额</th>
+                        <th style="width: 52pt;background:#f6f6f6;">收款金额</th>
+                        <th style="width: 52pt;background:#f6f6f6;">使用授信</th>
+                        <th style="width: 52pt;background:#f6f6f6;">余款抵扣</th>
+                        <th style="width: 52pt;background:#f6f6f6;">汇入银行</th>
+                        <th style="width: 36pt;background:#f6f6f6;">足额<br>打款</th>
+                        <th style="width: 52pt;background:#f6f6f6;">说明</th>
+                        <th style="width: 60pt;background:#f6f6f6;">收款事由</th>
                       </tr>
                       </tr>
                       <tr v-for="item in fcItem.subList" :key="item.bookDetailSn">
                       <tr v-for="item in fcItem.subList" :key="item.bookDetailSn">
-                        <td style="padding:3pt 1pt;width: 50pt;">{{ moment(item.receiptDate).format('YYYY/MM/DD') }}</td>
-                        <td style="padding:3pt 1pt;width: 56pt;text-align:left;">
+                        <td style="padding:3pt 1pt;width: 34pt;">{{ item.receiptDate.split('-')[0] }}<br>{{ item.receiptDate.split('-')[1]+'/'+item.receiptDate.split('-')[2] }}</td>
+                        <td style="padding:3pt 1pt;width: 58pt;word-break:break-all;">
                           {{ item.payerName }}
                           {{ item.payerName }}
                           <div>
                           <div>
                             {{ item.dealerEntity ? item.dealerEntity.kdMidCustomerFnumber : '' }}
                             {{ item.dealerEntity ? item.dealerEntity.kdMidCustomerFnumber : '' }}
                           </div>
                           </div>
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 56pt;text-align:left;word-break:break-all;">
+                        <td style="padding:3pt 1pt;width: 58pt;word-break:break-all;">
                           {{ item.payerAccountInfo }}
                           {{ item.payerAccountInfo }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
                           {{ item.orderAmount?item.orderAmount.toFixed(2):'0.00' }}
                           {{ item.orderAmount?item.orderAmount.toFixed(2):'0.00' }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
                           {{ item.receiptAmount?item.receiptAmount.toFixed(2):'0.00' }}
                           {{ item.receiptAmount?item.receiptAmount.toFixed(2):'0.00' }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
                           {{ getTotal(item.detailItemUseList||[]) }}
                           {{ getTotal(item.detailItemUseList||[]) }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;text-align:center;">
+                        <td style="padding:3pt 1pt;width: 50pt;text-align:center;">
                           {{ item.balanceAmount?item.balanceAmount.toFixed(2):'0.00' }}
                           {{ item.balanceAmount?item.balanceAmount.toFixed(2):'0.00' }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;">
+                        <td style="padding:3pt 1pt;width: 50pt;">
                           {{ item.bankAccount }}<br>
                           {{ item.bankAccount }}<br>
                           {{ item.bankName }}
                           {{ item.bankName }}
                         </td>
                         </td>
-                        <td style="padding:3pt 1pt;width: 48pt;">{{ item.fullPaymentFlagDictValue }}</td>
-                        <td style="padding:3pt 1pt;width: 54pt;word-break:break-all;">{{ item.explainInfo }}</td>
+                        <td style="padding:3pt 1pt;width: 34pt;">{{ item.fullPaymentFlagDictValue }}</td>
+                        <td style="padding:3pt 1pt;width: 50pt;word-break:break-all;">{{ item.explainInfo }}</td>
+                        <td style="padding:3pt 1pt;width: 58pt;word-break:break-all;">{{ item.bookReason }}</td>
                       </tr>
                       </tr>
                     </table>
                     </table>
-                    <div style="padding:5pt 0;border-bottom: 1px solid #333;">
-                      <div style="width:48%;display:inline-block;">使用授信明细:{{ fcItem.detail||'暂无。' }}</div>
-                      <div style="width:48%;display:inline-block;marign-left:1%;">授信还款明细: {{ fcItem.payDetail||'暂无。' }}</div>
+                    <div style="padding:5pt 0;border-bottom: 1px solid #333;overflow:hidden;">
+                      <div style="width:49%;display:flex;float:left;">使用授信明细:<div>{{ fcItem.detail||'暂无' }}</div></div>
+                      <div style="width:49%;display:flex;float:right;">授信还款明细:<div>{{ fcItem.payDetail||'暂无' }}</div></div>
                     </div>
                     </div>
                     <div style="padding:5pt 0;">
                     <div style="padding:5pt 0;">
-                      审批人员:{{ fcItem.audit||'暂无' }}
+                      审批人员:{{ fcItem.audit||'暂无' }}
                     </div>
                     </div>
                   </div>
                   </div>
                 </div>
                 </div>
@@ -113,8 +115,8 @@ export default {
       this.$store.state.app.curActionPermission = 'B_SkPrint'
       this.$store.state.app.curActionPermission = 'B_SkPrint'
       // html, type, callback, printLogParams
       // html, type, callback, printLogParams
       this.spinning = true
       this.spinning = true
-      jGPlPrint(result, 'print', function (res) {
-        if(res){
+      jGPlPrint(result, 'preview', function (res) {
+        if (res) {
           _this.handleCommonCancel()
           _this.handleCommonCancel()
         }
         }
         _this.$emit('printOk', res)
         _this.$emit('printOk', res)