Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -253,7 +253,7 @@ export class TransactionFlowComponent implements OnInit {
                 bankType: item.bankType,
                 rmYll: item.roleId,
                 snglFlgCd: item.channelPaySn,
-                bussType: '07',
+                bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07',
                 ltdId: item.ltdId
               })
           }

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts

@@ -352,7 +352,7 @@ export class CancellationInvoiceComponent implements OnInit {
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
       },
       { title: '服务名称', index: 'vatname', width: 100 },
-      { title: '销货清单', index: 'isdetail', width: 90 },
+      { title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
       { title: '票面备注', render: 'vatremarks', width: 250 },
       { title: '其他要求', index: 'otherremarks', width: 100 },
       {