Merge remote-tracking branch 'origin/master'

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

@@ -129,10 +129,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="title-paragraph" style="white-space: nowrap;">
-        <span class="title-text">预约信息</span>
+      <div style="display: flex;align-items: center;margin-bottom: 10px;">
+        <div style="height: 16px;border-left: 3px solid #5bb647;" />
+        <div style="padding-left: 10px;">预约信息</div>
+        <div style="margin-left: auto;padding-right: 50px;">
+          <el-button class="fourWordsBtn" @click="bookNow">立即预约</el-button>
+        </div>
       </div>
-      <el-button class="fourWordsBtn" @click="bookNow">立即预约</el-button>
       <!-- 预约信息 -->
       <el-row v-show="checkDetail.checkSchedule >= 2">
         <el-col :span="8">
@@ -157,10 +160,13 @@
         </el-col>
       </el-row>
       <div v-show="checkDetail.checkSchedule >= 2">
-        <div class="title-paragraph">
-          <span class="title-text">检查信息</span>
+        <div style="display: flex;align-items: center;margin-bottom: 10px;">
+          <div style="height: 16px;border-left: 3px solid #5bb647;" />
+          <div style="padding-left: 10px;">检查信息</div>
+          <div style="margin-left: auto;padding-right: 50px;">
+            <el-button v-show="checkDetail.checkSchedule >=2 && checkDetail.reportTime === null" class="fourWordsBtn">上传报告</el-button>
+          </div>
         </div>
-        <el-button v-show="checkDetail.checkSchedule >=2 && checkDetail.reportTime === null" class="fourWordsBtn">上传报告</el-button>
         <!-- 检查信息 -->
         <el-row>
           <el-col :span="8">

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

@@ -18,8 +18,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="checkName">
-        <el-select v-model="queryParams.checkName" :disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable placeholder="检查项目">
+      <el-form-item>
+        <el-select v-model="queryParams.checkItemsId" :disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable placeholder="检查项目">
           <el-option
             v-for="item in checkItemOptions"
             :key="item.id"
@@ -38,11 +38,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="payAmount">
+      <el-form-item>
         <el-date-picker
-          v-model="queryParams.payAmount"
+          v-model="queryParams.checkStartTime"
           type="date"
           placeholder="请选择检查时间"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
         />
       </el-form-item>
       <el-form-item>
@@ -150,6 +152,7 @@
             size="mini"
             icon="el-icon-check"
             @click="handleSubscribe(scope.row)"
+            :disabled="scope.row.deviceId !== null"
           >立即预约</el-button>
         </template>
       </el-table-column>
@@ -235,6 +238,8 @@
 import { getManage, delManage, addManage, updateManage, listCheckManage } from '@/api/business/manage'
 import { deviceUseInSubscribeList, listReservationDevice } from '@/api/business/device'
 import { listItemByType } from '@/api/business/item'
+import { parseTime } from '@/utils/ruoyi'
+import { updateCheck } from '@/api/business/mdeicalRecord'
 
 export default {
   name: 'MedicalRecordManagement',
@@ -268,7 +273,9 @@ export default {
         isAsc: null,
         petNickname: null,
         checkType: null,
-        checkSchedule: null
+        checkSchedule: null,
+        checkItemsId: null,
+        checkStartTime: null
       },
       // 排序方式集合
       sortList: [
@@ -336,7 +343,9 @@ export default {
       // 检查项目下拉框
       checkItemOptions: [],
       // 设备下拉框
-      selectableDevice: []
+      selectableDevice: [],
+      // 当前的检查ID
+      currentCheckId: null
     }
   },
   created() {
@@ -442,6 +451,7 @@ export default {
       this.deviceQueryParams.checkTypeList.push(row.checkItemsId)
       this.deviceQueryParams.checkTypeList = [...new Set(this.deviceQueryParams.checkTypeList)]
       this.deviceQueryParams.reservationTime = this.getCurrentTime()
+      this.currentCheckId = row.id
       console.log('点击立即预约后的状态', this.deviceQueryParams)
       // 设置检查项目id
       this.getDevice()
@@ -455,7 +465,34 @@ export default {
       return year + '-' + month + '-' + day
     },
     /** 对话框立即预约设备 */
-    handleSubscribeDevice() {
+    handleSubscribeDevice(row) {
+      console.log('点击里面的立即预约', row)
+      this.$confirm('立即预约此设备,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
+        console.log('确定后...')
+        const checkMessage = {}
+        const checkTimeList = row.checkTime.split('-')
+        checkMessage.id = this.currentCheckId
+        checkMessage.deviceId = row.deviceId
+        checkMessage.deviceName = row.deviceName
+        checkMessage.appointTime = parseTime(new Date())
+        checkMessage.checkStartTime = row.checkDate + ' ' + checkTimeList[0]
+        checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
+        console.log('需要修改的对象', checkMessage)
+        const list = []
+        list.push(checkMessage)
+        updateCheck(list).then(res => {
+          if (res.code === 200) {
+            this.$modal.msgError('预定设备成功')
+          }
+        })
+      })
     },
     /** 获取设备列表 */
     getDevice() {
@@ -470,8 +507,11 @@ export default {
       this.resetForm('queryForm')
       this.sortColumn = ''
       this.queryParams.orderByColumn = ''
-      this.queryParams.isAsc = ''
-      this.queryParams.checkSchedule = ''
+      this.queryParams.isAsc = null
+      this.queryParams.checkSchedule = null
+      this.queryParams.checkType = null
+      this.queryParams.checkItemsId = null
+      this.queryParams.checkStartTime = null
       this.handleQuery()
     },
     // 多选框选中数据