Merge remote-tracking branch 'origin/master'

src/api/business/device.js

@@ -54,6 +54,16 @@ export function listDevice(query) {
     params: query
   })
 }
+
+// 查询设备列表
+export function listReservationDevice(query) {
+  return request({
+    url: '/business/device/equipment-reservation',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询设备列表不分页
 export function listDeviceAll(query) {
   return request({

src/router/index.js

@@ -367,7 +367,7 @@ export const constantRoutes = [
       },
       // 检查详情
       {
-        path: '/check-detail',
+        path: 'check-detail',
         props: true,
         hidden: true,
         component: () => import('@/views/service-management/medical-record-management/check-detail.vue'),
@@ -379,7 +379,7 @@ export const constantRoutes = [
       },
       // 检查管理-立即预约
       {
-        path: '/check-subscribe',
+        path: 'check-subscribe',
         props: true,
         hidden: true,
         component: () => import('@/views/service-management/medical-record-management/check-subscribe.vue'),
@@ -391,7 +391,7 @@ export const constantRoutes = [
       },
       // 检查管理-檢查項目
       {
-        path: '/check-item',
+        path: 'check-item',
         props: true,
         hidden: true,
         component: () => import('@/views/service-management/medical-record-management/check-item.vue'),

src/views/document-management/about-us/about-us.vue

@@ -60,21 +60,30 @@ export default {
         this.$modal.msgError('内容不能为空')
         return
       }
-      if (this.isAdd) {
-        // 新增
-        addManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      } else {
-        // 修改
-        updateManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      }
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
+        if (this.isAdd) {
+          // 新增
+          addManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        } else {
+          // 修改
+          updateManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        }
+      })
     },
     getPrivacyPolicy() {
       listManagement({ type: '2' }).then(res => {

src/views/document-management/entry-contract/entry-contract.vue

@@ -39,7 +39,7 @@
       <span class="title-text">授权合同</span>
     </div>
     <!-- 授权合同表 -->
-    <el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;">
+    <el-table v-loading="loading" :data="authorizationHistory" style="width: 90%;margin: 0 0 0 60px;overflow: auto;">
       <el-table-column prop="createTime" label="授权日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
@@ -161,6 +161,7 @@ export default {
     },
     downloadPdf(row) {
       this.$download.resource(row.contract)
+      this.$modal.msgSuccess('正在下载中，请稍等…')
     },
     /** 通过授权历史获取到期日期 */
     addDays(date, str) {

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -60,21 +60,30 @@ export default {
         this.$modal.msgError('内容不能为空')
         return
       }
-      if (this.isAdd) {
-        // 新增
-        addManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      } else {
-        // 修改
-        updateManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      }
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
+        if (this.isAdd) {
+          // 新增
+          addManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        } else {
+          // 修改
+          updateManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        }
+      })
     },
     getPrivacyPolicy() {
       listManagement({ type: '0' }).then(res => {

src/views/document-management/user-protocol/user-protocol.vue

@@ -60,21 +60,30 @@ export default {
         this.$modal.msgError('内容不能为空')
         return
       }
-      if (this.isAdd) {
-        // 新增
-        addManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      } else {
-        // 修改
-        updateManagement(this.privacyPolicy).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess('编辑成功')
-          }
-        })
-      }
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
+        if (this.isAdd) {
+          // 新增
+          addManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        } else {
+          // 修改
+          updateManagement(this.privacyPolicy).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess('编辑成功')
+            }
+          })
+        }
+      })
     },
     getPrivacyPolicy() {
       listManagement({ type: '1' }).then(res => {

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

@@ -325,6 +325,10 @@ export default {
   },
   data() {
     return {
+      // 检查时间
+      checkTime: '',
+      // 检查日期
+      checkDate: '',
       // 自有设备下拉框
       isPrivateList: [
         { value: '0',
@@ -399,6 +403,10 @@ export default {
           this.form.checkType = newArr
         }
         this.createTime = (this.form.createTime.slice(0, this.form.createTime.length - 8)).replace(/-/g, '/')
+        this.checkDate = (this.form.checkStartTime.slice(0, this.form.checkStartTime.length - 8)).replace(/-/g, '/')
+        const hour = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(' ') + 1, this.form.checkStartTime.indexOf(':'))
+        const minute = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(':') + 1, this.form.checkStartTime.lastIndexOf(':'))
+        this.checkTime = hour + ':' + minute
       })
     }
   }

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

@@ -82,15 +82,16 @@
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;">
         <div style="width: 100%;text-align: end;">
-          <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">查询</el-button>
           <el-button icon="el-icon-refresh" class="resetBtn" @click="resetQuery">重置</el-button>
         </div>
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" :header-cell-class-name="cellClass">
       <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" />
       <el-table-column label="设备ID" align="left" prop="deviceCode" min-width="80" :show-overflow-tooltip="true" />
       <el-table-column label="检查项目" align="left" prop="checkItemsName"  min-width="80" :show-overflow-tooltip="true" />
       <el-table-column label="宠物昵称" align="left" prop="petNickname" min-width="80" :show-overflow-tooltip="true" />
@@ -246,6 +247,10 @@ export default {
     this.getCheckList()
   },
   methods: {
+    // 表单选择框对齐
+    cellClass(row) {
+      if (row.columnIndex === 0) { return 'disabledCheck' }
+    },
     // 检查项目下拉框
     getCheckList() {
       selectCheckItem().then(res => {

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

@@ -35,7 +35,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="宠物性别">
-            <span>{{ checkDetail.petSex }}</span>
+            <span>{{ checkDetail.petSex === '0' ? '公' : (checkDetail.petSex === '1' ? '母' : '未知')}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -102,10 +102,10 @@
       <!-- 步骤条 -->
       <div>
         <el-steps :active="schedule" align-center>
-          <el-step title="开具处方单" description="这是一段很长很长很长的描述性文字" />
-          <el-step title="缴费开票" description="这是一段很长很长很长的描述性文字" />
-          <el-step title="预约检查" description="这段就没那么长了" />
-          <el-step title="检查获取报告" description="这段就没那么长了！！！" />
+          <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-steps>
       </div>
       <div class="title-paragraph">
@@ -129,12 +129,12 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="title-paragraph">
+      <div class="title-paragraph" style="white-space: nowrap;">
         <span class="title-text">预约信息</span>
       </div>
-      <el-button @click="bookNow">立即预约</el-button>
+      <el-button class="fourWordsBtn" @click="bookNow">立即预约</el-button>
       <!-- 预约信息 -->
-      <el-row>
+      <el-row v-show="checkDetail.checkSchedule >= 2">
         <el-col :span="8">
           <el-form-item label="检查类型">
             <span>{{ checkDetail.checkType === '0' ? '医院自有服务' : '预约外部服务' }}</span>
@@ -151,54 +151,62 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="title-paragraph">
-        <span class="title-text">检查信息</span>
-      </div>
-      <!-- 检查信息 -->
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="检查项目">
-            <span>{{ checkDetail.checkItemsName || '-' }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="检查状态">
-            <span v-show="checkDetail.checkSchedule < 3">未检查</span>
-            <span v-show="checkDetail.checkSchedule === 3">已检查</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="设备">
-            <span>{{ checkDetail.deviceName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <!-- 2 -->
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="检查日期">
-            <span>{{ checkDetail.checkStartTime }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="检查时段">
-            <span>-</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="报告上传时间">
-            <span>{{ checkDetail.reportTime }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <!-- 3 -->
-      <el-row>
+      <el-row v-show="checkDetail.checkSchedule < 2" style="position: relative;left: 42px;">
         <el-col :span="8">
-          <el-form-item label="影像报告">
-            <span>{{ checkDetail.shadowReport }}</span>
-          </el-form-item>
+          暂未预约
         </el-col>
       </el-row>
+      <div v-show="checkDetail.checkSchedule >= 2">
+        <div class="title-paragraph">
+          <span class="title-text">检查信息</span>
+        </div>
+        <el-button class="fourWordsBtn" v-show="checkDetail.checkSchedule >=2 && checkDetail.reportTime === null">上传报告</el-button>
+        <!-- 检查信息 -->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检查项目">
+              <span>{{ checkDetail.checkItemsName || '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检查状态">
+              <span v-show="checkDetail.checkSchedule < 3">未检查</span>
+              <span v-show="checkDetail.checkSchedule === 3">已检查</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备">
+              <span>{{ checkDetail.deviceName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 2 -->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检查日期">
+              <span>{{ checkDetail.checkStartTime }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检查时段">
+              <span>-</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="报告上传时间">
+              <span>{{ checkDetail.reportTime || '暂未上传' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 3 -->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="影像报告">
+              <span>{{ checkDetail.shadowReport || '暂未上传' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
     <div style="display: flex; justify-content: left; margin-top: 20px">
       <el-button class="queryBtn" @click="goBack">返 回</el-button>
@@ -225,7 +233,7 @@ export default {
     // 点击 预约信息-立即预约
     bookNow() {
       this.$router.push({
-        path: '/check-subscribe',
+        name: 'CheckSubscribe',
         query: { subscribe: this.checkDetail }
       })
     },

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

@@ -149,7 +149,7 @@
             class="bookNow"
             size="mini"
             icon="el-icon-check"
-            @click="handleDelete(scope.row)"
+            @click="handleSubscribe(scope.row)"
           >立即预约</el-button>
         </template>
       </el-table-column>
@@ -164,28 +164,59 @@
     />
 
     <!-- 添加或修改业务管理-检查管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog title="立即预约" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="挂号id" prop="registId">
-          <el-input v-model="form.registId" placeholder="请输入挂号id" />
-        </el-form-item>
-        <el-form-item label="检查项目" prop="checkItemsId">
-          <el-input v-model="form.checkItemsId" placeholder="请输入检查项目" />
-        </el-form-item>
-        <el-form-item label="影像报告" prop="shadowReport">
-          <el-input v-model="form.shadowReport" placeholder="请输入影像报告" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="设备" prop="registId">
+              <el-select v-model="form.shebei" clearable placeholder="请选择设备">
+                <el-option
+                  v-for="item in dict.type.exam_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="检查日期" prop="checkItemsId">
+              <el-date-picker
+                v-model="form.jiancha"
+                type="date"
+                placeholder="请选择检查日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="支出账户金额" prop="shadowReport" label-width="120">
+              1200.00
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <el-table
+        :data="deviceList"
+        style="width: 100%">
+        <el-table-column prop="date" align="left" label="设备名称" />
+        <el-table-column prop="date" align="left" label="检查日期" />
+        <el-table-column prop="date" align="left" label="检查时段" />
+        <el-table-column prop="date" align="left" label="剩余可预约" />
+        <el-table-column prop="date" align="left" label="设备服务费" />
+        <el-table-column prop="date" align="left" label="操作" />
+      </el-table>
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { getManage, delManage, addManage, updateManage, listCheckManage } from '@/api/business/manage'
+import { listReservationDevice } from '@/api/business/device'
+
 export default {
   name: 'MedicalRecordManagement',
   dicts: ['exam_type', 'check_type', 'pet_insure', 'payment_status'],
@@ -206,8 +237,6 @@ export default {
       total: 0,
       // 业务管理-检查管理表格数据
       manageList: [{}],
-      // 弹出层标题
-      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -225,7 +254,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      // 设备集合
+      deviceList: []
     }
   },
   created() {
@@ -249,7 +280,7 @@ export default {
     // 点击检查项目
     checkItem() {
       this.$router.push({
-        path: '/check-item'
+        name: 'CheckItem'
       })
     },
     // 表单重置
@@ -270,6 +301,18 @@ export default {
       this.queryParams.pageNum = 1
       this.getList()
     },
+    /** 立即预约 */
+    handleSubscribe(row) {
+      this.open = true
+      console.log('点击立即预约', row)
+      this.getDevice()
+    },
+    /** 获取设备列表 */
+    getDevice() {
+      listReservationDevice({ reservationTime: '2023-06-15' }).then(res => {
+        console.log('设备', res)
+      })
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
@@ -285,13 +328,12 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加业务管理-检查管理'
     },
     /** 详情 */
     handleDetails(row) {
       console.log('点击详情后', row)
       this.$router.push({
-        path: '/check-detail',
+        name: 'CheckDetail',
         query: { detail: row }
       })
     },
@@ -302,7 +344,6 @@ export default {
       getManage(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改业务管理-检查管理'
       })
     },
     /** 提交按钮 */