Merge branch 'func_eccs_2264' into 'test'

fix: 增加未关联导出

See merge request !50

src/api/apis_moudles/charge-query.js

@@ -14,6 +14,7 @@ export default {
   queryCiReceipSendList:"/backstage/auth/queryCiReceipSendList",//理赔件账单寄送查询
   receiptSettlement:"/backstage/auth/receiptSettlement",//账单结算
   sendReceipListExport:"/backstage/auth/sendReceipListExport",//寄送关联账单导出
+  noSendReceipListExport:"/backstage/auth/noSendReceipListExport",//寄送未关联账单导出
   receiptPrint:"/backstage/auth/receiptPrint",//账单打印
 	rceiptListReport: '/backstage/auth/rceiptListReport', // 账单导出
 };

src/api/funcs_modules/charge-query.js

@@ -57,6 +57,10 @@ const RECEIPTSETTLEMENT= function (data) {
 const SENDRECEIPTLISTEXPORT= function (data) {
   return req.post(apis.sendReceipListExport, data, { responseType: "blob" });
 };
+// 寄送关联账单导出
+const NOSENDRECEIPTLISTEXPORT= function (data) {
+  return req.post(apis.noSendReceipListExport, data, { responseType: "blob" });
+};
 // 账单打印
 const RECEIPTPRINT= function (data) {
   return req.post(apis.receiptPrint, data);
@@ -84,4 +88,5 @@ export default {
   SENDRECEIPTLISTEXPORT,
   RECEIPTPRINT,
 	RceiptListReport,
+  NOSENDRECEIPTLISTEXPORT,
 };

src/views/charge-query/lpjManageDetail.vue

@@ -444,7 +444,14 @@ export default {
     //导出
     exportEvt(){
       let visitTimeStart = this.searchForm.visitTimeStart || []
-      this.$apis.SENDRECEIPTLISTEXPORT({
+      let api = ''
+      
+      if(!this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
+        api = this.$apis.SENDRECEIPTLISTEXPORT
+      } else {
+        api = this.$apis.NOSENDRECEIPTLISTEXPORT
+      }
+      api({
         sendBatchNo: this.sendBatchNo || undefined,
         ...this.searchForm,
         visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,