Merge remote-tracking branch 'origin/master'

src/components/Editor/index.vue

@@ -22,6 +22,8 @@ import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
 import { getToken } from '@/utils/auth'
+import { MessageBox } from 'element-ui'
+import store from '@/store'
 
 export default {
   name: 'Editor',
@@ -186,12 +188,34 @@ export default {
       const quill = this.Quill
       // 如果上传成功
       if (res) {
-        // 获取光标所在位置
-        const length = quill.getSelection().index
-        // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, 'image', process.env.VUE_APP_TEST_API + res)
-        // 调整光标到最后
-        quill.setSelection(length + 1)
+        if (res.code === 401) {
+          if (!sessionStorage.getItem('isRelogin')) {
+            sessionStorage.setItem('isRelogin', 'true')
+            MessageBox.confirm(
+              '登录状态已过期，您可以继续留在该页面，或者重新登录',
+              '系统提示',
+              {
+                confirmButtonText: '重新登录',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                cancelButtonClass: 'resetBtn',
+                confirmButtonClass: 'queryBtn', type: 'warning' }).then(() => {
+              sessionStorage.setItem('isRelogin', '')
+              store.dispatch('LogOut').then(() => {
+                location.href = '/index'
+              })
+            }).catch(() => {
+              sessionStorage.setItem('isRelogin', '')
+            })
+          }
+        } else {
+          // 获取光标所在位置
+          const length = quill.getSelection().index
+          // 插入图片  res.url为服务器返回的图片地址
+          quill.insertEmbed(length, 'image', process.env.VUE_APP_TEST_API + res)
+          // 调整光标到最后
+          quill.setSelection(length + 1)
+        }
       } else {
         this.$message.error('图片插入失败')
       }

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -278,7 +278,7 @@
             </el-table-column>
             <el-table-column sortable label="联系人" align="left" min-width="80" prop="contactPerson" show-overflow-tooltip />
             <el-table-column sortable label="联系人手机号" align="left" min-width="120" prop="phonenumber" />
-            <el-table-column sortable label="医院地址" align="left" min-width="80" prop="hospitalAddress" show-overflow-tooltip>
+            <el-table-column sortable label="医院地址" align="left" min-width="80" prop="hospitalAllAddress" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ scope.row.hospitalAllAddress }}</span>
               </template>
@@ -517,7 +517,7 @@ export default {
       console.log('更换排序', column)
       // 查询字段是表格中字段名字
       if (column.prop === 'hospitalName' ||
-        column.prop === 'hospitalAddress' ||
+        column.prop === 'hospitalAllAddress' ||
         column.prop === 'contactPerson') {
         this.queryParams.orderByColumn = column.prop + 'Sort'
       } else {

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -852,7 +852,11 @@ export default {
     },
     ownerSortChange(column) {
       console.log('更换排序', column)
-      this.queryPetOwner.orderByColumn = column.prop// 查询字段是表格中字段名字
+      if (column.prop === 'name') {
+        this.queryPetOwner.orderByColumn = column.prop + 'Sort'// 查询字段是表格中字段名字
+      } else {
+        this.queryPetOwner.orderByColumn = column.prop// 查询字段是表格中字段名字
+      }
       this.queryPetOwner.isAsc = column.order// 动态取值排序顺序
       this.$refs.ownerList.clearSort()
       this.getOwnerList()

src/views/data-statistics/service-statistics/service-statistics.vue

@@ -1001,7 +1001,11 @@ export default {
     },
     handleSortChangeForPlatform(column) {
       console.log('更换排序', column)
-      if (column.prop === 'checkItemsName') {
+      if (column.prop === 'checkItemsName' ||
+        column.prop === 'deviceName' ||
+        column.prop === 'hospitalName' ||
+        column.prop === 'petNickname' ||
+        column.prop === 'nickname') {
         this.queryOrder.orderByColumn = column.prop + 'Sort' // 查询字段是表格中字段名字
       } else {
         this.queryOrder.orderByColumn = column.prop// 查询字段是表格中字段名字

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

@@ -2424,6 +2424,7 @@ export default {
         delHospital(row.id).then(res => {
           if (res.code === 200) {
             this.getInHospitalList(this.$route.params.id)
+            this.getPaymentList()
           }
         })
       }).catch(() => {

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

@@ -396,7 +396,10 @@ export default {
     validateSort(item) {
       return (rule, value, callback) => {
         console.log('value', value)
-        if (value === 0 && item.itemType !== '2') {
+        const userType = this.$store.state.user.userType
+        if (userType !== '00' && value === 0 && item.itemType !== '2') {
+          callback(new Error('权重不能为0'))
+        } else if (userType === '00' && value === 0) {
           callback(new Error('权重不能为0'))
         } else {
           callback()

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

@@ -334,6 +334,7 @@
 
     <!-- 添加或修改业务管理-检查管理对话框 -->
     <el-dialog
+      class="book-now-class"
       title="立即预约"
       :visible.sync="open"
       min-width="820px"
@@ -432,6 +433,7 @@
                 class="el-button--success--solid--four"
                 plain
                 @click="handleSubscribeDevice(scope.row)"
+                :disabled="accordingToTime(scope.row.checkTime)"
               >立即预约
               </el-button>
             </template>
@@ -620,7 +622,7 @@ export default {
           // 计算的时间
           const startTime = checkTime.split('-')[0]
           // 当前时间
-          const currentDay = new Date().getHours() + ':' + new Date().getMinutes()
+          const currentDay = new Date().getHours() + ':' + String(new Date().getMinutes()).padStart(2, '0')
           // 计算的时间小于当前时间就false
           if (startTime < currentDay) {
             return true
@@ -1047,15 +1049,20 @@ export default {
 
 .app-container {
   background-color: #FFFFFF;
+  .book-now-class {
+    .el-dialog__body {
+      padding: 0;
+      .dialog-class {
+        min-height: 140px;
+        max-height: 500px;
+        overflow-y: auto;
+      }
+    }
+  }
 }
 
 ::v-deep .el-dialog:not(.is-fullscreen) {
   margin-top: 9vh !important;
 }
 
-.dialog-class {
-  min-height: 140px;
-  overflow-y: auto;
-}
-
 </style>