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/equipment-management/equipment-management/equipment-check.vue

@@ -78,14 +78,17 @@
               :prop="'settingList.'+index+'.price'"
               :rules="[
                 { required: true, message: '请输入项目单价', trigger: 'change' },
-
+                { validator: validatePrice, trigger: 'change, blur' }
               ]"
             >
               <el-input-number
                 v-model="item.price"
                 :min="0"
+                :max="9999.99"
                 controls-position="right"
                 style="width: 240px"
+                placeholder="0.00"
+                :precision="2"
                 @keydown.native="keydown($event)"
               />
               元
@@ -122,6 +125,10 @@
               :ref="'settingList.'+index+'.sort'"
               label="权重"
               :prop="'settingList.'+index+'.sort'"
+              :rules="[
+                { required: true, message: '请输入权重', trigger: 'change' },
+                { validator: validWeigh, trigger: 'change, blur' }
+              ]"
             >
               <el-input-number
                 v-model="item.sort"
@@ -256,6 +263,15 @@ export default {
       })
     },
 
+    /** 项目单价校验 */
+    validatePrice: function(rule, value, callback) {
+      console.log('value', value)
+      if (value === 0) {
+        callback(new Error('项目单价不能为0.00'))
+      } else {
+        callback()
+      }
+    },
     // 是权重不可以输入小数
     handleBlur() {
       const parsedValue = parseFloat(this.form.sort)

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

@@ -265,22 +265,13 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区">
-<!--                  <el-input-->
-<!--                    disabled-->
-<!--                    type="textarea"-->
-<!--                    placeholder="暂无数据"-->
-<!--                    maxlength="200"-->
-<!--                    style="width:705%;"-->
-<!--                    :rows="4"-->
-<!--                  />-->
-                  <el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" disabled style="width: 300px">
-                    <el-option
-                      v-for="dict in dict.type.service_area"
-                      :key="dict.label"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                  <el-input
+                    v-model.trim="form.serviceAreaList"
+                    type="textarea"
+                    style="width:705%;;"
+                    :row="4"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -288,14 +279,13 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持检查类型">
-                  <el-select v-model="form.checkType" multiple placeholder="请选择支持检查类型" style="width: 300px" disabled>
-                    <el-option
-                      v-for=" dict in dict.type.exam_type"
-                      :key="dict.label"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                  <el-input
+                    v-model.trim="form.checkTypeList"
+                    type="textarea"
+                    style="width:705%;;"
+                    :row="4"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1081,6 +1071,8 @@ export default {
         // })
         // }
         if (this.form.checkType != null && this.form.checkType !== '') {
+          this.form.checkTypeList = selectDictLabels(this.dict.type.check_type, this.form.checkType)
+          console.log(' this.form.checkTypeList', this.form.checkTypeList)
           this.form.checkType = response.data.checkType.split(',')
         }
 

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

@@ -127,7 +127,7 @@
     </el-row>
 
     <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+      <el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
       <el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />

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">

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

@@ -134,7 +134,10 @@
       </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">
         <template slot-scope="scope">

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,13 +176,13 @@
           <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>
         </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
             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);"
@@ -266,6 +267,7 @@
       <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="检查日期">

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 {
       // 时间模糊查询