Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -120,7 +120,7 @@ export const constantRoutes = [
 
       },
       {
-        path: 'equipment-detail/:id/:identify',
+        path: 'equipment-detail',
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
         name: 'EquipmentDetail',

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -316,6 +316,7 @@ import { getInfo } from '@/api/login'
 import { isEmpty } from '@/utils/ruoyi'
 import { deepClone } from '@/utils'
 import { listItemByType } from '@/api/business/item'
+import { signHospitalMessage } from '@/api/business/hospital'
 
 export default {
   name: 'EquipmentAdd',
@@ -513,6 +514,7 @@ export default {
   created() {
     this.getUserInfo()
     this.getAreaData()
+    this.getHospital()
   },
   methods: {
     // 获取登陆人信息
@@ -747,6 +749,12 @@ export default {
         console.log('xdddd', this.checkItemOptions)
       })
     },
+    getHospital() {
+      signHospitalMessage().then(res => {
+        console.log('查到医院信息', res)
+      })
+    },
+
     /** 提交按钮 */
     submitForm() {
       const form = deepClone(this.form)

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -628,16 +628,6 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'EquipmentDetail',
   dicts: ['device_status', 'device_type', 'exam_type', 'check_type', 'service_area'],
-  props: {
-    id: {
-      type: Number,
-      required: true
-    },
-    identify: {
-      type: String,
-      required: true
-    }
-  },
   data() {
     return {
       // 日期格式
@@ -836,7 +826,23 @@ export default {
       hpshow: ''
     }
   },
+  mounted() {
+    this.$route.meta.title = '2222'
+  },
   created() {
+    this.$route.meta.title = '2222'
+    console.log('當前router', this.$route)
+    this.id = this.$route.query.id
+    console.log('this.$route.query.id', this.id)
+    this.identify = this.$route.query.identify
+    console.log(' this.$route.query.identify', this.identify)
+    if (this.identify === '1') {
+      // this.$route.meta.title = ''
+      console.log('1')
+    } else if (this.identify === '2') {
+      // this.$route.meta.title = ''
+      console.log('2')
+    }
     this.getAreaData()
     this.handleUpdate()
     this.getUserInfo()

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -112,13 +112,13 @@
           @click="handleExport"
         >批量导出
         </el-button>
-        <el-button
-          v-if="userType==='00'"
-          class="fourWordsBtn"
-          icon="el-icon-download"
-          size="mini"
-          @click="handlecheck"
-        >检查项目</el-button>
+<!--        <el-button-->
+<!--          v-if="userType==='00'"-->
+<!--          class="fourWordsBtn"-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handlecheck"-->
+<!--        >检查项目</el-button>-->
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;text-align: end;">
         <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">查询</el-button>
@@ -585,7 +585,7 @@ export default {
     editDevice(id) {
       this.$router.push({
         name: 'EquipmentDetail',
-        params: {
+        query: {
           identify: '1',
           id: id
         }
@@ -595,7 +595,7 @@ export default {
     detailsDevice(id) {
       this.$router.push({
         name: 'EquipmentDetail',
-        params: {
+        query: {
           identify: '2',
           id: id
         }

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

@@ -344,8 +344,15 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="影像报告" label-width="84px">
-              <!--              <span>{{ checkDetail.shadowReport || '暂未上传' }}</span>-->
-              <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>
+<!--              <el-button v-show="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''" class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
+              <el-link
+                v-shpw="checkDetail.shadowReport !== null && checkDetail.shadowReport !== ''"
+                :href="`${baseUrl}${checkDetail.shadowReport}`"
+                :underline="false"
+                target="_blank"
+              >
+                <span class="el-icon-document">{{ getFileName(checkDetail.shadowReport) }}</span>
+              </el-link>
               <span v-show="checkDetail.shadowReport === null || checkDetail.shadowReport === ''">{{ '暂未上传' }}</span>
             </el-form-item>
           </el-col>
@@ -458,6 +465,14 @@ export default {
         return price.toFixed(2)
       }
     },
+    // 获取文件名称
+    getFileName(name) {
+      if (name.lastIndexOf('/') > -1) {
+        return name.slice(name.lastIndexOf('/') + 1)
+      } else {
+        return ''
+      }
+    },
     // 点击 预约信息-立即预约
     bookNow() {
       this.$router.push({
@@ -547,4 +562,13 @@ export default {
 .input-detail {
   width: 392px;
 }
+.el-icon-document {
+  border: 1px solid #e4e7ed;
+  padding: 10px;
+  background-color: white;
+  transition: background-color 0.3s ease;
+}
+.el-icon-document:hover {
+  background-color: #f6f8fa;
+}
 </style>

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

@@ -273,7 +273,7 @@ export default {
           const today = new Date()
           const maxDate = new Date()
           maxDate.setDate(today.getDate() + 14)
-          return time.getTime() < (today.getTime() - 1000 * 3600 * 24) || time.getTime() > maxDate.getTime()
+          return time.getTime() < (today.getTime() - 1000 * 3600 * 24) || time.getTime() > (maxDate.getTime() - 1000 * 3600 * 24)
         }
       },
       checkDetail: {},

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

@@ -380,7 +380,7 @@ export default {
           const today = new Date()
           const maxDate = new Date()
           maxDate.setDate(today.getDate() + 14)
-          return time.getTime() < (today.getTime() - 1000 * 3600 * 24) || time.getTime() > maxDate.getTime()
+          return time.getTime() < (today.getTime() - 1000 * 3600 * 24) || time.getTime() > (maxDate.getTime() - 1000 * 3600 * 24)
         }
       },
       isPlatRole: false,

src/views/service-management/registration-queue/registration-queue.vue

@@ -205,7 +205,7 @@
               v-hasPermi="['business:registration:edit']"
               icon="el-icon-paperclip"
               plain
-
+              :disabled="scope.row.isAdd === '1'"
               size="mini"
               class="el-button--warning--solid--four"
               type="warning"

src/views/service-management/treatment-management/treatment-detail.vue

@@ -332,7 +332,15 @@
             <el-col :span="8">
               <el-form-item label="治疗日志">
                 <span v-if="checkDetail.shadowReport===''||checkDetail.shadowReport===null">{{ '暂未上传' }}</span>
-                <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>
+<!--                <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>-->
+                <el-link
+                  v-else
+                  :href="`${baseUrl}${checkDetail.shadowReport}`"
+                  :underline="false"
+                  target="_blank"
+                >
+                  <span class="el-icon-document">{{ getFileName(checkDetail.shadowReport) }}</span>
+                </el-link>
               </el-form-item>
             </el-col>
           </el-row>
@@ -717,6 +725,14 @@ export default {
 
       return totalHours
     },
+    // 获取文件名称
+    getFileName(name) {
+      if (name.lastIndexOf('/') > -1) {
+        return name.slice(name.lastIndexOf('/') + 1)
+      } else {
+        return ''
+      }
+    },
     // 获取负责人下拉框
     getUserNameList() {
       userNameList({ status: '0' }).then(res => {
@@ -939,4 +955,13 @@ export default {
 .input-detail {
   width: 392px;
 }
+.el-icon-document {
+  border: 1px solid #e4e7ed;
+  padding: 10px;
+  background-color: white;
+  transition: background-color 0.3s ease;
+}
+.el-icon-document:hover {
+  background-color: #f6f8fa;
+}
 </style>