Merge branch 'test' of http://git.ssish.com/sunhailiang/bims into test

src/views/verification/indexDetail.vue

@@ -78,20 +78,36 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row :gutter="30">
-        <a-col :md="24" class="none-label">
-          <a-form-model-item label="button">
-            <!-- <a-button class="mar-left10" type="primary" @click="handlerSearch">
-              <Icon name="ssisearch_active" :size="14" />查询
-            </a-button> -->
-            <a-button type="primary" @click="exportEvt">
-              <Icon name="ssidaochu" :size="14" />导出 
-            </a-button>
-            <a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
-              <Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}</a-button>
-          </a-form-model-item>
-        </a-col>
-      </a-row>
+    </a-form-model>
+    <a-form-model ref="form" layout="vertical" :model="searchForm">
+        <a-row :gutter="30">
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="就诊日期">
+                    <a-range-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="searchForm.visitTimeStart" :placeholder="['选择就诊开始日期', '选择就诊结束日期']" />
+                </a-form-model-item>
+            </a-col>
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="病历号">
+                    <a-input v-model="searchForm.mrnNo" placeholder="请输入病历号" allow-clear />
+                </a-form-model-item>
+            </a-col>
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="客户名称">
+                    <a-input v-model="searchForm.patientName" placeholder="请输入客户名称" allow-clear />
+                </a-form-model-item>
+            </a-col>
+        </a-row>
+            <div class="btn-div mar-bottom10 none-label">
+                <a-button type="primary" @click="handlerSearch">
+                    <Icon name="ssisearch_active" :size="14" />查询
+                </a-button>
+                <a-button class="mar-left10" type="primary" @click="exportEvt">
+                    <Icon name="ssidaochu" :size="14" />导出 
+                </a-button>
+                <a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
+                    <Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}
+                </a-button>
+            </div>
     </a-form-model>
     <!-- table -->
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false"
@@ -183,6 +199,7 @@ export default {
       editRules: {
         
       },
+      searchForm:{}
     };
   },
   mixins: [mixins],
@@ -257,7 +274,16 @@ export default {
     },
     handlerSearch() {
       this.pagination.pageNum = 1;
-      this.isEditNewEob = false;
+      let visitTimeStart = this.searchForm.visitTimeStart || []
+      this.searchData = this.$lodash.cloneDeep({
+        ...this.searchForm,
+        visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
+        visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
+      });
+      if(this.isEditNewEob) { // 点击添加EOB之后 分页数据查询就应该调EOB数据
+        this._getNewEOBList()
+        return true;
+      }
       this.getData();
     },
     //回款金额改变
@@ -286,7 +312,8 @@ export default {
        this.$apis.QUERYEOBRECEIPTLIST({
         pageNum: this.pagination.pageNum,
         pageSize: this.pagination.pageSize,
-        eobNo: this.eobNo
+        eobNo: this.eobNo,
+        ...this.searchData
        })
       .then((res) => {
         if (res.returnCode == "0000") {
@@ -394,7 +421,8 @@ export default {
         this.$apis.QUERYEOBNEEDRECEIPTLIST({
           payorCode: this.form.payorCode,
           pageNum: this.pagination.pageNum,
-          pageSize: this.pagination.pageSize
+          pageSize: this.pagination.pageSize,
+          ...this.searchData
         })
         .then((res) => {
           if (res.returnCode == "0000") {
@@ -481,6 +509,9 @@ export default {
   .ant-form-item-label {
     opacity: 0;
   }
+}
+.btn-div{
+
 }
 .ant-btn .icon-class {
   .mg-r(10);