Merge remote-tracking branch 'origin/master'

src/api/business/device.js

+// import request from '@/utils/request'
+
+// 查询设备列表
+// export function listDevice(query) {
+//   return request({
+//     url: '/system/device/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+//
+// // 查询设备详细
+// export function getDevice(id) {
+//   return request({
+//     url: '/system/device/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// // 新增设备
+// export function addDevice(data) {
+//   return request({
+//     url: '/system/device',
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改设备
+// export function updateDevice(data) {
+//   return request({
+//     url: '/system/device',
+//     method: 'put',
+//     data: data
+//   })
+// }
+//
+// // 删除设备
+// export function delDevice(data) {
+//   return request({
+//     url: '/system/device/del',
+//     method: 'Put',
+//     data: data
+//   })
+// }
+
 import request from '@/utils/request'
 
 // 查询设备列表
 export function listDevice(query) {
   return request({
-    url: '/system/device/list',
+    url: '/business/device/list',
     method: 'get',
     params: query
   })
@@ -12,7 +58,7 @@ export function listDevice(query) {
 // 查询设备详细
 export function getDevice(id) {
   return request({
-    url: '/system/device/' + id,
+    url: '/business/device/' + id,
     method: 'get'
   })
 }
@@ -20,7 +66,7 @@ export function getDevice(id) {
 // 新增设备
 export function addDevice(data) {
   return request({
-    url: '/system/device',
+    url: '/business/device',
     method: 'post',
     data: data
   })
@@ -29,7 +75,7 @@ export function addDevice(data) {
 // 修改设备
 export function updateDevice(data) {
   return request({
-    url: '/system/device',
+    url: '/business/device',
     method: 'put',
     data: data
   })
@@ -38,54 +84,8 @@ export function updateDevice(data) {
 // 删除设备
 export function delDevice(data) {
   return request({
-    url: '/system/device/del',
+    url: '/business/device/del',
     method: 'Put',
     data: data
   })
 }
-
-// import request from '@/utils/request'
-//
-// // 查询设备列表
-// export function listDevice(query) {
-//   return request({
-//     url: '/business/device/list',
-//     method: 'get',
-//     params: query
-//   })
-// }
-//
-// // 查询设备详细
-// export function getDevice(id) {
-//   return request({
-//     url: '/business/device/' + id,
-//     method: 'get'
-//   })
-// }
-//
-// // 新增设备
-// export function addDevice(data) {
-//   return request({
-//     url: '/business/device',
-//     method: 'post',
-//     data: data
-//   })
-// }
-//
-// // 修改设备
-// export function updateDevice(data) {
-//   return request({
-//     url: '/business/device',
-//     method: 'put',
-//     data: data
-//   })
-// }
-//
-// // 删除设备
-// export function delDevice(data) {
-//   return request({
-//     url: '/business/device/del',
-//     method: 'Put',
-//     data: data
-//   })
-// }

src/api/business/use.js

@@ -16,7 +16,7 @@ export function listUseManagement(query) {
   })
 }
 
-// 查询使用列表分页
+// 查询使用列表
 export function listUseManagementAll(query) {
   return request({
     url: '/business/check/useListAll',
@@ -27,3 +27,4 @@ export function listUseManagementAll(query) {
 
 // 导出
 
+

src/router/index.js

@@ -117,6 +117,7 @@ export const constantRoutes = [
         component: () => import('@/views/equipment-management/equipment-management/equipment-management'),
         name: 'EquipmentManagement',
         meta: { title: '设备管理', icon: 'date' }
+
       },
       {
         path: 'equipment-detail/:id',
@@ -132,6 +133,7 @@ export const constantRoutes = [
         name: 'EquipmentAdd',
         meta: { title: '设备新增' }
       },
+
       {
         path: 'use-management',
         props: true,

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

@@ -14,7 +14,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="设备名称" prop="deviceName">
-                  <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+                  <el-input v-model="form.deviceName" placeholder="请输入设备名称" style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -24,7 +24,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="医院是否自有设备" prop="isPrivate">
-                  <el-select v-model="form.isPrivate">
+                  <el-select v-model="form.isPrivate" style="width: 250px">
                     <el-option
                       v-for="index in optionss"
                       :key="index"
@@ -39,17 +39,17 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="负责人" prop="head">
-                  <el-input v-model="form.head" placeholder="请输入负责人名称" />
+                  <el-input v-model="form.head" placeholder="请输入负责人名称"  style="width: 250px"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号" prop="phone">
-                  <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
+                  <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11"  style="width: 250px"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类型" prop="deviceType">
-                  <el-select v-model="form.deviceType">
+                  <el-select v-model="form.deviceType" style="width: 250px">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -67,20 +67,20 @@
               <el-col :span="8">
                 <el-form-item label="服务地点">
                   <el-cascader
+                    style="width: 250px"
                     v-model="selectedOptions"
                     size="large"
                     :options="cityOptions"
                     placeholder="请选择地区"
                     expand-trigger="hover"
                     clearable
-                    style="width: 218px"
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                <el-form-item style="margin-left: 30px">
+                <el-form-item style="margin-left: 50px">
                   <el-input
                     v-model.trim="form.address"
                     placeholder="请输入服务地址"
@@ -94,6 +94,7 @@
               <el-col :span="8">
                 <el-form-item label="单位时段服务数">
                   <el-input
+                    style="width: 250px"
                     v-model.trim="form.useNum"
                     placeholder="请输入单位时段服务数"
                     clearable
@@ -106,7 +107,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="预约方式" prop="reservationMethod">
-                  <el-select v-model="form.reservationMethod" placeholder="请选择预约方式">
+                  <el-select v-model="form.reservationMethod" placeholder="请选择预约方式" style="width: 250px">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -119,6 +120,7 @@
               <el-col :span="8">
                 <el-form-item label="上午开始时间">
                   <el-time-select
+                    style="width: 250px"
                     v-model="useTime.ams"
                     is-range
                     placeholder="开始时间"
@@ -135,6 +137,7 @@
               <el-col :span="8">
                 <el-form-item label="上午结束时间">
                   <el-time-select
+                    style="width: 250px"
                     v-model="useTime.ame"
                     is-range
                     placeholder="结束时间"
@@ -156,6 +159,7 @@
               <el-col :span="8">
                 <el-form-item label="下午开始时间">
                   <el-time-select
+                    style="width: 250px"
                     v-model="useTime.pms"
                     is-range
                     placeholder="开始时间"
@@ -172,6 +176,7 @@
               <e-col :span="8">
                 <el-form-item label="下午结束时间">
                   <el-time-select
+                    style="width: 250px"
                     v-model="useTime.pme"
                     is-range
                     placeholder="结束时间"
@@ -191,7 +196,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="权重" prop="sort">
-                  <el-input-number v-model="form.sort" :min="0" :max="9999" />
+                  <el-input-number v-model="form.sort" :min="0" :max="9999" style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -202,7 +207,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备状态" prop="sort">
-                  <el-select v-model="form.status" placeholder="请选择设备状态">
+                  <el-select v-model="form.status" placeholder="请选择设备状态" style="width: 250px">
                     <el-option
                       v-for="dict in dict.type.device_status"
                       :key="dict.value"

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

@@ -147,10 +147,24 @@
 
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">
-            {{ showStatus(scope.row.status)||'-' }}
-          </span>
+          <span
+            v-if="scope.row.status === '1'"
+            style="color: #5FB54B;"
+          >{{ showStatus(scope.row.status) }}</span>
+          <span
+            v-else-if="scope.row.status === '2'"
+            style="color: #FF9D4E;"
+          >{{ showStatus(scope.row.status) }}</span>
+          <span
+            v-else
+            style="color: #DB4747;"
+          >{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
+<!--        <template slot-scope="scope">-->
+<!--          <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
+<!--            {{ showStatus(scope.row.status)||'-' }}-->
+<!--          </span>-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -335,6 +349,7 @@ import { regionData, CodeToText } from 'element-china-area-data'
 import { listDevice, getDevice, delDevice } from '@/api/business/device'
 import { getInfo } from '@/api/login'
 import { parseTime } from '@/utils/ruoyi'
+import {listUseManagementAll} from "@/api/business/use";
 
 export default {
   name: 'EquipmentManagement',
@@ -700,27 +715,9 @@ export default {
         }
       })
     },
-    // 全部选择
-    selectAll() {
-      this.$refs.table.toggleAllSelection()
-    },
-    // 反向选择
-    reverseSelect(rows) {
-      rows.forEach(row => {
-        this.$refs.table.toggleRowSelection(row)
-      })
-    },
-    // /**
-    //  * 全部选择
-    //  * @param selection 已选择内容
-    //  * @param all 是否永远进行全选操作
-    //  */
-    // async selectAll(selection = [], all = true) {
-    //   if (this.veterinarianList.length !== selection.length && !all) {
-    //     this.effectTableSelect([])
-    //   } else {
-    //     await this.changeTableSelect()
-    //   }
+    // // 全部选择
+    // selectAll() {
+    //   this.$refs.table.toggleAllSelection()
     // },
     // // 反向选择
     // reverseSelect(rows) {
@@ -728,23 +725,41 @@ export default {
     //     this.$refs.table.toggleRowSelection(row)
     //   })
     // },
-    // /** 提交按钮 */
-    // submitForm() {
-    //   if (this.form.checkType != null && this.form.checkType !== '') {
-    //     this.form.checkType = this.form.checkType.toString()
-    //   }
-    //   this.form.useTime = JSON.stringify(this.useTime)
-    //   this.$refs['form'].validate(valid => {
-    //     if (valid) {
-    //       console.log(this.form)
-    //       addDevice(this.form).then(response => {
-    //         this.$modal.msgSuccess('新增成功')
-    //         this.open = false
-    //         this.getList()
-    //       })
-    //     }
-    //   })
-    // },
+    /**
+     * 全部选择
+     * @param selection 已选择内容
+     * @param all 是否永远进行全选操作
+     */
+    async selectAll(selection = [], all = true) {
+      if (this.userList.length !== selection.length && !all) {
+        this.effectTableSelect([])
+      } else {
+        await this.changeTableSelect()
+      }
+    },
+    /**
+     * 控制table的选择项
+     * @param data
+     */
+    effectTableSelect(data = []) {
+      this.$refs.table.store.states.selection = data
+      this.$refs.table.store.updateSelectionByRowKey()
+      this.$refs.table.store.updateAllSelected()
+      this.$refs.table.$emit('selection-change', data)
+    },
+    /**
+     * 改变table选择项
+     * @param notIncludeIds 需要排除的id列表
+     */
+    async changeTableSelect(notIncludeIds = []) {
+      // 获取反选的数据
+      const { data } = await listUseManagementAll({ notIncludeIds })
+      this.effectTableSelect(data)
+    },
+    // 反向选择
+    reverseSelect() {
+      this.changeTableSelect(this.ids)
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row)

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

@@ -22,7 +22,7 @@
       <el-form-item prop="status">
         <el-select v-model="queryParams.insureList" placeholder="宠物保险" multiple collapse-tags clearable>
           <el-option
-            v-for="dict in dict.type.pet_insure"
+            v-for="dict in insureList"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -96,7 +96,7 @@
       <el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true" />
       <el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
+          <dict-tag :options="insureList" :value="scope.row.insure" />
         </template>
       </el-table-column>
       <el-table-column label="宠主姓名" align="left" prop="ownerNikename" />
@@ -160,6 +160,21 @@ export default {
   dicts: ['exam_type', 'device_status', 'pet_insure'],
   data() {
     return {
+      // 宠物保险下拉框
+      insureList: [
+        {
+          label: '全部',
+          value: '1'
+        },
+        {
+          label: '已购保险',
+          value: '2'
+        },
+        {
+          label: '未购保险',
+          value: '3'
+        }
+      ],
       // 可以使用的时间段时间范围
       daterangeCreateTime: '',
       // 多选框选中id

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

@@ -381,8 +381,6 @@ color: #333333;"
 </template>
 <script>
 // 导入获取宠物信息的接口
-import { getPets, listAllPets } from '@/api/business/pets'
-import { getOwners } from '@/api/business/petowners'
 import { checkRole } from '@/utils/permission'
 import { parseTime, selectDictLabel } from '@/utils/ruoyi'
 // 引入进度信息模组件
@@ -474,44 +472,11 @@ export default {
     }
   },
   created() {
-    /** 获取宠物信息 */
-    this.getInfo(this.$route.params.id)
-    /** 获取宠物主信息 */
-    this.getPetOwners(this.$route.params.petOwnersId)
-    /** 获取宠物数量信息 */
-    this.getPetsInfo(this.$route.params.petOwnersId)
   },
   methods: {
     parseTime,
     selectDictLabel,
     checkRole,
-    // 获取宠物数量信息
-    getPetsInfo(id) {
-      listAllPets({ petOwnersId: id }).then(response => {
-        console.log('这是一些个关于宠物数量的信息:', response)
-        this.petsList = response.data
-      })
-    },
-    // 获取宠物主人信息
-    getPetOwners(id) {
-      getOwners(id).then(response => {
-        console.log('这是一些个关于宠物主的信息:', response)
-        this.petOwners = {
-          nickname: response.data[0].nickname,
-          userId: response.data[0].userId,
-          ownersId: response.data[0].ownersId,
-          phonenumber: response.data[0].phonenumber,
-          createTime: response.data[0].createTime,
-          hosipitalPownersForm: response.data[0].hosipitalPownersForm
-        }
-        console.log('这是一些个关于宠物主赋值的信息:', this.petOwners)
-        this.hosipitalPownersForm = []
-        for (const petOwner of response.data) {
-          this.hosipitalPownersForm.push({ hospitalName: petOwner.hospitalName, ...petOwner.hosipitalPownersForm })
-        }
-        console.log('会员卡的信息在这:', this.hosipitalPownersForm)
-      })
-    },
     /**
      * 字典获取完成的回调
      */
@@ -530,12 +495,6 @@ export default {
     goBack() {
       this.$router.back()
     },
-    /** 获取宠物信息(传参传宠物表id)*/
-    getInfo(id) {
-      getPets(id).then(response => {
-        this.petInfo = response.data
-      })
-    }
   }
 }
 </script>

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

@@ -323,7 +323,6 @@ color: #333333;"
               <el-form-item label="医生职称" prop="sterilizationStatus">
                 <el-select
                   v-model="form.sterilizationStatus"
-
                   clearable
                   style="width: 100%"
                 >
@@ -384,23 +383,46 @@ color: #333333;"
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="主诉" prop="petId">
-                <el-input v-model="form.petId" maxlength="20" />
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="主诉" prop="introduction">
+                <el-input
+                  type="textarea"
+                  placeholder="请输入医院简介"
+                  maxlength="400"
+                  style="width: 93%;"
+                  show-word-limit
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="医嘱" prop="petId">
-                <el-input v-model="form.petId" maxlength="20" />
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="医嘱" prop="introduction">
+                <el-input
+                  type="textarea"
+                  placeholder="请输入医院简介"
+                  maxlength="400"
+                  style="width: 93%;"
+                  show-word-limit
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="诊断结果" prop="petId">
-                <el-input v-model="form.petId" maxlength="20" />
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="诊断结果" prop="introduction">
+                <el-input
+                  type="textarea"
+                  placeholder="请输入医院简介"
+                  maxlength="400"
+                  style="width: 93%;"
+                  show-word-limit
+                />
               </el-form-item>
             </el-col>
           </el-row>
-
         </el-form>
         <!--7--用药信息-->
         <div style="display: flex">
@@ -413,7 +435,10 @@ color: #333333;"
         <!-- 内部信息 -->
         <div class="pet-insurance">
           <el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
-            <el-table-column align="center" label="药品名称" prop="protectName" />
+            <el-table-column align="center" label="药品名称" prop="protectName">
+              <el-input v-model="form.petId" maxlength="20" />
+            </el-table-column>
+
             <el-table-column align="center" label="规格" prop="type" />
             <el-table-column align="center" label="数量" prop="date" />
             <el-table-column align="center" label="用法" prop="date" />
@@ -639,10 +664,6 @@ color: #333333;"
   </div>
 </template>
 <script>
-// 导入获取宠物信息的接口
-import { getPets, listAllPets } from '@/api/business/pets'
-import { getOwners } from '@/api/business/petowners'
-import { checkRole } from '@/utils/permission'
 import { parseTime, selectDictLabel } from '@/utils/ruoyi'
 // 引入进度信息模组件
 import scheduleInfo from '@/views/service-management/registration-queue/components/schedule-info'
@@ -753,44 +774,11 @@ export default {
     }
   },
   created() {
-    /** 获取宠物信息 */
-    this.getInfo(this.$route.params.id)
-    /** 获取宠物主信息 */
-    this.getPetOwners(this.$route.params.petOwnersId)
-    /** 获取宠物数量信息 */
-    this.getPetsInfo(this.$route.params.petOwnersId)
+
   },
   methods: {
     parseTime,
     selectDictLabel,
-    checkRole,
-    // 获取宠物数量信息
-    getPetsInfo(id) {
-      listAllPets({ petOwnersId: id }).then(response => {
-        console.log('这是一些个关于宠物数量的信息:', response)
-        this.petsList = response.data
-      })
-    },
-    // 获取宠物主人信息
-    getPetOwners(id) {
-      getOwners(id).then(response => {
-        console.log('这是一些个关于宠物主的信息:', response)
-        this.petOwners = {
-          nickname: response.data[0].nickname,
-          userId: response.data[0].userId,
-          ownersId: response.data[0].ownersId,
-          phonenumber: response.data[0].phonenumber,
-          createTime: response.data[0].createTime,
-          hosipitalPownersForm: response.data[0].hosipitalPownersForm
-        }
-        console.log('这是一些个关于宠物主赋值的信息:', this.petOwners)
-        this.hosipitalPownersForm = []
-        for (const petOwner of response.data) {
-          this.hosipitalPownersForm.push({ hospitalName: petOwner.hospitalName, ...petOwner.hosipitalPownersForm })
-        }
-        console.log('会员卡的信息在这:', this.hosipitalPownersForm)
-      })
-    },
     /**
      * 字典获取完成的回调
      */
@@ -808,12 +796,6 @@ export default {
     /** 返回跳转列表页 */
     goBack() {
       this.$router.back()
-    },
-    /** 获取宠物信息(传参传宠物表id)*/
-    getInfo(id) {
-      getPets(id).then(response => {
-        this.petInfo = response.data
-      })
     }
   }
 }

src/views/service-management/registration-queue/components/doctor-card.vue

@@ -147,6 +147,10 @@ export default {
   mounted() {
     this.getDoctorList()
   },
+  created() {
+    /** 获取宠物信息 */
+    this.getDoctorList()
+  },
   methods: {
     /** 获取当日值班医生列表*/
     getDoctorList() {