Merge branch 'func_eccs_2803' into test

src/views/charge-query/lpjManageDetail.vue

@@ -196,6 +196,16 @@
             </a-select>
           </a-form-model-item>
         </a-col>
+        <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.admissionDateStart"
+              :placeholder="['选择开始日期', '选择结束日期']"
+            />
+          </a-form-model-item>
+        </a-col>
       </a-row>
       <a-row :gutter="30">
         <a-col :sm="24" class="none-label">
@@ -468,6 +478,12 @@ export default {
           fixed: 'left',
           width: 120
         },
+        {
+          title: '就诊日期',
+          dataIndex: 'admissionDate',
+          fixed: 'left',
+          width: 120
+        },
         {
           title: '病历号',
           dataIndex: 'mrnNo',
@@ -732,8 +748,15 @@ export default {
     handlerSearch() {
       this.pagination.pageNum = 1
       let visitTimeStart = this.searchForm.visitTimeStart || []
+      let admissionDateStart = this.searchForm.admissionDateStart || []
       this.searchData = this.$lodash.cloneDeep({
         ...this.searchForm,
+        admissionDateStart: admissionDateStart[0]
+          ? admissionDateStart[0] + ' 00:00:00'
+          : undefined,
+        admissionDateEnd: admissionDateStart[0]
+          ? admissionDateStart[0] + ' 23:59:59'
+          : undefined,
         visitTimeEnd: visitTimeStart[1]
           ? visitTimeStart[1] + ' 23:59:59'
           : undefined,

src/views/verification/collectionDetail.vue

@@ -14,7 +14,7 @@
                     allow-clear
                     show-search
                     :disabled="!isEdit"
-                    style="min-width: 200px; max-width: 250px"
+                    style="width: 200px"
                     @change="changePayor"
                     :filterOption="filterCode"
                   >
@@ -133,8 +133,9 @@
                     placeholder="请选择保险公司"
                     allow-clear
                     show-search
+                    :dropdownMatchSelectWidth="false"
                     :disabled="!isEdit"
-                    style="min-width: 200px"
+                    style="width: 200px"
                     @change="changePayor"
                     :filterOption="filterCode"
                   >
@@ -283,13 +284,23 @@
                             />
                           </a-form-model-item>
                         </a-col>
+                        <a-col :lg="6" :sm="12" v-if="activeKey1 === '1'">
+                          <a-form-model-item label="就诊日期">
+                            <a-range-picker
+                              format="YYYY-MM-DD"
+                              value-format="YYYY-MM-DD"
+                              v-model="searchForm.admissionDateStart"
+                              :placeholder="['选择开始日期', '选择结束日期']"
+                            />
+                          </a-form-model-item>
+                        </a-col>
                         <a-col :lg="6" :sm="12" v-if="activeKey1 === '1'">
                           <a-form-model-item label="" class="mar_l40">
                             <a-checkbox
                               :checked="searchForm.hasBack == 'Y'"
                               @change="($event) => changeHasBack($event)"
                             />
-                            <span class="lable">是否已回款</span>
+                            <span class="lable">已回款</span>
                           </a-form-model-item>
                         </a-col>
                         <a-col class="flex-col" :lg="4" :sm="12">
@@ -540,6 +551,12 @@ export default {
           width: 180,
           scopedSlots: { customRender: 'patientName' }
         },
+        {
+          title: '就诊日期',
+          dataIndex: 'admissionDate',
+          ellipsis: true,
+          width: 160
+        },
         { title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 },
         {
           title: '保险公司',
@@ -741,6 +758,7 @@ export default {
         patientName: '', // 客户名字
         hasBack: 'N'
       }
+      this.searchData()
     }
   },
   created() {
@@ -807,8 +825,8 @@ export default {
       const paddingT = parseFloat(style.getPropertyValue('padding-top'))
       const paddingB = parseFloat(style.getPropertyValue('padding-bottom'))
       const paddingSum = paddingT + paddingB
-      this.tableHeight = containterH - 300 - gobackH - paddingSum
-      this.tableHeight1 = containterH - 340 - gobackH - paddingSum
+      this.tableHeight = containterH - 380 - gobackH - paddingSum
+      this.tableHeight1 = containterH - 420 - gobackH - paddingSum
       // 设置每页展示条数
       const pageSize = Math.floor((this.tableHeight1 - 10) / 32)
       this.$set(this.pagination, 'pageSize', pageSize)
@@ -901,6 +919,7 @@ export default {
     // 全选
     selectAllList() {
       let billDate = this.searchForm.billDate || []
+      let admissionDateStart = this.searchForm.admissionDateStart || []
       this.$apis
         .queryReceiptInfoList({
           pageNum: 1,
@@ -909,7 +928,13 @@ export default {
           payorCode: this.form.payorCode,
           ...this.searchForm,
           receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
-          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
+          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
+          admissionDateStart: admissionDateStart[0]
+            ? admissionDateStart[0] + ' 00:00:00'
+            : undefined,
+          admissionDateEnd: admissionDateStart[1]
+            ? admissionDateStart[1] + ' 23:59:59'
+            : undefined
         })
         .then((res) => {
           if (res.returnCode == '0000') {
@@ -1007,6 +1032,7 @@ export default {
         return
       }
       let billDate = this.searchForm.billDate || []
+      let admissionDateStart = this.searchForm.admissionDateStart || []
       this.$apis
         .queryBackReceiptList({
           pageNum: 1,
@@ -1014,7 +1040,13 @@ export default {
           backMoneyNo: this.backMoneyNo,
           ...this.searchForm,
           receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
-          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
+          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
+          admissionDateStart: admissionDateStart[0]
+            ? admissionDateStart[0] + ' 00:00:00'
+            : undefined,
+          admissionDateEnd: admissionDateStart[1]
+            ? admissionDateStart[1] + ' 23:59:59'
+            : undefined
         })
         .then((res) => {
           if (res.returnCode == '0000') {
@@ -1028,6 +1060,12 @@ export default {
                 : undefined,
               receiptStartDate: billDate[0]
                 ? billDate[0] + ' 00:00:00'
+                : undefined,
+              admissionDateStart: admissionDateStart[0]
+                ? admissionDateStart[0] + ' 00:00:00'
+                : undefined,
+              admissionDateEnd: admissionDateStart[1]
+                ? admissionDateStart[1] + ' 23:59:59'
                 : undefined
             })
             const list = res.content.list || []
@@ -1047,6 +1085,7 @@ export default {
     // 获取所有账单
     _getNewEOBList() {
       let billDate = this.searchForm.billDate || []
+      let admissionDateStart = this.searchForm.admissionDateStart || []
       this.$apis
         .queryReceiptInfoList({
           pageNum: this.pagination.pageNum,
@@ -1055,7 +1094,13 @@ export default {
           payorCode: this.form.payorCode,
           ...this.searchForm,
           receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
-          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
+          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
+          admissionDateStart: admissionDateStart[0]
+            ? admissionDateStart[0] + ' 00:00:00'
+            : undefined,
+          admissionDateEnd: admissionDateStart[1]
+            ? admissionDateStart[1] + ' 23:59:59'
+            : undefined
         })
         .then((res) => {
           if (res.returnCode == '0000') {
@@ -1070,6 +1115,12 @@ export default {
                 : undefined,
               receiptStartDate: billDate[0]
                 ? billDate[0] + ' 00:00:00'
+                : undefined,
+              admissionDateStart: admissionDateStart[0]
+                ? admissionDateStart[0] + ' 00:00:00'
+                : undefined,
+              admissionDateEnd: admissionDateStart[1]
+                ? admissionDateStart[1] + ' 23:59:59'
                 : undefined
             })
             let content = res.content || {}