Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -149,7 +149,7 @@ export const constantRoutes = [
         meta: { title: '使用管理', icon: 'table' }
       },
       {
-        path: 'use-details/:id',
+        path: 'use-details',
         props: true,
         component: () => import('@/views/equipment-management/use-management/use-details'),
         name: 'UseDetails',

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

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >详情</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--  文章信息 -->
           <div class="tip-green" />

src/views/article-management/article-edit.vue

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >编辑</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -154,6 +154,9 @@ export default {
           this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
             type: 'warning'
           }).then(() => {
             updateArticle(this.form).then(response => {
@@ -288,7 +291,9 @@ export default {
     background-color: #F6FCF5 !important;
   }
 }
-
+::v-deep .el-card__body {
+  padding: unset !important;
+}
 //富文本宽设置
 ::v-deep .el-form-item__content {
   width: 700px;

src/views/article-management/article-insert.vue

@@ -3,12 +3,12 @@
   <div class="pet-owner-detail">
     <el-card class="box-card">
       <!--   头部标题-->
-      <div style="padding-top:20px;text-align: center;">
+      <div style="padding-top:32px;text-align: center;">
         <span
           class="top-title-style"
         >新增</span>
       </div>
-      <div style="padding: 20px;">
+      <div style="padding: 32px 20px 20px 20px;">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -256,6 +256,9 @@ export default {
   display: flex;
   text-align: left;
 }
+::v-deep .el-card__body {
+  padding: unset !important;
+}
 
 //小标题样式
 .title-font-style {

src/views/article-management/article-management.vue

@@ -137,7 +137,7 @@
             </el-table-column>
             <el-table-column label="状态" min-width="60" prop="articleStatus" show-overflow-tooltip>
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.article_status" :value="scope.row.articleStatus" />
+                <span :style="showStatus(scope.row.articleStatus) === '• 已上架' ? 'color: #67C23A' : 'color: #F56C6C'">{{ showStatus(scope.row.articleStatus) || '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column class-name="small-padding fixed-width" label="操作" min-width="100">
@@ -306,7 +306,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         articleTitle: null,
         articleCreateTime: null,
         articleStatus: null,
@@ -330,6 +330,16 @@ export default {
     this.getList()
   },
   methods: {
+    // 上架状态 value 和label 的转换
+    showStatus(date) {
+      if (date === null) {
+        return null
+      } else if (date === '0') {
+        return '• 已上架'
+      } else if (date === '1') {
+        return '• 已下架'
+      }
+    },
     cellClass(row) {
       if (row.columnIndex === 0) {
         return 'disabledCheck'

src/views/document-management/about-us/about-us.vue

@@ -57,7 +57,7 @@ export default {
       console.log('隐私协议', this.privacyPolicy)
       // 内容为空不能
       if (this.privacyPolicy.content === null || this.privacyPolicy.content === '' || this.privacyPolicy.content === '<p><br></p>') {
-        this.$modal.msgWarning('内容不能为空')
+        this.$modal.msgError('内容不能为空')
         return
       }
       this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -57,7 +57,7 @@ export default {
       console.log('隐私协议', this.privacyPolicy)
       // 内容为空不能
       if (this.privacyPolicy.content === null || this.privacyPolicy.content === '' || this.privacyPolicy.content === '<p><br></p>') {
-        this.$modal.msgWarning('内容不能为空')
+        this.$modal.msgError('内容不能为空')
         return
       }
       this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {

src/views/document-management/user-protocol/user-protocol.vue

@@ -57,7 +57,7 @@ export default {
       console.log('隐私协议', this.privacyPolicy)
       // 内容为空不能
       if (this.privacyPolicy.content === null || this.privacyPolicy.content === '' || this.privacyPolicy.content === '<p><br></p>') {
-        this.$modal.msgWarning('内容不能为空')
+        this.$modal.msgError('内容不能为空')
         return
       }
       this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {

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

 <template>
   <div>
     <div style="background-color: #fff;height: 100%;margin-top: 20px;">
-      <div style=" text-align: center;padding-top: 30px;height: 100px;">
+      <div style=" text-align: center;padding-top: 35px;height: 100px;">
         <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
       </div>
-      <div style="display: flex; padding-left: 20px;padding-top: 10px;padding-bottom: 10px;">
+      <div style="display: flex; padding-left: 20px;padding-bottom: 10px;">
         <div class="tip1" />
         <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div>
       </div>

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

@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="status">
-        <el-select v-model="queryParams.insureList" placeholder="宠物保险" multiple collapse-tags clearable>
+        <el-select v-model="queryParams.insureList" placeholder="宠物保险" collapse-tags clearable>
           <el-option
             v-for="dict in insureList"
             :key="dict.value"
@@ -41,7 +41,7 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="daterangeCreateTime"
+          v-model="queryParams.reportTime"
           type="date"
           style="width: 240px"
           placeholder="选择检查日期"
@@ -245,8 +245,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        isAsc: '',
-        orderByColumn: '',
+        isAsc: 'desc',
+        orderByColumn: 'c.report_time',
         searchText: '',
         insureList: '',
         checkItemsIdList: '',
@@ -297,8 +297,8 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        isAsc: '',
-        orderByColumn: '',
+        isAsc: 'desc',
+        orderByColumn: 'c.report_time',
         searchText: '',
         insureList: '',
         checkItemsIdList: '',
@@ -307,12 +307,28 @@ export default {
       }
       this.getUseList()
     },
+    // 导出格式化
+    exportFormatTime(date) {
+      // 获取年月日
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1 // 月份从0开始，需要加1
+      var day = date.getDate()
+      // 将年月日格式化为字符串
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      const formattedDate = year.toString() + month.toString() + day.toString()
+      return formattedDate
+    },
     /** 导出按钮操作 */
     handleExport() {
       if (this.ids.length !== 0) {
         const exportTable = {}
         exportTable.useIds = this.ids
-        this.download('business/check/exportUse', exportTable, `use_${new Date().getTime()}.xlsx`).then(res => {
+        this.download('business/check/exportUse', exportTable, `使用管理_${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })
       } else {
@@ -328,10 +344,10 @@ export default {
     },
     // 获取列表数据
     getUseList() {
-      if (this.daterangeCreateTime !== '') {
-        this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
-        this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
-      }
+      // if (this.daterangeCreateTime !== '') {
+      //   this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
+      //   this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
+      // }
       listUseManagement(this.queryParams).then(res => {
         this.total = res.total
         this.userList = res.rows

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

@@ -29,7 +29,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="hospitalName">
+        <el-form-item v-if="!checkRole(['pt-admin'])" prop="hospitalName">
           <el-select v-model="queryParams.hospitalName" clearable placeholder="所属医院">
             <el-option
               v-for="item in HospitalList"
@@ -216,6 +216,8 @@
 <script>
 import { listRecord } from '@/api/business/record'
 import { getDepartment, getDoctorment, getHospital } from '@/api/business/register'
+import { checkRole } from '@/utils/permission'
+import { getInfo } from '@/api/login'
 
 export default {
   name: 'MedicalRecordManagement',
@@ -299,16 +301,20 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+      user: {}
     }
   },
-  created() {
+  async created() {
+    const { user } = await getInfo()
+    this.user = user
     this.getList()
     this.getDoctorList()
     this.getDeptList()
     this.getHospitalList()
   },
   methods: {
+    checkRole,
     /** 查询科室下拉*/
     getDeptList() {
       getDepartment().then(res => {
@@ -324,8 +330,9 @@ export default {
     },
     /** 查询医生名字下拉*/
     getHospitalList() {
-      getHospital().then(res => {
-        this.HospitalList = res.data
+      getHospital().then(({ data }) => {
+        data = data.filter(({ deptId: hospitalDept }) => hospitalDept === this.user.deptId)
+        this.HospitalList = data
         console.log('这是我要的医院下拉框:', this.HospitalList)
       })
     },

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

@@ -10,7 +10,7 @@
       >详情</span>
       <span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span>
     </div>
-    <el-form ref="form" :model="checkDetail" label-width="100px">
+    <el-form ref="form" :model="checkDetail" label-width="70px">
       <div class="title-paragraph">
         <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
       </div>

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

@@ -9,7 +9,7 @@
         color: #333333;"
       >检查项目</span>
     </div>
-    <el-form ref="form" label-width="110px" :model="form" :rules="rules">
+    <el-form ref="form" label-width="90px" :model="form" :rules="rules">
       <!-- 检查项目可以添加n个，所以for循环 -->
       <div
         v-for="(item, index) in form.settingList"

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

@@ -7,9 +7,9 @@
         font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
         font-weight: bold;
         color: #333333;"
-      >立即预约</span>
+      >立即预约</span>·
     </div>
-    <el-form ref="form" :model="checkDetail" label-width="100px">
+    <el-form ref="form" :model="checkDetail" label-width="70px">
       <div class="title-paragraph">
         <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
       </div>

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

@@ -115,6 +115,7 @@
       v-loading="loading"
       :data="manageList"
       :row-key="getRowKeys"
+      :header-cell-class-name="cellClass"
       :header-cell-style="{background:'#E8E9E8'}"
       @selection-change="handleSelectionChange"
     >
@@ -285,8 +286,8 @@
         <el-table-column align="left" label="操作">
           <template slot-scope="scope">
             <el-button
-              class="fourWordsBtn"
-              size="mini"
+              style="color: #5FB54B"
+              type="text"
               @click="handleSubscribeDevice(scope.row)"
             >立即预约
             </el-button>
@@ -440,6 +441,12 @@ export default {
         this.loading = false
       })
     },
+    /** 表单选择框对齐 */
+    cellClass(row) {
+      if (row.columnIndex === 0) {
+        return 'disabledCheck'
+      }
+    },
     // 表格
     getRowKeys(row) {
       return row.id
@@ -615,6 +622,7 @@ export default {
           }
         })
         this.open = false
+        this.getList()
       })
     },
     /** 获取设备列表 */

src/views/service-management/registration-queue/components/register-modle.vue

@@ -289,7 +289,8 @@ export default {
         payStatus: '0',
         // 给传个null
         petPicture: null,
-
+        // 医院地址
+        hosAddress: this.singleDoctor.hosAddress,
         doctorSignatureUrl: this.singleDoctor.doctorSignatureUrl,
         visitLocation: this.singleDoctor.visitLocation,
         doctorTitleLabel: this.singleDoctor.doctorTitleValue

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

@@ -10,7 +10,7 @@
       >详情</span>
       <span style="font-size: 16px;position: absolute;right: 160px;padding-top: 5px;">{{ checkDetail.medicalRecordNo }}</span>
     </div>
-    <el-form ref="form" :model="checkDetail" label-width="100px">
+    <el-form ref="form" :model="checkDetail" label-width="70px">
       <div class="title-paragraph">
         <span class="title-text" style="font-size: 16px;font-weight: bold;">宠物信息</span>
       </div>

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

@@ -9,7 +9,7 @@
         color: #333333;"
       >治疗项目</span>
     </div>
-    <el-form ref="form" label-width="110px" :model="form" :rules="rules">
+    <el-form ref="form" label-width="90px" :model="form" :rules="rules">
       <!-- 检查项目可以添加n个，所以for循环 -->
       <div
         v-for="(item, index) in form.settingList"