Merge remote-tracking branch 'origin/master'

src/api/business/register.js

 import request from '@/utils/request'
-import { param } from '@/utils'
 
 // 查询挂号列表
 export function listRegister(query) {

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

@@ -60,6 +60,14 @@ export default {
         this.$modal.msgError('内容不能为空')
         return
       }
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
         if (this.isAdd) {
           // 新增
           addManagement(this.privacyPolicy).then(response => {
@@ -75,6 +83,7 @@ export default {
             }
           })
         }
+      })
     },
     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,6 +60,14 @@ export default {
         this.$modal.msgError('内容不能为空')
         return
       }
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
         if (this.isAdd) {
           // 新增
           addManagement(this.privacyPolicy).then(response => {
@@ -75,6 +83,7 @@ export default {
             }
           })
         }
+      })
     },
     getPrivacyPolicy() {
       listManagement({ type: '0' }).then(res => {

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

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

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

@@ -307,9 +307,9 @@ export default {
       console.log('点击立即预约', row)
       this.getDevice()
     },
-    /**  */
+    /** 获取设备列表 */
     getDevice() {
-      listReservationDevice().then(res => {
+      listReservationDevice({ reservationTime: '2023-06-15' }).then(res => {
         console.log('设备', res)
       })
     },

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

 <template>
+  <div>
     <!-- 医生卡片信息封装组件-->
-  <div class="doctor-card">
+    <!--做单个卡片校验-->
+    <div v-if="docList.length>0" class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
         <div class="tip-green"/>
@@ -135,6 +137,8 @@
         </el-card>
       </div>
     </div>
+    <div v-else>-</div>
+  </div>
 </template>
 
 <script>

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

@@ -9,11 +9,11 @@
   >
     <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
       <el-form-item label="主治兽医：" prop="petNickname">
-        <el-input />
+        <el-input v-model="queryParams.mainDoctor" />
       </el-form-item>
       <el-form-item label="是否首诊:" prop="petSex">
         <el-select
-          v-model="queryParams.sterilizationStatus"
+          v-model="queryParams.fristVisit"
           clearable
           placeholder="请选择首诊情况"
           style="width: 100%"
@@ -55,7 +55,7 @@
             icon="el-icon-document"
             plain
             size="mini"
-            style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
+            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
             type="success"
             @click="addReservation(scope.row)"
           >立即预约
@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import { addRegister, timeRegister } from '@/api/business/register'
+import { timeRegister } from '@/api/business/register'
 
 export default {
   name: 'RegisterModle',
@@ -112,7 +112,11 @@ export default {
       // 宠物表格数据
       petsList: [],
       loading: true,
-      queryParams: {},
+      queryParams: {
+        mainDoctor: '',
+        firstVisit: '0'
+
+      },
       fristVisitOptions: [
         {
           label: '是',
@@ -146,19 +150,68 @@ export default {
     },
     // 新增预约接口
     addReservation(data) {
-      console.log('gggggg', data, this.doctorForm, this.singleDoctor)
+      // data指这一行的信息，this.doctorForm指的是挂号页宠主宠物信息，this.singleDoctor指的是当日挂号医生列表信息
+      console.log('这是弹窗本身的行信息：', data)
+      console.log('这是宠物宠主本身的信息：', this.doctorForm)
+      console.log('这是当日挂号列表信息 ：', this.singleDoctor)
+      data.visitWay = '0'
+      data.visitFirstTime = ''
+      data.payStatus = '0'
+      data.petPicture = ''
+      // 进度
+      data.checkSchedule = '0'
+      data.payAmount = ''
+      data.payType = '0'
       const temp = {
-        petOwnersName: data.petOwnersName
+        type: this.registrationType,
+        // 宠物宠主本身的信息
+        petsId: this.doctorForm.petsId,
+        petOwnersId: this.doctorForm.ownersId,
+        petOwnersName: this.doctorForm.nickName,
+        petOwnersPhone: this.doctorForm.phoneNumber,
+        petNickname: this.doctorForm.petNickname,
+        petBreed: this.doctorForm.petBreed,
+        petSex: this.doctorForm.petSex,
+        petAge: this.doctorForm.petBrithday,
+        petWeight: this.doctorForm.petWeight,
+        petColor: this.doctorForm.petColor,
+        sterilizationStatus: this.doctorForm.sterilizationStatus,
+        vaccineSituation: this.doctorForm.vaccineSituation,
+        insure: this.doctorForm.insure,
+        // 进度
+        checkSchedule: data.checkSchedule,
+        payAmount: data.payAmount,
+        payType: data.payType,
+        visitDateTime: this.doctorForm.visitDateTime,
+        // 这是当日挂号列表信息
+        doctorId: this.singleDoctor.doctorCode,
+        userId: this.singleDoctor.userId,
+        doctorName: this.singleDoctor.doctorName,
+        hospitalId: this.singleDoctor.deptId,
+        hospitalName: this.singleDoctor.deptName,
+        hospitalDepartmentId: this.singleDoctor.departmentId,
+        hospitalDepartmentName: this.singleDoctor.departmentName,
+        doctorPhone: this.singleDoctor.doctorPhone,
+        // 给传0
+        visitWay: data.visitWay,
+        // 下拉传值
+        firstVisit: this.queryParams.firstVisit,
+        visitDate: data.workDate,
+        visitTime: data.hours,
+
+        scheduleId: data.scheduleId,
+        // 拼接 (日期+时间段的第一个时间)
+        visitFirstTime: data.visitFirstTime,
+        // 默认是0代缴费
+        payStatus: data.payStatus,
+        // 给传个null
+        petPicture: data.petPicture,
+
+        doctorSignatureUrl: this.singleDoctor.doctorSignatureUrl,
+        visitLocation: this.singleDoctor.visitLocation,
+        doctorTitleLabel: this.singleDoctor.doctorTitleValue
       }
-      console.log('KKKKKKKKKKKKKKK', temp)
-      // 将整个界面对象传新增挂号接口
-      // addRegister(temp).then(response => {
-      //   this.$message({
-      //     type: 'success',
-      //     message: '预约成功!'
-      //   })
-      //   this.$emit('registerModleClose', false)
-      // })
+      console.log('终极大表', temp)
     },
     submit() {
     },

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

@@ -157,7 +157,7 @@
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
-            >录入诊断
+            >
             </el-button>
           </template>
         </el-table-column>