Merge remote-tracking branch 'origin/master'

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

@@ -1022,7 +1022,9 @@ export default {
       checkRules: {},
       treatForm: {}, // 治疗table编辑
       treatRules: {},
-      detailInfo: {},
+      detailInfo: {
+        petOwnerBo: {}
+      },
       form: {},
       formRules: [],
       // 排序下拉框
@@ -1444,6 +1446,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log('this.editCunt', this.editCunt)
         if (tableName === 'checkManageBos') {
           deleteCheck(rowData.id).then(() => {
             this.$message({

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

 <template>
   <el-dialog class="pet-choose-modle" title="选择宠物" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
-    <el-form ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
+    <el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="100px" size="small">
       <div class="basicInformation">
         <div class="title">方式一：输入宠物ID查询</div>
       </div>
@@ -106,6 +106,15 @@ export default {
       chooseForm: {
         petStatus: ''
       },
+      rules: {
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ]
+      },
       // 选中数据
       chooseData: {},
       // 总条数

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

@@ -126,11 +126,11 @@
                 <el-button type="text">挂号</el-button>
               </div>
               <!--给它传一个userId,一个类型和一个默认页数-->
-              <div class="add" @click="registration(item.userId, '1',item,0)">
+              <div class="add">
                 <div class="add-img">
                   <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
                 </div>
-                <el-button type="text">加号</el-button>
+                <el-button type="text" :disabled="item.plusSign === '1'" @click="registration(item.userId, '1',item,0)">加号</el-button>
               </div>
             </div>
           </div>

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

@@ -182,37 +182,37 @@
       <!--      新建宠物-->
       <el-row v-if="showPetInfo" :gutter="41">
         <el-col :span="8">
-          <el-form-item label="宠主姓名:" prop="masterPhone">
+          <el-form-item label="宠主姓名:">
             {{ form.nickName }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="手机号:" prop="masterPhone">
+          <el-form-item label="手机号:">
             {{ form.phoneNumber }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="用户ID:" prop="masterPhone">
+          <el-form-item label="用户ID:">
             {{ form.ownersId }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="创建时间:" prop="masterPhone">
+          <el-form-item label="创建时间:">
             {{ form.createTime }}
           </el-form-item>
         </el-col>
         <el-col v-if="form.customers==='1'" :span="8">
-          <el-form-item label="会员等级:" prop="masterPhone">
+          <el-form-item label="会员等级:">
             {{ form.membershipLevel ? form.membershipLevel : '-' }}
           </el-form-item>
         </el-col>
         <el-col v-if="form.customers==='1'" :span="8">
-          <el-form-item label="会员卡余额:" prop="masterPhone">
+          <el-form-item label="会员卡余额:">
             {{ form.cardBalance ? form.cardBalance : '-' }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="绑定宠物数量:" prop="masterPhone">
+          <el-form-item label="绑定宠物数量:">
             {{ form.petCount }}
           </el-form-item>
         </el-col>
@@ -346,7 +346,8 @@ export default {
         ],
         // 宠物体重非空校验
         petWeight: [
-          { required: true, message: '宠物体重不能为空', trigger: 'change' }
+          { required: true, message: '宠物体重不能为空', trigger: 'change' },
+          { pattern: /^[0-9]+([.]{1}[0-9]{1,2}){0,1}$/, message: '宠物体重只能输入数字', trigger: 'blur' }
         ],
         // 绝育情况非空校验
         sterilizationStatus: [
@@ -360,6 +361,15 @@ export default {
         insure: [
           { required: true, message: '保险情况不能为空', trigger: 'change' }
         ],
+        // 宠主手机号非空校验
+        masterPhone: [
+          { required: true, message: '宠主手机号不能为空', trigger: 'blur' },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ],
         poName: [{ required: true, message: '诊位名称不能为空', trigger: 'change' },
           { min: 2, max: 20, message: '诊位名称必须介于 2 和 20 之间', trigger: 'change' },
           { pattern: /([\u4e00-\u9fa5]|[a-z]+|[0-9]+)/g, message: '诊位名称为中英文数字', trigger: 'change' }],
@@ -412,6 +422,7 @@ export default {
     },
     /** 根据手机号判断宠主是否存在，不存在新增宠主 回显宠主信息*/
     checkOwner() {
+      if (this.form.masterPhone) {
         checkPetOwner({ phone: this.form.masterPhone }).then(response => {
           const data = response.data
           console.log('这是你家吗，大姐', data)
@@ -431,6 +442,7 @@ export default {
           Object.assign(this.form, temp)
           this.showPetInfo = true
         })
+      }
     },
     // 选择新增宠物，使表单可编辑
     handleAdd() {