进度信息模块封装ui代码优化

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

@@ -9,7 +9,7 @@
   >
     <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
       <el-form-item label="主治兽医：" prop="petNickname">
-        <el-input v-model="queryParams.mainDoctor" />
+        <el-input v-model="queryParams.mainDoctor"/>
       </el-form-item>
       <el-form-item label="是否首诊:" prop="petSex">
         <el-select
@@ -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="门诊诊查费"
@@ -81,7 +81,8 @@
 </template>
 
 <script>
-import { addRegister, timeRegister } from '@/api/business/register'
+import { addRegister, checkPet, timeRegister } from '@/api/business/register'
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'RegisterModle',
@@ -102,6 +103,10 @@ export default {
     doctorForm: {
       type: Object
     },
+    // 父级调手机号查宠主信息--获取宠物列表
+    petForm: {
+      type: Object
+    },
     // 医生选择
     doctorChoose: {
       type: Object
@@ -148,6 +153,7 @@ export default {
     }
   },
   methods: {
+    parseTime,
     // 获取相应id的医生详情
     getRegisterMsg() {
       console.log('HHHHHHHHHHHHHHHUUUUUUUUUUUUUUUUUU', this.doctorId, this.currentPage, this.registrationType)
@@ -166,8 +172,11 @@ export default {
       console.log('这是弹窗本身的行信息：', data)
       console.log('这是宠物宠主本身的信息：', this.doctorForm)
       console.log('这是当日挂号列表信息 ：', this.singleDoctor)
+      console.log('这就是被父级传过来的宠主和名下宠物列表信息：', this.petForm)
       // 进度
       const temp = {
+        // 给接口所需的宠物赋值
+        petOwnerBo: this.petForm,
         type: this.registrationType,
         // 宠物宠主本身的信息
         petsId: null,
@@ -216,12 +225,31 @@ export default {
         doctorTitleLabel: this.singleDoctor.doctorTitleValue
       }
       console.log('终极大表', temp)
-      addRegister(temp).then(response => {
-        this.$message({
-          type: 'success',
-          message: '预约成功!'
-        })
-        this.$emit('registerModleClose', false)
+      // 进入挂号页面先获取是否有重复的宠物数据
+      checkPet(temp).then(({ msg }) => {
+        console.log('aaa,这是关键判断是否已存在宠物的数据', msg)
+        if (msg) {
+          this.$modal.confirm('当前宠物已经存在是否覆盖数据')
+            .then(_ => {
+              addRegister(temp).then(response => {
+                console.log('这是确认完成后调用新增挂号的数据返参', response)
+                this.$message({
+                  type: 'success',
+                  message: '预约成功!'
+                })
+                this.$emit('registerModleClose', false)
+              })
+            })
+        } else {
+          addRegister(temp).then(response => {
+            console.log('这是确认不存在后调用新增挂号的数据返参', response)
+            this.$message({
+              type: 'success',
+              message: '预约成功!'
+            })
+            this.$emit('registerModleClose', false)
+          })
+        }
       })
     },
 
@@ -243,7 +271,6 @@ export default {
     /** 功能按钮--重置按钮操作 */
     resetQuery() {
       this.daterangeCreateTime = []
-      this.daterangeUpdateTime = []
       this.resetForm('queryForm')
       this.handleQuery()
     },

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

@@ -26,12 +26,12 @@
       <el-row :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠物ID:" prop="petsId">
-            <el-input v-model="form.petsId" :disabled="true" maxlength="20" />
+            <el-input v-model="form.petsId" :disabled="true" maxlength="20"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物昵称:" prop="petNickname">
-            <el-input v-model="form.petNickname" :disabled="!isEdit" maxlength="20" placeholder="请输入宠物昵称" />
+            <el-input v-model="form.petNickname" :disabled="!isEdit" maxlength="20" placeholder="请输入宠物昵称"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -75,6 +75,7 @@
             <el-date-picker
               v-model="form.petBirthday"
               :disabled="!isEdit"
+              :picker-options="pickerOptions"
               clearable
               placeholder="请选择宠物生日"
               type="date"
@@ -93,7 +94,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物毛色:" prop="petColor">
-            <el-input v-model="form.petColor" :disabled="!isEdit" maxlength="20" placeholder="请输入宠物毛色" />
+            <el-input v-model="form.petColor" :disabled="!isEdit" maxlength="20" placeholder="请输入宠物毛色"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -159,7 +160,7 @@
       <el-row v-if="isEdit && !showPetInfo" :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠主手机号:" prop="masterPhone">
-            <el-input v-model="form.masterPhone" :disabled="!isEdit" maxlength="11" @blur="checkOwner" />
+            <el-input v-model="form.masterPhone" :disabled="!isEdit" maxlength="11" @blur="checkOwner"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -208,18 +209,19 @@
 
     </el-form>
     <!--进度信息-->
-    <schedule-info />
+    <schedule-info/>
     <!--    医生卡片-->
-    <doctor-card @doctorDetail="handleDoctor" @registration="handleRegister" />
+    <doctor-card @doctorDetail="handleDoctor" @registration="handleRegister"/>
     <!--    宠物选择弹框-->
-    <choose-pet :is-show="showPetModle" @petChoose="petChoose" @petModleClose="closePetModle" />
+    <choose-pet :is-show="showPetModle" @petChoose="petChoose" @petModleClose="closePetModle"/>
     <!--   医生详情弹出框 -->
-    <doctor-detail :doctor-id="doctorId" :is-show="showDoctorModle" @doctorModleClose="closeDoctorModle" />
+    <doctor-detail :doctor-id="doctorId" :is-show="showDoctorModle" @doctorModleClose="closeDoctorModle"/>
     <!--    挂号/加号弹出框-->
     <register-modle
       :doctor-form="test"
       :doctor-id="doctorIdNd"
       :is-show="showRegistrationModle"
+      :pet-form="petForm"
       :registration-type="registrationType"
       :single-doctor="singleDoctor"
       @registerModleClose="closeRegisterModle"
@@ -253,12 +255,19 @@ export default {
   },
   data() {
     return {
+      // 宠物出生日期校验
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        }
+      },
       test: {},
       singleDoctor: {}, // 单个医生信息
       showPetInfo: false, // 回显宠主详细信息
       doctorId: '', // 医生id用来获取详情等信息(详情)
       // 医生id用来获取详情等信息(挂号+加号)
       doctorIdNd: '',
+      petForm: '',
       registrationType: 'usual', // 挂号/加号
       isEdit: false, // 表单是否可编辑 默认不可编辑
       statusList: [
@@ -343,6 +352,8 @@ export default {
     checkOwner() {
       checkPetOwner({ phone: this.form.masterPhone }).then(response => {
         const data = response.data
+        console.log('这是你家吗，大姐', data)
+        this.petForm = data
         const temp = {
           // 宠主信息开始
           nickName: data.nickName,