Merge branch 'func-ECCS-2380' into test

src/views/charge-query/lpjManage.vue

@@ -4,12 +4,17 @@
     <!-- form -->
     <a-form-model ref="form" layout="vertical" :model="form">
       <a-row :gutter="30">
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="就诊日期">
             <a-range-picker format="YYYY年MM月DD日" v-model="form.dateRange"  :placeholder="['开始日期', '结束日期']" />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="账单日期">
+              <a-range-picker format="YYYY年MM月DD日" value-format="YYYY年MM月DD日" v-model="form.billDate" :placeholder="['选择账单开始日期', '选择账单结束日期']" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
             <a-select v-model="form.payorCode" placeholder="请选择保险公司" showSearch allowClear optionFilterProp="label">
               <a-select-option v-for="item in companyOptions" :key="item.longName" :value="item.payorCode" :label="item.longName">
@@ -18,7 +23,7 @@
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="寄送状态">
             <a-select v-model="form.sendSts" placeholder="请选择寄送状态" allowClear>
               <a-select-option value="1">已寄送</a-select-option>
@@ -28,28 +33,38 @@
         </a-col>
       </a-row>
       <a-row :gutter="30">
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="快递公司">
             <a-select v-model="form.sendCompany" placeholder="请选择快递公司" showSearch allowClear>
               <a-select-option v-for="(item) in expressList" :key="item.id" :value="item.descCh">{{item.descCh}}</a-select-option>
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="快递单号">
             <a-input v-model="form.trackingNo" placeholder="请输入快递单号" allow-clear />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="寄送批号">
             <a-input v-model="form.sendBatchNo" placeholder="请输入寄送批号" allow-clear />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="8" :sm="12">
+        <a-col :lg="6" :sm="12">
           <a-form-model-item label="账单编号">
             <a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
           </a-form-model-item>
         </a-col>
+        <a-col :lg="6" :sm="12">
+            <a-form-model-item label="病案号">
+                <a-input v-model="form.mrnNo" placeholder="请输入病案号" allow-clear />
+            </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+            <a-form-model-item label="客户名称">
+                <a-input v-model="form.patientName" placeholder="请输入客户名称" allow-clear />
+            </a-form-model-item>
+        </a-col>
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>
@@ -106,6 +121,7 @@ export default {
       columns,
       form: {
         dateRange: [],
+        billDate:[],
         payorCode: '',
         sendBatchNo: '',
         sendCompany: '',
@@ -140,6 +156,8 @@ export default {
         ...this.form,
         visitTimeStart: this.form.dateRange[0]?moment(this.form.dateRange[0]).format('YYYY-MM-DD 00:00:00'):'',
         visitTimeEnd: this.form.dateRange[1]?moment(this.form.dateRange[1]).format('YYYY-MM-DD 00:00:00'):'',
+        receiptEndDate: this.form.billDate[1] ? moment(this.form.billDate[1]).format('YYYY-MM-DD 00:00:00'):'',
+				receiptStartDate: this.form.billDate[0] ? moment(this.form.billDate[0]).format('YYYY-MM-DD 00:00:00'):''
       }
       delete filter.dateRange;
       this.$apis.QUERYSENDINFOLIST(filter)