Browse Source

打印修改

lilei 2 năm trước cách đây
mục cha
commit
81bf9a92d3

+ 7 - 2
src/libs/JGPrint.js

@@ -122,8 +122,13 @@ export const jGPrint = function (data, type, callback, printLogParams,printPageS
          callback()
        }
     };
-    LODOP.ADD_PRINT_HTM(0, 0, '98%', '', data)
-    LODOP.SET_PRINT_PAGESIZE(printPageSize||1,2090,printPageSize?100:40,"");
+    if(printPageSize){
+      LODOP.ADD_PRINT_HTM(0,0,'100%','99%',data);
+      LODOP.SET_PRINT_PAGESIZE(3,'210mm',100,"")
+    }else{
+      LODOP.ADD_PRINT_HTM(0,0,'100%','99%',data);
+      LODOP.SET_SHOW_MODE("BKIMG_PRINT",0);
+    }
     if (type == 'preview') { //  预览
       LODOP.PREVIEW()
     } else if (type == 'print') { //  打印

+ 14 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -241,7 +241,20 @@ export default {
         dispatchBillSn: this.outBizSubSn || this.bizSn || this.$route.params.sn
       }
       _this.spinning = true
-      printFun(dispatchDetailPrint, Object.assign(params, obj || {}), type, taskName, () => { _this.spinning = false })
+      printFun(
+        dispatchDetailPrint,
+        Object.assign(params, obj || {}),
+        type,
+        taskName,
+        (res) => {
+          _this.$message.info(res.message)
+          _this.spinning = false
+        },
+        {
+          billType: 'ALLOCATE',
+          dispatchBillSn: params.dispatchBillSn,
+          printType: taskName + '打印'
+        })
     }
   },
   mounted () {

+ 79 - 72
src/views/salesManagement/receiptPrint/printModel.vue

@@ -1,77 +1,84 @@
 <template>
   <!-- 发货打印 -->
   <div>
-    <a-spin :spinning="spinning" tip="Loading..." id="sendGood-print" style="height: 60vh;overflow: auto;width: 100%;padding:20px 40px;">
-      <div class="print-box" style="width: 100%;font-size: 10pt;" v-if="detail">
-        <h1 style="text-align:center;">销 售 收 款 凭 证</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>
-          <div style="width: 50%;">支付方式:{{ detail.settleStyleDictValue||'--' }}</div>
-          <div style="width: 50%;">收货客户名称:{{ detail.receiverName||'--' }}</div>
-          <div style="width: 50%;">发货编号:{{ detail.sendNo||'--' }}</div>
-          <div style="width: 50%;">销售单号:{{ detail.bizNo||'--' }}</div>
-          <div style="width: 50%;">下推单号:{{ detail.dispatchBillNo||'--' }}</div>
-          <div style="width: 50%;">收款类型:{{ detail.keepTypeDictValue||'--' }}</div>
-          <div style="width: 50%;">收款时间:{{ detail.settleTime||'--' }}</div>
-          <div style="width: 50%;">收款人:{{ detail.settlePersonName||'--' }}</div>
-        </div>
-        <!-- 财务收款单 -->
-        <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: 100%;border-collapse: collapse;text-align: center;">
-              <tr>
-                <th style="line-height: 24pt;width: 6%;background:#f6f6f6;">序号</th>
-                <th style="line-height: 24pt;width: 10%;background:#f6f6f6;">日期</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">客户信息</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">收款信息</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">汇入银行</th>
-                <th style="line-height: 24pt;width: 10%;background:#f6f6f6;">足额打款</th>
-                <th style="line-height: 24pt;width: 14%;background:#f6f6f6;">备注</th>
-              </tr>
-              <tr v-for="(item,dindex) in fcItem.financeBookDetailList" :key="item.bookDetailSn">
-                <td style="padding:7px;width: 60px;">{{ dindex+1 }}</td>
-                <td style="padding:7px;width:120px">{{ moment(item.receiptDate).format('M月D日') }}</td>
-                <td style="padding:7px;width: 240px;">
-                  {{ item.dealerEntity.dealerName }}<br>
-                  {{ item.dealerEntity.kdMidCustomerFnumber }}<br>
-                  {{ item.dealerEntity.licenseName }}
-                </td>
-                <td style="padding:7px;width: 150px;">
-                  订单金额:{{ item.orderAmount }}<br>
-                  收款金额:{{ item.receiptAmount }}<br>
-                  使用授信:{{ getTotal(item.detailItemUseList||[]) }}<br>
-                  授信还款:{{ getTotal(item.detailItemPayList||[]) }}<br>
-                  余款抵扣:{{ item.balanceAmount }}<br>
-                  跨月打款:{{ item.nextMonthAmount }}
-                </td>
-                <td style="padding:7px;width: 200px;">
-                  {{ item.bankAccount }}<br>
-                  {{ item.bankName }}<br>
-                </td>
-                <td style="padding:7px;width: 80px;">{{ item.fullPaymentFlagDictValue }}</td>
-                <td style="padding:7px;word-break:break-all;">{{ item.remarks }}</td>
-              </tr>
-            </table>
-            <div style="line-height: 30pt;">附:钉钉审批明细</div>
-            <table border="1" style="width: 100%;border-collapse: collapse;text-align: center;">
-              <tr>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">人员姓名</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">人员类型</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">状态</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">审批意见</th>
-                <th style="line-height: 24pt;width: 20%;background:#f6f6f6;">操作时间</th>
-              </tr>
-              <tr v-for="(item,six) in fcItem.processInstanceTaskList" :key="six+'-processInstanceTask'">
-                <td style="padding:7px;">{{ item.userName||'--' }}</td>
-                <td style="padding:7px;">{{ item.userType||'--' }}</td>
-                <td style="padding:7px;">{{ item.state||'--' }}</td>
-                <td style="padding:7px;">{{ item.remark||'--' }}</td>
-                <td style="padding:7px;">{{ item.date||'--' }}</td>
-              </tr>
-            </table>
-          </div>
-        </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;">
+          <tr>
+            <td>
+              <div class="print-box" style="width: 565pt;font-size: 10pt;">
+                <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>
+                  <div style="width: 50%;">支付方式:{{ detail.settleStyleDictValue||'--' }}</div>
+                  <div style="width: 50%;">收货客户名称:{{ detail.receiverName||'--' }}</div>
+                  <div style="width: 50%;">发货编号:{{ detail.sendNo||'--' }}</div>
+                  <div style="width: 50%;">销售单号:{{ detail.bizNo||'--' }}</div>
+                  <div style="width: 50%;">下推单号:{{ detail.dispatchBillNo||'--' }}</div>
+                  <div style="width: 50%;">收款类型:{{ detail.keepTypeDictValue||'--' }}</div>
+                  <div style="width: 50%;">收款时间:{{ detail.settleTime||'--' }}</div>
+                  <div style="width: 50%;">收款人:{{ detail.settlePersonName||'--' }}</div>
+                </div>
+                <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;">
+                      <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: 60pt;background:#f6f6f6;">足额打款</th>
+                        <th style="line-height: 24pt;width: 95pt;background:#f6f6f6;">备注</th>
+                      </tr>
+                      <tr v-for="(item,dindex) in fcItem.financeBookDetailList" :key="item.bookDetailSn">
+                        <td style="padding:3pt;width: 44pt;">{{ dindex+1 }}</td>
+                        <td style="padding:3pt;width: 54pt;">{{ moment(item.receiptDate).format('M月D日') }}</td>
+                        <td style="padding:3pt;width: 94pt;">
+                          {{ item.dealerEntity.dealerName }}<br>
+                          {{ item.dealerEntity.kdMidCustomerFnumber }}<br>
+                          {{ item.dealerEntity.licenseName }}
+                        </td>
+                        <td style="padding:3pt;width: 94pt;">
+                          订单金额:{{ item.orderAmount }}<br>
+                          收款金额:{{ item.receiptAmount }}<br>
+                          使用授信:{{ getTotal(item.detailItemUseList||[]) }}<br>
+                          授信还款:{{ getTotal(item.detailItemPayList||[]) }}<br>
+                          余款抵扣:{{ item.balanceAmount }}<br>
+                          跨月打款:{{ item.nextMonthAmount }}
+                        </td>
+                        <td style="padding:3pt;width: 94pt;">
+                          {{ item.bankAccount }}<br>
+                          {{ item.bankName }}<br>
+                        </td>
+                        <td style="padding:3pt;width: 54pt;">{{ item.fullPaymentFlagDictValue }}</td>
+                        <td style="padding:3pt;width: 89pt;word-break:break-all;">{{ item.remarks }}</td>
+                      </tr>
+                    </table>
+                    <div style="line-height: 30pt;">附:钉钉审批明细</div>
+                    <table border="1" style="width: 565pt;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: 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: 109pt;">{{ item.date||'--' }}</td>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </table>
       </div>
     </a-spin>
     <div class="btn-box" style="display:flex;align-item:center;justify-content: center;" v-if="detail">
@@ -108,7 +115,7 @@ export default {
       const html = document.getElementById('sendGood-print').innerHTML
       _this.spinning = true
       // html, type, callback, printLogParams
-      jGPrint(html, 'print', function (res) {
+      jGPrint(html, 'preview', function (res) {
         _this.spinning = false
         _this.handleCommonCancel()
         _this.$emit('printOk')