Merge remote-tracking branch 'origin/master'

src/views/document-management/entry-contract/entry-contract.vue

@@ -107,7 +107,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         hospitalId: null
       },
       id: null
@@ -133,6 +133,7 @@ export default {
       })
     },
     getContract() {
+      this.getEntryContract()
       console.log('xxxx', this.currentHospitalId)
       this.queryParams.hospitalId = this.currentHospitalId
       listHistory(this.queryParams).then(res => {
@@ -140,12 +141,11 @@ export default {
         this.total = res.total - 1
         console.log('授权历史312', list)
         this.authorizationHistory = list
-        this.authorizationHistory = this.authorizationHistory.filter((obj) => obj.id !== this.id)
+        this.authorizationHistory = list.filter((obj) => obj.id !== this.id)
         console.log('授权合同', this.authorizationHistory)
         console.log('入驻合同', this.entryContract)
         this.loading = false
       })
-      this.getEntryContract()
     },
     getCurrentHospital() {
       listGetUserInfo().then(res => {

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -116,7 +116,7 @@
       :data="manageList"
       :row-key="getRowKeys"
       :header-cell-class-name="cellClass"
-      :header-cell-style="{background:'#e5e5e5'}"
+      :header-cell-style="{background:'#E8E9E8'}"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
@@ -268,7 +268,8 @@
       <el-table
         :data="deviceList"
         style="width: 100%"
-        :header-cell-style="{background:'#e5e5e5'}"
+        :header-cell-style="{background:'#E8E9E8'}"
+        empty-text="当前暂无可预约设备"
       >
         <el-table-column prop="deviceName" align="left" label="设备名称" />
         <el-table-column prop="checkDate" align="left" label="检查日期">