Merge branch 'func-eccs-1883-1886' into test

src/views/charge-query/index.vue

@@ -55,7 +55,43 @@
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="16" :lg="12" :sm="12" class="none-label">
+        <a-col :xl="3" :lg="6" :sm="12">
+          <a-form-model-item label="是否已寄送">
+            <a-select v-model="form.isSend" placeholder="请选择是否已寄送" allowClear>
+              <a-select-option  value="Y" allow-clear>
+                是
+              </a-select-option>
+              <a-select-option  value="N" allow-clear>
+                否
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :xl="3" :lg="6" :sm="12">
+          <a-form-model-item label="是否已关联EOB">
+            <a-select v-model="form.isEob" placeholder="请选择是否已关联EOB" allowClear>
+              <a-select-option  value="Y" allow-clear>
+                是
+              </a-select-option>
+              <a-select-option  value="N" allow-clear>
+                否
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :xl="3" :lg="6" :sm="12">
+          <a-form-model-item label="是否已回款">
+            <a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear>
+              <a-select-option  value="Y" allow-clear>
+                是
+              </a-select-option>
+              <a-select-option  value="N" allow-clear>
+                否
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :xl="6" :lg="3" :sm="3" class="none-label">
           <a-form-model-item label="button">
             <!-- <a-button>更新数据</a-button> -->
             <!-- <a-button class="mar-left10" type="primary" @click="addNewCharge">
@@ -83,6 +119,15 @@
           <a-button type="link" class="danger">删除</a-button>
         </a-popconfirm> -->
       </template>
+      <template slot="isSend" slot-scope="text">
+        {{text == 'Y' ? '是' : text == 'N' ? '否' : ''}}
+      </template>
+      <template slot="isEob" slot-scope="text">
+        {{text == 'Y' ? '是' : text == 'N' ? '否' : ''}}
+      </template>
+      <template slot="isEobBack" slot-scope="text">
+        {{text == 'Y' ? '是' : text == 'N' ? '否' : ''}}
+      </template>
     </a-table>
     <!--分页-->
     <BurtPagination :pagination="pagination" @pageChange="_getChargeList" />
@@ -103,6 +148,9 @@ export default {
       { title: "客户类型", dataIndex: "patientType", width: 180 },
       { title: "保险公司", dataIndex: "payorName", width: 180 },
       { title: "就诊医生", dataIndex: "doctorName", width: 180 },
+      { title: "是否已寄送", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } },
+      { title: "是否已关联EOB", dataIndex: "isEob", width: 180,scopedSlots: { customRender: "isEob" } },
+      { title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } },
       { title: "账单金额", dataIndex: "chargeAmount", width: 180 },
       { title: "折扣（%）", dataIndex: "discountAmount", width: 180 },
       { title: "折后金额", dataIndex: "actualAmount", width: 180 },

src/views/charge-query/lpjManageDetail.vue

@@ -206,7 +206,7 @@ export default {
       isEditNewBill: false, //是否在新建账单
       pagination: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 100,
         total: 0,
       },
       editFormObj: {

src/views/verification/indexDetail.vue

@@ -55,6 +55,21 @@
             </a-upload>
           </a-form-model-item>
         </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="就诊日期起止">
+            <a-range-picker format="YYYY-MM-DD" v-model="form.visitTimeStart" :placeholder="['开始时间','结束时间']"/>
+          </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 :disabled="!isEdit"/>
+          </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 :disabled="!isEdit"/>
+          </a-form-model-item>
+        </a-col>
         <a-col :lg="24" :sm="24" class="none-label" v-if="isEdit">
           <a-form-model-item label="button">
             <a-button class="mar-left10" type="primary" @click="addNewEvt">
@@ -393,6 +408,7 @@ export default {
     },
     //新建/保存EOB
     addNewEvt(){
+      let visitTimeStart = this.form.visitTimeStart || []
       let eobReceiptList = [];
       this.dataList.forEach((item,index)=>{
         if(this.selectedRowKeys.indexOf(index)!=-1){
@@ -410,7 +426,9 @@ export default {
         eobFile: this.form.eobFile.length>0? this.form.eobFile[0].url: '',
         eobReceiptList: eobReceiptList,
         eobDate: this.form.eobDate?moment(this.form.eobDate).format('YYYY-MM-DD 00:00:00'):'',
-        eobNo: this.eobNo
+        eobNo: this.eobNo,
+        visitTimeEnd: visitTimeStart[1] ? moment(visitTimeStart[1]).format('YYYY-MM-DD') + ' 23:59:59' : undefined,
+        visitTimeStart: visitTimeStart[0] ? moment(visitTimeStart[0]).format('YYYY-MM-DD') + ' 00:00:00' : undefined,
       }
       return new Promise((resolve,reject)=>{
         this.$apis.SAVEEOBRECEIPTINFO(formData)