Merge branch 'hotfix_zcy_0411' into test

README.md

@@ -16,13 +16,17 @@
 ### bug文档地址
 > https://doc.weixin.qq.com/sheet/e3_AJUAZgYxAAgc43lZU8US7aQNaosuJ?scode=AMoAawcKABAwUOv0vIACEApQbQAFk&tab=BB08J2
 
-### 测试  npm run build
+### 测试  
+命令：npm run build
+发布： Jenkins-[测试]ECCS-bims
 1. IP: 114.55.4.202
 2. 域名 http://nt.run4wd.com/bims
 3. 登录账密  admin/123456
 4. 发布目录：/datavg/bims/
 
-### 生产  npm run build
+### 生产
+命令：npm run build
+发布： Jenkins-bims
 1. IP: 47.97.62.47
 2. 域名 http://bims.medilink-global.com.cn
 3. 登录账密  admin/123456

src/views/charge-query/lpjManageDetail.vue

@@ -754,8 +754,8 @@ export default {
         admissionDateStart: admissionDateStart[0]
           ? admissionDateStart[0] + ' 00:00:00'
           : undefined,
-        admissionDateEnd: admissionDateStart[0]
-          ? admissionDateStart[0] + ' 23:59:59'
+        admissionDateEnd: admissionDateStart[1]
+          ? admissionDateStart[1] + ' 23:59:59'
           : undefined,
         visitTimeEnd: visitTimeStart[1]
           ? visitTimeStart[1] + ' 23:59:59'

src/views/verification/collectionDetail.vue

@@ -349,13 +349,12 @@
                 </div>
                 <!-- 已关联账单 -->
                 <template v-if="activeKey1 === '0'">
-                  <template v-if="selectedRows.length > 0">
+                  <template>
                     <div class="all-list_box">
                       <a-virtual-table
                         class="table-content"
-                        :rowClassName="rowClassName"
                         :columns="selectedColumns"
-                        :data-source="selectedRows"
+                        :data-source="showRows"
                         :itemSize="46"
                         keyProp="id"
                         row-key="id"
@@ -390,9 +389,9 @@
                       <!-- s -->
                     </div>
                   </template>
-                  <div class="all-list_box no-data" v-else>
+                  <!-- <div class="all-list_box no-data" v-else>
                     <a-empty :image="simpleImage" />
-                  </div>
+                  </div> -->
                 </template>
                 <template v-else>
                   <!-- table -->
@@ -492,6 +491,7 @@ export default {
       },
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [], // Check here to configure the default column
+      showRows: [], // 显示的行
       backMoneyNo: '',
       rules: {
         payorCode: [
@@ -517,6 +517,7 @@ export default {
       },
       savedStatus: false, //是否已保存
       relatedList: [],
+      selectRows: [],
 
       panes: Object.seal(panes),
       activeKey: '0',
@@ -788,6 +789,12 @@ export default {
         hasBack: 'N'
       }
       this.searchData('init')
+    },
+    selectedRows: {
+      handler(val) {
+        this.showRows = val.filter((item) => !item.hidden)
+      },
+      immediate: true
     }
   },
   created() {
@@ -823,13 +830,12 @@ export default {
   mounted() {
     window.addEventListener('resize', this.resizePage)
     this.calcTableHeight()
-    this._getNewEOBList()
   },
   methods: {
     moment,
     resizePage() {
       this.calcTableHeight()
-      this.getData()
+      this.searchData()
     },
     // 切换是否已回款
     changeHasBack(e) {
@@ -852,6 +858,7 @@ export default {
     },
     // 计算表格最大高度
     calcTableHeight() {
+      console.log('1111')
       const dom = this.$refs.burt
       const containterH = dom.clientHeight
       const gobackH = document.querySelector('.back-container').clientHeight
@@ -860,7 +867,7 @@ export default {
       const paddingB = parseFloat(style.getPropertyValue('padding-bottom'))
       const paddingSum = paddingT + paddingB
       this.tableHeight = containterH - 340 - gobackH - paddingSum
-      this.tableHeight1 = containterH - 360 - gobackH - paddingSum
+      this.tableHeight1 = containterH - 400 - gobackH - paddingSum
       console.log(this.tableHeight, '=========tableHeight')
       // 设置每页展示条数
       const pageSize = Math.floor((this.tableHeight1 - 10) / 32)
@@ -872,6 +879,7 @@ export default {
     },
     // 账单查询
     searchData(type) {
+      debugger
       if (type === 'init') {
         this.pagination.pageNum = 1
       }
@@ -1386,7 +1394,13 @@ export default {
     }
   }
   .pagination {
+    width: 100%;
+    position: fixed;
+    bottom: 30px;
+    right: 50px;
     margin-top: 10px;
+    z-index: 10;
+    background-color: #fff;
     ::v-deep .jump-page {
       height: 30px;
     }