lilei 2 jaren geleden
bovenliggende
commit
54dc0ebc36

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

@@ -236,16 +236,26 @@ 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 = ''
         rs.map(b => {
           if (b.detailItemUseList) {
-            b.detailItemUseList.map(k => {
-              detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ');'
+            b.detailItemUseList.map((k,i) => {
+              detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ')' + (i==b.detailItemUseList.length-1 ? '。':';')
             })
           }
         })
-        retArr.push({ audit: auditInfo[item], detail: detailItemUseStr, subList: rs })
+        // 审核信息
+        let auditStr = ''
+        const auditList = auditInfo[item]
+        if(auditList&&auditList.taskVOList){
+          const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人')
+          auditLists.map((a,i)=>{
+            auditStr = auditStr + a.userName + '(' + a.state + ')' + (i==auditLists.length-1 ? '。':';')
+          })
+        }
+        retArr.push({ audit: auditStr, detail: detailItemUseStr, subList: rs })
       })
       console.log(retArr, '------------')
       this.handlePrint(retArr, 1, rows, bookSns)

+ 2 - 8
src/views/salesManagement/receiptPrint/printModel.vue

@@ -63,14 +63,8 @@
                       </tr>
                     </table>
                     <div style="padding:5pt 0;border-bottom: 1px solid #333;">使用授信明细:{{ fcItem.detail||'暂无。' }}</div>
-                    <div style="padding:5pt 0;" v-if="fcItem.audit&&fcItem.audit.taskVOList">
-                      审批人员:
-                      <span v-for="audit in fcItem.audit.taskVOList" :key="audit.processInstanceId" v-if="audit.userType == '审批人'">
-                        {{ audit.userName }}({{ audit.state }});
-                      </span>
-                    </div>
-                    <div style="padding:5pt 0;" v-else>
-                      审批人员:
+                    <div style="padding:5pt 0;">
+                      审批人员:{{fcItem.audit||'暂无。'}}
                     </div>
                   </div>
                 </div>