Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/assets/styles/element-ui.scss

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [20, 50, 100]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/router/index.js

@@ -153,7 +153,7 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/use-management/use-details'),
         name: 'UseDetails',
-        meta: { title: '详情', icon: 'table', activeMenu: '/use-details' }
+        meta: { title: '详情', icon: 'table' }
       }
     ]
   },

src/views/banner_management/banner_add.vue

+<template>
+  <div>
+    新增轮播图
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BannerAdd',
+  data() {
+    return {}
+  },
+  watch: {},
+  created() {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/banner_management/banner_management.vue

@@ -13,37 +13,44 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item prop="img">
-              <el-input
-                v-model="queryParams.img"
-                placeholder="请输入图片地址"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="imgBoolean">
+              <el-select v-model.trim="queryParams.imgBoolean" clearable placeholder="轮播图">
+                <el-option
+                  v-for="item in imgStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
-            <el-form-item prop="url">
-              <el-input
-                v-model="queryParams.url"
-                placeholder="请输入跳转链接"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="status">
+              <el-select v-model.trim="queryParams.status" clearable placeholder="状态">
+                <el-option
+                  v-for="item in dict.type.banner_status"
+                  :key="item.value"
+                  :label="item.label.substring(1)"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
-            <el-form-item prop="sort">
-              <el-input
-                v-model="queryParams.sort"
-                placeholder="请输入权重"
+            <el-form-item prop="createTime">
+              <el-date-picker
+                v-model.trim="queryParams.createTime"
                 clearable
-                @keyup.enter.native="handleQuery"
+                placeholder="请选择创建日期"
+                type="date"
+                value-format="yyyy-MM-dd"
               />
             </el-form-item>
-            <el-form-item prop="notes">
-              <el-input
-                v-model="queryParams.notes"
-                placeholder="请输入备注"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item prop="sortWay">
+              <el-select v-model.trim="queryParams.sortWay" clearable placeholder="请选择排序方式">
+                <el-option
+                  v-for="item in dict.type.banner_order"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <div>
               <!--顶部操作按钮-->
@@ -70,20 +77,24 @@
           <el-table
             v-loading="loading"
             :data="bannerList"
-            @selection-change="handleSelectionChange"
             :header-cell-style="{background:'#E8E9E8'}"
+            @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
-            <el-table-column label="标题" prop="title" show-overflow-tooltip/>
-            <el-table-column label="图片地址" prop="img" show-overflow-tooltip/>
-            <el-table-column label="跳转链接" prop="url" show-overflow-tooltip/>
-            <el-table-column label="权重" prop="sort" width="60"/>
+            <el-table-column label="标题" prop="title" show-overflow-tooltip />
+            <el-table-column label="轮播图" prop="img" show-overflow-tooltip width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.img ? '已上传':'未上传' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="跳转链接" prop="url" show-overflow-tooltip />
+            <el-table-column label="权重" prop="sort" width="60" />
+            <el-table-column label="创建日期" prop="createTime" width="80" />
             <el-table-column label="状态" prop="status" width="80">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.banner_status" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column label="备注" prop="notes" show-overflow-tooltip/>
             <el-table-column label="操作" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <div style="display: flex;">
@@ -110,7 +121,7 @@
                     >编辑
                     </el-button>
                   </div>
-                  <div v-if="scope.row.articleStatus==='1'">
+                  <div v-if="scope.row.status==='2' && scope.row.id !== 1">
                     <el-button
                       key="1"
                       v-hasPermi="['business:article:remove']"
@@ -123,7 +134,7 @@
                     >删除
                     </el-button>
                   </div>
-                  <div v-else-if="scope.row.articleStatus==='0'">
+                  <div v-else-if="scope.row.status==='1' && scope.row.id !== 1">
                     <el-button
                       key="2"
                       icon="el-icon-video-pause"
@@ -131,7 +142,7 @@
                       size="mini"
                       style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
                       type="warning"
-                      @click="handleChange(scope.row)"
+                      @click="deListBanner(scope.row)"
                     >下架
                     </el-button>
                   </div>
@@ -158,7 +169,7 @@ import { listBanner, getBanner, delBanner, addBanner, updateBanner } from '@/api
 
 export default {
   name: 'BannerManagement',
-  dicts: ['banner_status'],
+  dicts: ['banner_status', 'banner_order'],
   data() {
     return {
       activeName: 'first',
@@ -185,12 +196,29 @@ export default {
         pageNum: 1,
         pageSize: 10,
         title: null,
-        img: null,
+        imgBoolean: null,
+        sortWay: null,
         url: null,
         sort: null,
         status: null,
-        notes: null
+        notes: null,
+        createTime: null
       },
+      // 轮播图状态下拉框
+      imgStatus: [
+        // {
+        //   label: '全部',
+        //   value: 'all'
+        // },
+        {
+          label: '已上传',
+          value: 'y'
+        },
+        {
+          label: '未上传',
+          value: 'n'
+        }
+      ],
       // 表单参数
       form: {},
       // 表单校验
@@ -301,6 +329,18 @@ export default {
       this.download('business/banner/export', {
         ...this.queryParams
       }, `banner_${new Date().getTime()}.xlsx`)
+    },
+    /** 下架轮播图 */
+    deListBanner(row) {
+      const update = {
+        id: row.id,
+        status: '2'
+      }
+      updateBanner(update).then(res => {
+        if (res.code === 200) {
+          this.getBannerList()
+        }
+      })
     }
   }
 }

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

@@ -370,7 +370,8 @@ export default {
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         selectedOptions: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' }
+          { required: true, message: '请选择服务地点', trigger: 'blur' },
+          { type: 'number', validator: this.validaddress, trigger: 'change' }
         ],
         useNum: [
           { required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' },
@@ -405,10 +406,12 @@ export default {
           { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
         ],
         serviceArea: [
-          { required: true, message: '请选择支持服务地区', trigger: 'blur' }
+          { required: true, message: '请选择支持服务地区', trigger: 'blur' },
+          { type: 'number', validator: this.validserviceArea, trigger: 'change' }
         ],
         checkType: [
-          { required: true, message: '请选择支持检查类型', trigger: 'blur' }
+          { required: true, message: '请选择支持检查类型', trigger: 'blur' },
+          { type: 'number', validator: this.validcheckType, trigger: 'change' }
         ]
       },
       // 是否医院自有设备
@@ -574,6 +577,33 @@ export default {
       }
       console.log('中文', this.addForm)
     },
+    // 服务地点表单校验
+    validaddress(rule, value, callback) {
+      console.log('validaddress', this.form.selectedOptions)
+      if (this.form.selectedOptions.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择服务地点'))
+      }
+    },
+    // 支持服务地区表单校验
+    validserviceArea(rule, value, callback) {
+      console.log('validaddress', this.form.serviceArea)
+      if (this.form.serviceArea.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持检查项目'))
+      }
+    },
+    // 支持检查类型表单校验
+    validcheckType(rule, value, callback) {
+      console.log('validaddress', this.form.checkType)
+      if (this.form.checkType.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持服务地区'))
+      }
+    },
     // 四个时间的表单校验
     validateMorningStart(rule, value, callback) {
       // // TODO: please clear this log

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

@@ -266,7 +266,7 @@
               <el-col>
                 <el-form-item label="支持服务地区">
                   <el-input
-                    v-model.trim="form.serviceAreaList"
+                    v-model.trim="form.serviceAreaText"
                     type="textarea"
                     style="width:705%;;"
                     :row="4"
@@ -278,11 +278,11 @@
             <!--            9-->
             <el-row>
               <el-col>
-                <el-form-item label="支持检查类型">
+                <el-form-item label="支持检查项目">
                   <el-input
-                    v-model.trim="form.checkTypeList"
+                    v-model.trim="form.checkTypeText"
                     type="textarea"
-                    style="width:705%;;"
+                    style="width:705%;"
                     :row="4"
                     disabled
                   />
@@ -674,8 +674,8 @@ export default {
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
-        serviceAreaList: [],
-        checkTypeList: [],
+        serviceAreaText: [],
+        checkTypeText: [],
         head: '',
         phone: '',
         deviceType: '',
@@ -1058,8 +1058,8 @@ export default {
         // }
         // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
         console.log('this.form.serviceArea', this.form.serviceArea)
-        this.form.serviceAreaList = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
-        console.log(' this.form.serviceAreaList', this.form.serviceAreaList)
+        this.form.serviceAreaText = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
+        console.log(' this.form.serviceAreaText', this.form.serviceAreaText)
         this.form.serviceArea = response.data.serviceArea.split(',')
 
         // this.getDicts('service_area').then(response => {
@@ -1071,8 +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.checkTypeText = selectDictLabels(this.dict.type.exam_type, this.form.checkType)
+          console.log(' this.form.checkTypeText', this.form.checkTypeText)
           this.form.checkType = response.data.checkType.split(',')
         }
 

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

@@ -87,13 +87,13 @@
         >新增设备
         </el-button>
         <el-button
-          icon="el-icon-top-left"
+          icon="el-icon-finished"
           class="fourWordsBtn"
           @click="selectAll()"
         >选择全部
         </el-button>
         <el-button
-          icon="el-icon-top-right"
+          icon="el-icon-back"
           class="fourWordsBtn"
           @click="reverseSelect(deviceList)"
         >反向选择
@@ -101,14 +101,14 @@
         <el-button
           v-hasPermi="['business:device:import']"
           class="fourWordsBtn"
-          icon="el-icon-bottom-left"
+          icon="el-icon-download"
           @click="handleImport"
         >批量导入
         </el-button>
         <el-button
           v-hasPermi="['business:device:export']"
           class="fourWordsBtn"
-          icon="el-icon-top-right"
+          icon="el-icon-upload2"
           @click="handleExport"
         >批量导出
         </el-button>
@@ -126,7 +126,7 @@
       </el-col>
     </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 ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
       <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 />

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: 40px;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: 20px;padding-bottom: 20px;">
+      <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>
@@ -317,14 +317,10 @@ import { CodeToText } from 'element-china-area-data'
 export default {
   name: 'UseDetails',
   dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure'],
-  props: {
-    id: {
-      type: Number,
-      required: true
-    }
-  },
   data() {
     return {
+      useId: '',
+      createTime: '',
       // 检查时间
       checkTime: '',
       // 检查日期
@@ -353,6 +349,7 @@ export default {
     }
   },
   created() {
+    this.useId = localStorage.getItem('useId')
     this.getUseDetail()
     this.getCheckList()
   },
@@ -382,7 +379,7 @@ export default {
     },
     // 查询详情
     getUseDetail() {
-      useManagementDetail(this.id).then(res => {
+      useManagementDetail(this.useId).then(res => {
         this.form = res.data
         console.log('xiangq', res)
         if (res.data.useTime !== '' && res.data.useTime !== null) {

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

@@ -41,10 +41,10 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="daterangeCreateTime"
+          v-model="queryParams.reportTime"
           type="date"
           style="width: 240px"
-          placeholder="选择创建日期"
+          placeholder="选择检查日期"
           value-format="yyyy-MM-dd"
         />
       </el-form-item>
@@ -88,7 +88,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#E8E9E8'}" @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" min-width="60" />
       <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
@@ -128,12 +128,12 @@
       </el-table-column>
       <el-table-column label="检查日期" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span>
+          <span>{{ parseTime(scope.row.reportTime, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检查时间" align="left" prop="checkStartTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-' }}</span>
+          <span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="缴费金额" align="left" prop="payAmount">
@@ -215,29 +215,29 @@ export default {
       sortedColumn: '',
       // 排序规则
       sortedList: [
-        {
-          id: '1',
-          collation: 'asc',
-          sortedColumn: '按检查时间升序',
-          nameColumn: 'checkItemsName'
-        },
         {
           id: '2',
           collation: 'desc',
-          sortedColumn: '按检查时间降序',
-          nameColumn: 'checkItemsName'
+          sortedColumn: '按检查时间倒序',
+          nameColumn: 'c.report_time'
         },
         {
-          id: '3',
+          id: '1',
           collation: 'asc',
-          sortedColumn: '按预约时间升序',
-          nameColumn: 'appointTime'
+          sortedColumn: '按检查时间正序',
+          nameColumn: 'c.report_time'
         },
         {
           id: '4',
           collation: 'desc',
-          sortedColumn: '按预约时间降序',
-          nameColumn: 'appointTime'
+          sortedColumn: '按预约时间倒序',
+          nameColumn: 'c.appoint_time'
+        },
+        {
+          id: '3',
+          collation: 'asc',
+          sortedColumn: '按预约时间正序',
+          nameColumn: 'c.appoint_time'
         }
       ],
       total: 0,
@@ -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: '',
@@ -328,10 +328,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
@@ -385,11 +385,9 @@ export default {
     },
     // 去详情页
     detailsUse(row) {
+      localStorage.setItem('useId', row.id)
       this.$router.push({
-        name: 'UseDetails',
-        params: {
-          id: row.id
-        }
+        name: 'UseDetails'
       })
     },
     // 设备状态 value 和label 的转换

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

@@ -266,7 +266,7 @@ export default {
           sort: null
         },
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         petNickname: null,
         nickname: null,
         petOwnerNumber: null,

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

@@ -157,7 +157,9 @@
       </el-row>
       <el-row v-show="checkDetail.checkSchedule < 2">
         <el-col :span="8">
-          <el-form-item label="暂未预约" />
+          <el-form-item label="暂未预约">
+            <span></span>
+          </el-form-item>
         </el-col>
       </el-row>
       <div v-show="checkDetail.checkSchedule >= 2">
@@ -178,7 +180,7 @@
           <el-col :span="8">
             <el-form-item label="检查状态">
               <span v-show="checkDetail.checkSchedule === '0' || checkDetail.checkSchedule === '1'">-</span>
-              <span v-show="checkDetail.checkSchedule === '2'">未检查</span>
+              <span v-show="checkDetail.checkSchedule === '2'">待检查</span>
               <span v-show="checkDetail.checkSchedule === '3'">已检查</span>
             </el-form-item>
           </el-col>

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

@@ -154,7 +154,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
           <el-button
-            class="fourWordsBtn"
+            style="color: #5FB54B"
+            type="text"
             @click="handleBookNow(scope.row)"
           >立即预约</el-button>
         </template>
@@ -286,7 +287,7 @@ export default {
         this.total = res.total
         if (this.subscribeMessage.checkType === '2' && this.deviceList.length > 0) {
           this.deviceList.forEach(item => {
-            item['price'] = this.subscribeMessage.devicePrice
+            item['price'] = this.subscribeMessage.payAmount
           })
         }
         console.log('列表', this.deviceList)

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

@@ -66,28 +66,28 @@
     <el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-plus"
+        icon="el-icon-finished"
         size="mini"
         @click="selectAll()"
       >选择全部
       </el-button>
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-edit"
+        icon="el-icon-back"
         size="mini"
         @click="reverseSelect()"
       >反向选择
       </el-button>
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-delete"
+        icon="el-icon-upload2"
         size="mini"
         @click="handleExport()"
       >批量导出
       </el-button>
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-download"
+        icon="el-icon-setting"
         size="mini"
         @click="checkItem()"
       >检查项目
@@ -167,7 +167,7 @@
       <el-table-column label="检查状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
         <template slot-scope="scope">
           <span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span>
-          <span v-show="scope.row.checkSchedule === '2'">未检查</span>
+          <span v-show="scope.row.checkSchedule === '2'">待检查</span>
           <span v-show="scope.row.checkSchedule === '3'">已检查</span>
         </template>
       </el-table-column>
@@ -257,7 +257,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="7" v-show="currentCheckType === '2'">
             <el-form-item label="支出账户金额" prop="shadowReport" label-width="120">
               1200.00
             </el-form-item>
@@ -281,7 +281,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="num" align="left" label="剩余可预约" />
-        <el-table-column prop="date" align="left" label="设备服务费" />
+        <el-table-column v-if="currentCheckType === '2'" prop="date" align="left" label="设备服务费" />
         <el-table-column align="left" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -378,7 +378,7 @@ export default {
         },
         {
           value: '1',
-          label: '未检查'
+          label: '待检查'
         }
       ],
       deviceQueryParams: {
@@ -420,7 +420,9 @@ export default {
       // 当前的检查ID
       currentCheckId: null,
       // 当前的设备服务费
-      currentPayAmount: null
+      currentPayAmount: null,
+      // 检查类型(0-自有、2-外部)
+      currentCheckType: null
     }
   },
   created() {
@@ -568,6 +570,7 @@ export default {
       this.deviceQueryParams.reservationTime = this.getCurrentTime()
       this.currentCheckId = row.id
       this.currentPayAmount = row.payAmount
+      this.currentCheckType = row.checkType
       console.log('点击立即预约后的状态', this.deviceQueryParams)
       // 设置检查项目id
       this.getDevice()
@@ -620,6 +623,11 @@ export default {
         console.log('设备', res)
         this.deviceList = res.rows.table
         this.deviceTotal = res.total
+        if (this.currentCheckType === '2' && this.deviceList.length > 0) {
+          this.deviceList.forEach(item => {
+            item['price'] = this.currentPayAmount
+          })
+        }
       })
     },
     /** 重置按钮操作 */

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

@@ -243,7 +243,7 @@ export default {
       const temp = {
         // 给接口所需的宠物赋值
         petOwnerBo: this.petForm,
-        type: this.registrationType,
+        type: '1', // 这个字段区分的是现场还是预约 1为现场
         // 宠物宠主本身的信息
         petsId: this.doctorForm.petsId || null,
         petType: this.doctorForm.petStatus,

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

@@ -181,7 +181,7 @@
         </el-table-column>
         <el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" />
+            <span :style="scope.row.payStatus === '0' ? 'color: #F56C6C' : 'color: #67C23A'"><dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" /></span>
           </template>
         </el-table-column>
         <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="180">
@@ -295,7 +295,7 @@ export default {
         // 排序方式声明
         sort: '',
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         type: null,
         petId: null,
         petNickname: null,

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

@@ -503,7 +503,7 @@ export default {
       return treatRange
     },
     // 预约诊室搜索
-    allocationFormChangeName(value) {
+    allocationFormChangeName() {
       this.getAppointmentRecord()
     },
     // 分配诊室治疗时间查询

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

@@ -51,29 +51,47 @@
     <el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-top-left"
+        icon="el-icon-finished"
         @click="selectAll()"
-      >选择全部</el-button>
+      >选择全部
+      </el-button>
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-top-right"
+        icon="el-icon-back"
         size="mini"
         @click="reverseSelect(treatmentList)"
-      >反向选择</el-button>
+      >反向选择
+      </el-button>
       <el-button
         class="fourWordsBtn"
-        icon="el-icon-bottom-right"
+        icon="el-icon-upload2"
         size="mini"
         @click="handleExport"
-      >批量导出</el-button>
+      >批量导出
+      </el-button>
       <el-button
         class="fourWordsBtn"
         icon="el-icon-setting"
         size="mini"
         @click="checkItem()"
-      >治疗项目</el-button>
-      <el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+      >治疗项目
+      </el-button>
+      <el-button
+        style="position: relative; float: right;"
+        class="resetBtn"
+        icon="el-icon-refresh"
+        size="mini"
+        @click="resetQuery"
+      >重置
+      </el-button>
+      <el-button
+        style="position: relative; float: right;"
+        class="queryBtn"
+        icon="el-icon-search"
+        size="mini"
+        @click="handleQuery"
+      >查询
+      </el-button>
     </el-row>
 
     <el-table
@@ -82,8 +100,8 @@
       :data="treatmentList"
       :row-key="getRowKeys"
       :header-cell-class-name="cellClass"
-      :header-cell-style="{background:'#E8E9E8'}"
       @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" />
@@ -196,7 +214,15 @@
     />
 
     <!-- 分配诊室对话框 -->
-    <el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" @close="closeDialogRoom">
+    <el-dialog
+      title="分配诊室"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      @close="closeDialogRoom"
+    >
       <div style="display: flex;padding-bottom: 20px;">
         <div class="tip1" />
         <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">预约记录</div>
@@ -205,7 +231,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="诊室">
-              <el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" @change="allocationFormChangeName">
+              <el-select
+                v-model="allocationForm.consultRoomIdList"
+                clearable
+                multiple
+                collapse-tags
+                placeholder="请选择诊室"
+                @change="allocationFormChangeName"
+              >
                 <el-option
                   v-for="item in consultingName"
                   :key="item.id"
@@ -244,13 +277,15 @@
           <template slot-scope="scope">
             <span v-show="scope.row.treatStartTime!== null">{{ parseTime(scope.row.treatStartTime, '{h}:00') }}</span>
             <span v-show="scope.row.treatEndTime!== null">~{{ parseTime(scope.row.treatEndTime, '{h}:00') }}</span>
-            <span v-show="scope.row.treatStartTime === null&& scope.row.treatEndTime=== null">-</span>
+            <span v-show="scope.row.treatStartTime === null && scope.row.treatEndTime === null">-</span>
           </template>
         </el-table-column>
         <el-table-column align="left" label="治疗时长">
           <template slot-scope="scope">
-            <span v-show="scope.row.treatStartTime!== null">{{ treatRange(scope.row.treatStartTime,scope.row.treatEndTime) }}h</span>
-            <span v-show="scope.row.treatStartTime === null&& scope.row.treatEndTime=== null">-</span>
+            <span
+              v-show="scope.row.treatStartTime!== null"
+            >{{ treatRange(scope.row.treatStartTime, scope.row.treatEndTime) }}h</span>
+            <span v-show="scope.row.treatStartTime === null && scope.row.treatEndTime === null">-</span>
           </template>
         </el-table-column>
         <el-table-column prop="treatOperator" align="left" label="治疗负责人" />
@@ -263,7 +298,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="诊室" prop="consultRoomId">
-              <el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" style="width: 200px" @change="getconsultingName">
+              <el-select
+                v-model="reservationForm.consultRoomName"
+                clearable
+                placeholder="请选择诊室"
+                value-key="id"
+                style="width: 200px"
+                @change="getconsultingName"
+              >
                 <el-option
                   v-for="item in consultingName"
                   :key="item.id"
@@ -328,8 +370,11 @@
         </el-row>
         <el-row>
           <div style="padding-top: 20px;">
-            <el-button style="width: 98px;height: 32px;" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-            <el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
+            <el-button style="width: 98px;height: 32px;" class="queryBtn" icon="el-icon-check" @click="submitForm">
+              提交
+            </el-button>
+            <el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回
+            </el-button>
           </div>
         </el-row>
       </el-form>
@@ -368,12 +413,18 @@ export default {
       ],
       // 治疗状态下拉框
       treatStatusList: [
-        { value: null,
-          label: '全部' },
-        { value: ['2'],
-          label: '待治疗' },
-        { value: ['3'],
-          label: '已治疗' }
+        {
+          value: null,
+          label: '全部'
+        },
+        {
+          value: ['3'],
+          label: '已治疗'
+        },
+        {
+          value: ['2'],
+          label: '待治疗'
+        }
       ],
       // 预约诊室集合
       appointmentRoomList: [],
@@ -449,7 +500,9 @@ export default {
   methods: {
     // 表单选择框对齐
     cellClass(row) {
-      if (row.columnIndex === 0) { return 'disabledCheck' }
+      if (row.columnIndex === 0) {
+        return 'disabledCheck'
+      }
     },
     // 表格
     getRowKeys(row) {
@@ -551,7 +604,7 @@ export default {
       console.log(value)
     },
     // 预约诊室搜索
-    allocationFormChangeName(value) {
+    allocationFormChangeName() {
       console.log(typeof this.allocationForm.consultRoomIdList[0])
       this.getAppointmentRecord()
     },
@@ -686,8 +739,9 @@ export default {
   border-radius: 6px 6px 6px 6px;
   border: 1px solid rgb(95, 181, 75);
   color: #5FB54B;
-  background: rgba(91,182,71,0.08);
+  background: rgba(91, 182, 71, 0.08);
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   &:hover {
     background: rgba(95, 181, 75, 0.08);
     opacity: 1;
@@ -695,6 +749,7 @@ export default {
     color: #5FB54B !important;
   }
 }
+
 /** 立即预约 */
 .bookNow {
   width: 80px;
@@ -703,6 +758,7 @@ export default {
   color: #FF9D4E;
   background: rgba(255, 157, 78, 0.08);
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   &:hover {
     background: rgba(95, 181, 75, 0.08);
     opacity: 1;
@@ -710,6 +766,7 @@ export default {
     color: #FF9D4E !important;
   }
 }
+
 .bookNowNo {
   width: 80px;
   border-radius: 6px 6px 6px 6px;
@@ -717,6 +774,7 @@ export default {
   color: #909399;
   background: #ffffff;
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   &:hover {
     background: rgba(95, 181, 75, 0.08);
     opacity: 1;
@@ -724,6 +782,7 @@ export default {
     color: #909399 !important;
   }
 }
+
 .app-container {
   background-color: #FFFFFF;
 }