Merge remote-tracking branch 'origin/master'

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

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

@@ -1095,7 +1095,7 @@ export default {
       })
     },
     /** 获取页面详情*/
-    getDetail() {
+    getDetail(type = 'usual') {
       getRecord(this.$route.params.id).then(response => {
         console.log('KKKKKKKKKKKKKKKKKKKK', response)
         response.data.checkManageBos.forEach(item => {
@@ -1110,8 +1110,10 @@ export default {
         this.treatManageBo = []
         this.checkManageBos.push(...response.data.checkManageBos)
         this.treatManageBo.push(...response.data.treatManageBo)
-        this.petInfo = { ...response.data }
-        this.detailInfo = { ...response.data }
+        if (type !== 'update') {
+          this.petInfo = { ...response.data }
+          this.detailInfo = { ...response.data }
+        }
         console.log(this.checkManageBos, 'kkkkkkkkkkkkkkkkkkkkkkk')
       })
       // const temp = {
@@ -1320,7 +1322,7 @@ export default {
               type: 'success',
               message: '删除成功!'
             })
-            this.getDetail()
+            this.getDetail('update')
           })
         } else if (tableName === 'treatManageBo') {
           deleteTreat(rowData.id).then(() => {
@@ -1328,7 +1330,7 @@ export default {
               type: 'success',
               message: '删除成功!'
             })
-            this.getDetail()
+            this.getDetail('update')
           })
         }
       }).catch(() => {
@@ -1402,7 +1404,7 @@ export default {
                 this.$message.success('保存成功')
                 // 刷新检查信息列表
                 // this.getCheckList()
-                this.getDetail()
+                this.getDetail('update')
               })
             } else {
               const temp = {
@@ -1417,7 +1419,7 @@ export default {
                 this.$message.success('保存成功')
                 // 刷新检查信息列表
                 // this.getCheckList()
-                this.getDetail()
+                this.getDetail('update')
               })
             }
           } else if (listName === 'treatManageBo') {
@@ -1437,7 +1439,7 @@ export default {
                 this.$message.success('保存成功')
                 // 刷新治疗信息列表
                 // this.getTreatList()
-                this.getDetail()
+                this.getDetail('update')
               })
             } else {
               const temp = {
@@ -1452,7 +1454,7 @@ export default {
                 this.$message.success('保存成功')
                 // 刷新治疗信息列表
                 // this.getTreatList()
-                this.getDetail()
+                this.getDetail('update')
               })
             }
           }

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

@@ -134,7 +134,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    // this.getList()
   },
   methods: {
     /** 列表区--多选框选中数据 */
@@ -184,12 +184,14 @@ export default {
       this.loading = true
       this.queryParams.params = { ...this.queryParams.params }
       const queryParams = deepClone(this.queryParams)
-      getPetInfo(queryParams).then(response => {
-        console.log('查询宠物宠主信息:', this.petsList)
-        this.petsList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+      if (queryParams.petCode || queryParams.ownerName || queryParams.phone) {
+        getPetInfo(queryParams).then(response => {
+          console.log('查询宠物宠主信息:', this.petsList)
+          this.petsList = response.rows
+          this.total = response.total
+          this.loading = false
+        })
+      }
     }
   }
 }

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

@@ -57,12 +57,12 @@
             <!--卡片中间部分-->
             <div class="mid-bottom-framework">
               <div
-                v-for="(item,index) in docList"
-                :key="index"
+                v-for="(pic,picIndex) in item.pictureUrl"
+                :key="`picIndex${picIndex}`"
                 class="mid-bottom"
               >
                 <el-image
-                  :src="baseURL+item.pictureUrl"
+                  :src="baseURL+pic"
                   class="mid-bottom-inner"
                   fit="cover"
                 />

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">
@@ -98,7 +98,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">
@@ -164,7 +164,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>
@@ -213,13 +213,13 @@
 
     </el-form>
     <!--进度信息-->
-    <schedule-info :schedule-key="scheduleKey"/>
+    <schedule-info :schedule-key="scheduleKey" />
     <!--    医生卡片-->
-    <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
       :current-page="currentPage"
@@ -469,8 +469,11 @@ export default {
     },
 
     /** 关闭挂号回调*/
-    closeRegisterModle() {
+    closeRegisterModle(data) {
       this.showRegistrationModle = false
+      if (data && data.type === 'addRegisterSuccess') {
+        this.$router.push(`/service-management/registration-detail/${data.id}/detail`)
+      }
     },
     /** 提交按钮*/
     submitForm() {