Merge remote-tracking branch 'origin/master'

src/api/business/banner.js

+import request from '../../../../pet-admin/src/utils/request'
+
+// 查询轮播图管理列表
+export function listBanner(query) {
+  return request({
+    url: '/business/banner/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询轮播图管理详细
+export function getBanner(id) {
+  return request({
+    url: '/business/banner/' + id,
+    method: 'get'
+  })
+}
+
+// 新增轮播图管理
+export function addBanner(data) {
+  return request({
+    url: '/business/banner',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改轮播图管理
+export function updateBanner(data) {
+  return request({
+    url: '/business/banner',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除轮播图管理
+export function delBanner(id) {
+  return request({
+    url: '/business/banner/' + id,
+    method: 'delete'
+  })
+}

src/router/index.js

@@ -253,6 +253,22 @@ export const constantRoutes = [
       }
     ]
   },
+  // 轮播
+  {
+    path: '/banner/management',
+    component: Layout,
+    hidden: true,
+    permissions: ['*:*:*'],
+    children: [
+      {
+        path: 'index',
+        props: true,
+        component: () => import('@/views/banner_management/banner_management.vue'),
+        name: 'banner_management',
+        meta: { title: '轮播管理', icon: 'component' }
+      }
+    ]
+  },
   // 业务管理
   {
     path: '/service-management',

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

@@ -120,14 +120,46 @@
       >
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
-        <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip />
-        <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip />
-        <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip />
-        <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip />
-        <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip />
-        <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip />
-        <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip />
-        <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip />
+        <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.medicalRecordNo || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petsId || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnerPhone || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.hospitalName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.doctorName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.hospitalDepartmentName || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>

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

@@ -8,6 +8,7 @@
         font-weight: bold;
         color: #333333;"
       >详情</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">
       <div class="title-paragraph">
@@ -102,10 +103,10 @@
       <!-- 步骤条 -->
       <div>
         <el-steps :active="schedule" align-center>
-          <el-step title="开具处方单" :description="checkDetail.createTime" />
-          <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />
-          <el-step title="预约检查" :description="checkDetail.checkStartTime || '暂未预约'" />
-          <el-step title="检查获取报告" :description="checkDetail.reportTime || '暂未检查'" />
+          <el-step title="开具处方单" :description="parseTime(checkDetail.createTime, '{y}-{m}-{d} {h}:{i}')" />
+          <el-step title="缴费开票" :description="parseTime(checkDetail.payTime, '{y}-{m}-{d} {h}:{i}') || '暂未缴费'" />
+          <el-step title="预约检查" :description="parseTime(checkDetail.checkStartTime, '{y}-{m}-{d} {h}:{i}') || '暂未预约'" />
+          <el-step title="检查获取报告" :description="parseTime(checkDetail.reportTime, '{y}-{m}-{d} {h}:{i}') || '暂未检查'" />
         </el-steps>
       </div>
       <div class="title-paragraph">

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

@@ -134,10 +134,21 @@
       </el-row>
     </el-form>
     <!-- 设备表格 -->
-    <el-table :data="deviceList">
+    <el-table
+      :data="deviceList"
+      :header-cell-style="{background:'#E8E9E8'}"
+    >
       <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="检查日期" align="center" prop="checkDate" />
-      <el-table-column label="检查时段" align="center" prop="checkTime" />
+      <el-table-column label="检查日期" align="center" prop="checkDate">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="检查时段" align="center" prop="checkTime">
+        <template slot-scope="scope">
+          <span>{{ scope.row.checkTime.replace('-', '~') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="剩余可预约" align="center" prop="num" />
       <el-table-column v-if="subscribeMessage.checkType === '2'" label="设备服务费" align="center" prop="price" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
@@ -217,6 +228,7 @@ export default {
     })
   },
   methods: {
+    parseTime,
     // 点击立即预约
     handleBookNow(row) {
       this.$confirm('立即预约此设备,是否确定?', '提示', {

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

@@ -116,6 +116,7 @@
       :data="manageList"
       :row-key="getRowKeys"
       @selection-change="handleSelectionChange"
+      :header-cell-style="{background:'#E8E9E8'}"
     >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
       <el-table-column label="序号" type="index" align="left" />
@@ -175,25 +176,29 @@
           <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查时段" align="left" :show-overflow-tooltip="true" prop="checkStartTime" width="80">
+      <el-table-column label="检查时段" align="left" :show-overflow-tooltip="true" prop="checkStartTime" min-width="90">
         <template slot-scope="scope">
           <span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span>
-          <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
+          <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
           <el-button
-            class="details"
+            style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95, 181, 75);color: #5FB54B;background: rgba(91,182,71,0.08);"
+            type="success"
             size="mini"
             icon="el-icon-document"
+            plain
             @click="handleDetails(scope.row)"
           >详情
           </el-button>
           <el-button
-            class="bookNow"
+            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255, 157, 78);color: #FF9D4E;background: rgba(255,157,78,0.08);"
             size="mini"
+            type="success"
             icon="el-icon-check"
+            plain
             :disabled="scope.row.deviceId !== null"
             @click="handleSubscribe(scope.row)"
           >立即预约
@@ -262,10 +267,19 @@
       <el-table
         :data="deviceList"
         style="width: 100%"
+        :header-cell-style="{background:'#E8E9E8'}"
       >
         <el-table-column prop="deviceName" align="left" label="设备名称" />
-        <el-table-column prop="checkDate" align="left" label="检查日期" />
-        <el-table-column prop="checkTime" align="left" label="检查时段" />
+        <el-table-column prop="checkDate" align="left" label="检查日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.checkDate, '{y}/{m}/{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checkTime" align="left" label="检查时段">
+          <template slot-scope="scope">
+            <span>{{ scope.row.checkTime.replace('-', '~') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="num" align="left" label="剩余可预约" />
         <el-table-column prop="date" align="left" label="设备服务费" />
         <el-table-column align="left" label="操作">

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

@@ -146,11 +146,11 @@ export default {
       fristVisitOptions: [
         {
           label: '是',
-          value: '1'
+          value: '0'
         },
         {
           label: '否',
-          value: '0'
+          value: '1'
         }
       ]
     }

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

@@ -26,12 +26,22 @@
       <el-row :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠物ID:" prop="petsId">
-            <el-input v-model="form.petsId" :placeholder="isEdit? '请输入宠物ID' : '暂无数据'" :disabled="true" maxlength="20" />
+            <el-input
+              v-model="form.petsId"
+              :placeholder="isEdit? '请输入宠物ID' : '暂无数据'"
+              :disabled="true"
+              maxlength="20"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物昵称:" prop="petNickname">
-            <el-input v-model.trim="form.petNickname" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'" />
+            <el-input
+              v-model.trim="form.petNickname"
+              :disabled="!isEdit"
+              maxlength="10"
+              :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -105,14 +115,24 @@
         <el-col :span="8">
           <!--宠物体重-->
           <el-form-item label="宠物体重" prop="petWeight">
-            <el-input v-model.trim="form.petWeight" :placeholder="isEdit? '请输入宠物体重' : '暂无数据'" maxlength="10" :disabled="!isEdit">
+            <el-input
+              v-model.trim="form.petWeight"
+              :placeholder="isEdit? '请输入宠物体重' : '暂无数据'"
+              maxlength="10"
+              :disabled="!isEdit"
+            >
               <template #suffix>kg</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物毛色:" prop="petColor">
-            <el-input v-model.trim="form.petColor" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'" />
+            <el-input
+              v-model.trim="form.petColor"
+              :disabled="!isEdit"
+              maxlength="10"
+              :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -178,7 +198,13 @@
       <el-row v-if="isEdit && !showPetInfo" :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠主手机号:" prop="masterPhone">
-            <el-input v-model.trim="form.masterPhone" :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'" :disabled="!isEdit" maxlength="11" @blur="checkOwner" />
+            <el-input
+              v-model.trim="form.masterPhone"
+              :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'"
+              :disabled="!isEdit"
+              maxlength="11"
+              @blur="checkOwner"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -547,6 +573,7 @@ export default {
           this.doctorIdNd = params.data.userId
           console.log('超级超级超级超级重要！！！', this.doctorIdNd)
           this.registrationType = params.type
+          console.log('这是我从新增挂号页面赋值的挂号类型!!!!', this.registrationType)
           this.singleDoctor = params.data
           this.currentPage = params.cur
           this.test = { ...this.form }
@@ -654,12 +681,13 @@ export default {
 .registration-add-module {
   .el-form-item.petBreed {
     .el-form-item.el-form-item--small {
-      margin-right: 0!important;
-      margin-bottom: 0!important;
+      margin-right: 0 !important;
+      margin-bottom: 0 !important;
 
       .el-form-item__content {
         display: flex;
-        .petChildBreed{
+
+        .petChildBreed {
           margin-left: 5px;
         }
       }

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

@@ -131,14 +131,26 @@
             <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip />
+        <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petNickname || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
           </template>
         </el-table-column>
-        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip />
-        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip />
+        <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnersName || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.petOwnersPhone || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
@@ -157,7 +169,11 @@
             <span>{{ scope.row.type === '1' ? '线上' : '线下' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip />
+        <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.firstVisit || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>

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

@@ -8,6 +8,7 @@
         font-weight: bold;
         color: #333333;"
       >详情</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">
       <div class="title-paragraph">

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

@@ -11,10 +11,10 @@
       <el-form-item prop="petWeight">
         <el-select v-model="queryParams.treatItemsIdList" clearable multiple collapse-tags placeholder="治疗类型">
           <el-option
-            v-for="item in treatmentDropdown"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+            v-for="item in dict.type.treat_type"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
         </el-select>
       </el-form-item>
@@ -76,7 +76,15 @@
       <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="treatmentList" :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
+    <el-table
+      ref="table"
+      v-loading="loading"
+      :data="treatmentList"
+      :row-key="getRowKeys"
+      :header-cell-class-name="cellClass"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{background:'#E8E9E8'}"
+    >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
       <el-table-column label="序号" type="index" align="left" />
       <el-table-column label="治疗项目" align="left" :show-overflow-tooltip="true" prop="treatItemsName">
@@ -152,7 +160,7 @@
           <span v-show="scope.row.treatStartTime === null&& scope.row.treatEndTime=== null">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
           <el-button
             class="details"
@@ -224,6 +232,7 @@
       <el-table
         :data="appointmentRoomList"
         style="width: 100%"
+        :header-cell-style="{background:'#E8E9E8'}"
       >
         <el-table-column prop="consultRoomName" align="left" label="诊室名称" />
         <el-table-column prop="treatStartTime" align="left" label="治疗日期">
@@ -335,7 +344,7 @@ import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'MedicalRecordManagement',
-  dicts: ['exam_type', 'check_type', 'pet_insure', 'payment_status', 'payment_status'],
+  dicts: ['check_type', 'pet_insure', 'payment_status', 'payment_status', 'treat_type'],
   data() {
     return {
       // 时间模糊查询