Merge branch 'func_eccs_2264' into 'test'

Func eccs 2264

See merge request !47

src/views/charge-query/lpjManage.vue

@@ -45,6 +45,11 @@
             <a-input v-model="form.sendBatchNo" placeholder="请输入寄送批号" allow-clear />
           </a-form-model-item>
         </a-col>
+        <a-col :lg="8" :sm="12">
+          <a-form-model-item label="账单编号">
+            <a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
+          </a-form-model-item>
+        </a-col>
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>

src/views/charge-query/lpjManageDetail.vue

@@ -264,6 +264,7 @@ export default {
             { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
             { title: "状态", dataIndex: "status", key:"status",align:'center', width: 136,scopedSlots: { customRender: "status" } },
             { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
+            { title: "就诊医生", dataIndex: "doctorName", width: 100, align: 'center' },
             { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
             { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
             { title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
@@ -442,8 +443,12 @@ export default {
     },
     //导出
     exportEvt(){
+      let visitTimeStart = this.searchForm.visitTimeStart || []
       this.$apis.SENDRECEIPTLISTEXPORT({
-        sendBatchNo: this.sendBatchNo || undefined
+        sendBatchNo: this.sendBatchNo || undefined,
+        ...this.searchForm,
+        visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
+        visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
       })
       .then(res => {
         let blob = new Blob([res.data], {