Merge branch 'eccs-2936' into test

src/views/charge-query/index.vue

@@ -532,15 +532,25 @@ export default {
         this.getReceiptCount()
       })
     },
-    // 新建账单信息
-    addNewCharge() {
-      // this.$router.push("/customer/edit");
-    },
+
     //导出报表
     exportExcel() {
       let filter = {
-        ...this.form
+        ...this.form,
+        admissionDateStart:
+          this.form.admissionDateArr && this.form.admissionDateArr[0]
+            ? moment(this.form.admissionDateArr[0]).format(
+                'YYYY-MM-DD 00:00:00'
+              )
+            : '',
+        admissionDateEnd:
+          this.form.admissionDateArr && this.form.admissionDateArr[1]
+            ? moment(this.form.admissionDateArr[1]).format(
+                'YYYY-MM-DD 23:59:59'
+              )
+            : ''
       }
+      delete filter.admissionDateArr
       this.$apis.rceiptListReport(filter).then((res) => {
         exportFile(res, '账单报表.xls')
       })