文章编辑二次弹窗按钮×的修复

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

@@ -18,7 +18,7 @@
             <el-input
               v-model="registerForm.petNickname"
               disabled
-              placeholder="请输入宠物昵称"
+              placeholder="暂无数据"
             />
           </el-form-item>
         </el-col>
@@ -28,7 +28,7 @@
               v-model="registerForm.petSex"
               :disabled="true"
               clearable
-              placeholder="请选择宠物性别"
+              placeholder="暂无数据"
               style="width: 100%"
             >
               <el-option
@@ -42,33 +42,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物年龄" prop="petAge">
-            <el-input v-model="registerForm.petAge" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.petAge" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物品种" prop="petBreed" class="petBreed">
-            <el-input v-model="registerForm.petBreed" disabled />
-            <el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled />
+            <el-input v-model="registerForm.petBreed" placeholder="暂无数据" disabled />
+            <el-input v-model="registerForm.petChildBreed" placeholder="暂无数据" class="petChildBreed" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="体重" prop="petWeight">
-            <el-input v-model="registerForm.petWeight" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.petWeight" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="诊断时间" prop="visitDate">
-            <el-input v-model="defaultValue.date" :disabled="true" maxlength="20">-</el-input>
+            <el-input v-model="defaultValue.date" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠主姓名" prop="nickName">
-            <el-input v-model="registerForm.petOwnerBo.nickName" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.petOwnerBo.nickName" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="联系电话" prop="phoneNumber">
-            <el-input v-model="registerForm.petOwnerBo.phoneNumber" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.petOwnerBo.phoneNumber" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -78,7 +78,7 @@
               "
               :disabled="true"
               clearable
-              placeholder="请选择宠物保险情况"
+              placeholder="暂无数据"
               style="width: 100%"
             >
               <el-option
@@ -101,12 +101,12 @@
         <el-col :span="8">
           <el-form-item label="科室" prop="hospitalDepartmentName">
 
-            <el-input v-model="registerForm.hospitalDepartmentName" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.hospitalDepartmentName" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="诊位" prop="visitLocation">
-            <el-input v-model="registerForm.visitLocation" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.visitLocation" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -115,7 +115,7 @@
               v-model="visitForm.mainSuit"
               disabled
               maxlength="400"
-              placeholder="请输入患者主诉"
+              placeholder="暂无数据"
               type="textarea"
             />
           </el-form-item>
@@ -126,14 +126,14 @@
               v-model="visitForm.doctorAdvice"
               disabled
               maxlength="200"
-              placeholder="请输入医嘱"
+              placeholder="暂无数据"
               type="textarea"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="诊断结果">
-            <el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="请输入诊断结果" />
+            <el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="暂无数据" />
           </el-form-item>
         </el-col>
         <!--        开药模块--后续开发 -->

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

@@ -46,12 +46,12 @@
         </el-col>
         <el-col :span="8">
           <el-form-item class="petBreed" label="宠物品种:" prop="petBreed">
-            <el-form-item prop="petBreed">
+            <el-form-item>
               <el-select
                 v-model="form.petBreedId"
                 :disabled="!isEdit"
                 clearable
-                :placeholder="isEdit? '请输入主品种' : '暂无数据'"
+                :placeholder="isEdit? '请选择主品种' : '暂无数据'"
                 style="width: 100%"
                 @change="changePetBreedId"
               >
@@ -66,7 +66,7 @@
                 v-model="form.petChildBreedId"
                 :disabled="!isEdit"
                 clearable
-                :placeholder="isEdit? '请输入子品种' : '暂无数据'"
+                :placeholder="isEdit? '请选择子品种' : '暂无数据'"
                 style="width: 100%"
                 class="petChildBreed"
                 @change="changePetChildBreedId"
@@ -376,6 +376,10 @@ export default {
         petSex: [
           { required: true, message: '请选择宠物性别', trigger: 'change' }
         ],
+        // 宠物父级品种非空校验
+        petBreed: [
+          { required: true, message: '请选择宠物品种', trigger: 'change' }
+        ],
         // 宠物生日非空校验
         petBirthday: [
           { required: true, message: '请选择宠物生日', trigger: 'change' }

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

@@ -304,7 +304,7 @@ color: #333333;"
                         placeholder="暂无数据"
                         disabled
                         type="date"
-                        value-format="yyyy-MM-dd"
+                        value-format="yyyy/MM/dd HH:mm:ss"
                       />
                     </el-form-item>
                   </el-col>
@@ -332,7 +332,7 @@ color: #333333;"
                         disabled
                         placeholder="暂无数据"
                         type="date"
-                        value-format="yyyy-MM-dd"
+                        value-format="yyyy/MM/dd"
                       />
                     </el-form-item>
                   </el-col>

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

@@ -78,8 +78,7 @@
         </el-form-item>
       </el-form>
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+      <el-row class="mb8">
         <el-button
           class="fourWordsBtn"
           icon="el-icon-plus"
@@ -87,7 +86,6 @@
           @click="handleAdd"
         >新增挂号
         </el-button>
-        </el-col>
         <!--选择全部-->
         <el-button
           class="fourWordsBtn"