lilei 1 year ago
parent
commit
cdb9b754d5

+ 2 - 2
src/views/reportData/tireSalesReport/dealerList.vue

@@ -79,9 +79,9 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :rowKey="(record) => record.salesBillNo"
+          :rowKey="(record) => record.no"
           :style="{ height: tableHeight+70+'px' }"
-          rowKeyName="salesBillNo"
+          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight-30 }"

+ 2 - 2
src/views/reportData/tireSalesReport/subareaList.vue

@@ -59,9 +59,9 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :rowKey="(record) => record.salesBillNo"
+          :rowKey="(record) => record.no"
           :style="{ height: tableHeight+70+'px' }"
-          rowKeyName="salesBillNo"
+          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight-30 }"

+ 22 - 10
src/views/salesManagement/receiptPrint/list.vue

@@ -298,23 +298,33 @@ export default {
       const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
       console.log(auditInfo)
       bookSns.map(item => {
-        // 授信明细
+        // 授信明细,还款明细
         const rs = rows.filter(a => a.bookSn == item)
         let detailItemUseStr = ''
+        let detailPayUseStr = ''
         rs.map(b => {
           if (b.detailItemUseList) {
-            b.detailItemUseList.map((k, i) => {
-              detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ')' + (i == b.detailItemUseList.length - 1 ? '。' : ';')
-            })
+            detailItemUseStr = this.getUseDetailInfo(b.detailItemUseList)
+          }
+          if(b.detailItemPayList){
+            detailPayUseStr = this.getUseDetailInfo(b.detailItemPayList)
           }
         })
         // 审核信息
         const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
-        retArr.push({ audit: auditStr, detail: detailItemUseStr, subList: rs })
+        retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail:detailPayUseStr, subList: rs })
       })
       console.log(retArr, '------------')
       this.handlePrint(retArr, 1, rows, bookSns)
     },
+    // 获取授信西悉尼
+    getUseDetailInfo(list){
+      let ret = ''
+      list.map((k, i) => {
+        ret = ret + k.itemName + '(' + k.itemAmount + ')' + (i == list.length - 1 ? '。' : ';')
+      })
+      return ret
+    },
     // 获取审核信息
     getAuditInfo (auditList) {
       let auditStr = ''
@@ -353,16 +363,18 @@ export default {
       this.spinning = true
       this.showTipModal = true
       let detailItemUseStr = ''
-
+      let detailPayUseStr = ''
       this.$nextTick(() => {
+        // type == 0 单个打印时
         if (type == 0 && row.detailItemUseList) {
-          row.detailItemUseList.map(k => {
-            detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ');'
-          })
+          detailItemUseStr = this.getUseDetailInfo(row.detailItemUseList)
+        }
+        if (type == 0 && row.detailItemPayList) {
+          detailPayUseStr = this.getUseDetailInfo(row.detailItemPayList)
         }
         // 审核信息
         const auditStr = auditInfo ? this.getAuditInfo(auditInfo[list.bookSn]) : ''
-        this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, subList: [row] }], type ? list : [list])
+        this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: [row] }], type ? list : [list])
       })
     },
     printOk (res) {

+ 4 - 1
src/views/salesManagement/receiptPrint/printModel.vue

@@ -62,7 +62,10 @@
                         <td style="padding:3pt 1pt;width: 54pt;word-break:break-all;">{{ item.explainInfo }}</td>
                       </tr>
                     </table>
-                    <div style="padding:5pt 0;border-bottom: 1px solid #333;">使用授信明细:{{ fcItem.detail||'暂无。' }}</div>
+                    <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>
                     <div style="padding:5pt 0;">
                       审批人员:{{ fcItem.audit||'暂无。' }}
                     </div>