Merge remote-tracking branch 'origin/master'

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

@@ -92,6 +92,23 @@
       style="margin: 0 80px 0 0"
       @pagination="getContract"
     />
+    <!-- 合同文件查看 -->
+    <el-dialog
+      title="合同文件"
+      :visible.sync="openContractDocument"
+      :before-close="closeContractDocument"
+      width="50%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <iframe
+        :src="contractDocumentUrl"
+        frameborder="no"
+        style="width: 100%; height: 60vh"
+        scrolling="auto"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -104,6 +121,10 @@ export default {
   name: 'EntryContract',
   data() {
     return {
+      // 控制合同文件对话框
+      openContractDocument: false,
+      // 合同文件路径
+      contractDocumentUrl: null,
       // 图片根据不同环境显示路径
       baseUrl: process.env.VUE_APP_TEST_API,
       // 授权合同
@@ -130,6 +151,11 @@ export default {
     }, 500)
   },
   methods: {
+    // 合同文件查看对话框关闭
+    closeContractDocument() {
+      this.openContractDocument = false
+      this.contractDocumentUrl = null
+    },
     getEntryContract() {
       this.queryParams.hospitalId = this.currentHospitalId
       listNoPageHistory(this.queryParams).then(res => {
@@ -165,9 +191,8 @@ export default {
       })
     },
     check(row) {
-      console.log('pdf', row.contract)
-      console.log('pdf2', this.baseUrl)
-      window.open(this.baseUrl + row.contract)
+      this.openContractDocument = true
+      this.contractDocumentUrl = this.baseUrl + row.contract
     },
     downloadPdf(row) {
       this.$download.resource(row.contract)

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

@@ -279,6 +279,7 @@
       append-to-body
       :close-on-press-escape="false"
       :close-on-click-modal="false"
+      @close="closeSubscribe"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="60px">
         <el-row>
@@ -547,6 +548,13 @@ export default {
       this.currentUser.userType = this.$store.state.user.userType
       this.currentUser.name = this.$store.state.user.name
     },
+    // 立即预约对话框关闭回调函数
+    closeSubscribe() {
+      this.form = {
+        equipmentIdList: [],
+        checkDate: null
+      }
+    },
     /** 获取当前医院信息 */
     getHospitalMessage() {
       signHospitalMessage().then(response => {