Merge remote-tracking branch 'origin/master'

src/api/business/register.js

@@ -16,6 +16,13 @@ export function getRegister(id) {
     method: 'get'
   })
 }
+// 查询挂号详细--录入诊断
+export function inputDiagnosis(id) {
+  return request({
+    url: '/business/register/inputDiagnosis/' + id,
+    method: 'get'
+  })
+}
 
 // 新增挂号
 export function addRegister(data) {

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

@@ -879,14 +879,14 @@ export default {
   },
   data() {
     return {
+      // 进度
+      scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
       // 宠物出生日期校验
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now()
         }
       },
-      // 进度
-      scheduleKey: {},
       checkItemOptions: [], // 项目选项列表 根据检查类型变化
       treatItemOptions: [], // 治疗项目选项列表
       checkManageBos: [], // 检查列表数据

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -105,7 +105,7 @@ export default {
       // 宠物表格数据
       petsList: [],
       // 遮罩层
-      loading: true,
+      loading: false,
       // 查询参数
       queryParams: {
         // 导出列表

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

 <template>
   <el-dialog
     :before-close="closeModle"
-    :title="registrationType === 'usual' ? '挂号' : '加号'"
+    :title="registrationType === '0' ? '挂号' : '加号'"
     :visible.sync="isShow"
     append-to-body
     class="register-modle"
@@ -43,9 +43,9 @@
           <span>{{ parseTime(scope.row.workDate, '{y}/{m}/{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="时段" min-width="80" prop="hours" show-overflow-tooltip/>
-      <el-table-column align="center" label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip/>
-      <el-table-column align="center" label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip/>
+      <el-table-column align="center" label="时段" min-width="80" prop="hours" show-overflow-tooltip />
+      <el-table-column align="center" label="总放号数" min-width="80" prop="allCount" show-overflow-tooltip />
+      <el-table-column align="center" label="剩余号数" min-width="80" prop="residueCount" show-overflow-tooltip />
       <el-table-column
         align="center"
         label="门诊诊查费"
@@ -104,9 +104,9 @@ export default {
       type: Number
     },
     // 当前页
-    currentPage: {
-      type: Number
-    },
+    // currentPage: {
+    //   type: Number
+    // },
     // 新增挂号宠物的所有信息
     doctorForm: {
       type: Object
@@ -129,7 +129,7 @@ export default {
   },
   data() {
     return {
-      // currentPage: 0,
+      currentPage: 0,
       // 选中数组
       ids: [],
       // 总条数
@@ -141,7 +141,7 @@ export default {
         mainDoctor: '',
         firstVisit: '0',
         pageNum: 1,
-        pageSize: 2
+        pageSize: 10
 
       },
       fristVisitOptions: [
@@ -165,6 +165,7 @@ export default {
   created() {
     // 获取当前时间
     this.currentTime()
+    this.getRegisterMsg()
   },
   methods: {
     /**
@@ -192,9 +193,14 @@ export default {
       return current.isBetween(startTime, endTime, 'minute')
     },
     parseTime,
-    // 获取相应id的医生详情
+    /**
+     * 获取医生当日排班列表
+     * currentPage默认值为0，是加号弹出框时的逻辑（registrationType = 1为加号）
+     * 在初次进入加号时currentPage字段保证后台返回当时页面
+     * 再次点击分页按钮后按照正常页面传值 currentPage被赋值大于0
+     * */
     getRegisterMsg() {
-      console.log('HHHHHHHHHHHHHHHUUUUUUUUUUUUUUUUUU', this.doctorId, this.currentPage, this.registrationType)
+      console.log('getRegisterMsg', this.doctorId, this.currentPage, this.registrationType)
       timeRegister({
         userId: this.doctorId,
         type: this.registrationType,
@@ -206,7 +212,10 @@ export default {
         this.petsList = response.rows.rows
         console.log('这是预约数据：', this.petsList)
         this.total = response.total
+        if (this.registrationType === '1' && this.currentPage === 0) {
           this.queryParams.pageNum = response.rows.currentPage
+          this.currentPage = response.rows.currentPage
+        }
       })
     },
     // 新增预约接口

src/views/service-management/registration-queue/components/schedule-info.vue

@@ -109,7 +109,7 @@
         </div>
       </div>
     </div>
-  </div>
+
 </template>
 
 <script>

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

@@ -222,6 +222,7 @@
     <doctor-detail :doctor-id="doctorId" :is-show="showDoctorModle" @doctorModleClose="closeDoctorModle" />
     <!--    挂号/加号弹出框-->
     <register-modle
+      v-if="showRegistrationModle"
       :current-page="currentPage"
       :doctor-form="test"
       :doctor-id="doctorIdNd"
@@ -273,7 +274,7 @@ export default {
       doctorId: '', // 医生id用来获取详情等信息(详情)
       // 医生id用来获取详情等信息(挂号+加号)
       doctorIdNd: 0,
-      petForm: '',
+      petForm: {},
       registrationType: '0', // 挂号/加号
       currentPage: 0,
       isEdit: false, // 表单是否可编辑 默认不可编辑