67559 全局，返回二次提示修改

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

@@ -2,17 +2,16 @@
   <!--进度信息模块封装-->
   <div class="schedule-info">
     <!--   1--tip样式-->
-    <div class="progress-tip">
-      <div class="tip-green" />
-      <div
-        class="tip-content"
-      >进度信息
+    <div style="margin-bottom: 1.875rem;margin-top:1rem;display: flex">
+      <!--绿色模块图标-->
+      <div class="tip-consult-add" />
+      <div style="padding-top: 0.125rem;padding-left: 0.875rem;color: #666666; font-weight: 700; font-size: 1rem;">进度信息
       </div>
     </div>
     <!--   2--内容样式-->
     <div class="progress-base">
       <div class="display-base" style="justify-content: center">
-        <div style="border: 1px dashed #E5E5E5;display: flex;padding:40px 32px 40px 32px;">
+        <div style="border: 1px dashed #E5E5E5;display: flex;padding:2.5rem 2rem 2.5rem 2rem;">
           <!-- 1--单个的背景,,后面按状态位切换样式-->
           <div :class="[scheduleKey.checkSchedule === '0'? 'bkg-on' : 'bkg-off']">
             <!--1.预约/现场挂号-->
@@ -230,4 +229,32 @@ export default {
   }
 
 }
+/*进度条样式*/
+.schedule_style {
+  margin-top: 20px !important;
+}
+
+/*底部提交返回按钮布局*/
+.footer-expenditure-style {
+  margin-top: 0rem;
+  margin-left: 8rem;
+}
+
+/*底部提交返回按钮布局*/
+.right-footer-consult-style {
+  margin-top: 1.875rem;
+  margin-left: 0rem;
+}
+
+/*输入框下边距应为24*/
+.input-bottom-style {
+  margin-bottom: 0.125rem !important;
+}
+
+/*tip竖条*/
+.tip-consult-add {
+  height: 1.5rem;
+  line-height: 1;
+  border-left: 0.1875rem solid #5FB54B;
+}
 </style>

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

 <template>
   <div class="registration-add-module">
     <div class="registration-title">新增挂号</div>
-    <el-form ref="from" :model="form" :rules="rules" class="registration-add-form" label-width="6.5rem" size="small">
-      <div class="basicInformation">
-        <div class="title">宠物信息</div>
+    <el-form ref="from" :model="form" :rules="rules" class="registration-add-form" label-width="5.8rem">
+      <!--基本信息标题-->
+      <div style="margin-bottom: 1.875rem;display: flex; justify-content: space-between; align-items: center;">
+        <div style="display: flex">
+          <!--绿色模块图标-->
+          <div class="tip-consult-add" />
+          <div style="padding-top: 0.125rem;padding-left: 0.875rem;color: #666666; font-weight: 700; font-size: 1rem;">宠物信息</div>
+        </div>
         <div class="pet-add-btns">
           <el-button
             class="fourWordsBtn"
@@ -24,8 +29,9 @@
         </div>
       </div>
       <!--      宠物基本信息-->
+      <div style="margin-left: 1rem">
         <el-row :gutter="41">
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物ID" prop="petsId">
               <el-input
                 v-model="form.petsId"
@@ -35,7 +41,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物昵称" prop="petNickname">
               <el-input
                 v-model.trim="form.petNickname"
@@ -67,7 +73,7 @@
                 />
               </el-select>
             </el-form-item>
-          <el-form-item prop="petChildBreedId" label-width="5px">
+            <el-form-item prop="petChildBreedId" label-width="0.3125rem">
               <el-select
                 v-model="form.petChildBreedId"
                 :disabled="!isEdit"
@@ -86,7 +92,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物性别" prop="petSex">
               <el-select
                 v-model="form.petSex"
@@ -104,11 +110,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物生日" prop="petBirthday">
               <el-date-picker
                 v-model="form.petBirthday"
                 :disabled="!isEdit"
+                style="width: 100% !important;"
                 :picker-options="pickerOptions"
                 clearable
                 :placeholder="isEdit? '请选择宠物生日' : '-'"
@@ -117,7 +124,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <!--宠物体重-->
             <el-form-item label="宠物体重" prop="petWeight">
               <div style="display: flex;align-items: center;">
@@ -131,7 +138,7 @@
               </div>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物毛色" prop="petColor">
               <el-input
                 v-model.trim="form.petColor"
@@ -141,7 +148,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="绝育情况" prop="sterilizationStatus">
               <el-select
                 v-model="form.sterilizationStatus"
@@ -159,7 +166,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="疫苗情况" prop="vaccineSituation">
               <el-select
                 v-model="form.vaccineSituation"
@@ -177,7 +184,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠物保险" prop="insure">
               <el-select
                 v-model="form.insure"
@@ -196,13 +203,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+      </div>
       <!--      宠主信息--新增 -->
-      <div v-if="isEdit && !showPetInfo" class="basicInformation">
-        <div class="title">宠主信息</div>
+      <div v-if="isEdit && !showPetInfo"> <!--基本信息标题-->
+        <div style="margin-bottom: 1.875rem;margin-top:1rem;display: flex">
+          <!--绿色模块图标-->
+          <div class="tip-consult-add" />
+          <div style="padding-top: 0.125rem;padding-left: 0.875rem;color: #666666; font-weight: 700; font-size: 1rem;">宠主信息</div>
+        </div>
       </div>
       <!--      新建宠物-->
+      <div style="margin-left: 1rem">
         <el-row v-if="isEdit && !showPetInfo" :gutter="41">
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <!--     选择宠物后,再点击新增会出现判空控件混淆,所以加个key     -->
             <el-form-item key="1" label="宠主手机号" prop="masterPhone">
               <el-input
@@ -214,14 +227,19 @@
               />
             </el-form-item>
           </el-col>
-      </el-row>
+        </el-row></div>
       <!--      宠主信息--回显 -->
-      <div v-if="showPetInfo" class="basicInformation">
-        <div class="title">宠主信息</div>
+      <div v-if="showPetInfo"> <!--基本信息标题-->
+        <div style="margin-bottom: 1.875rem;margin-top:1rem;display: flex">
+          <!--绿色模块图标-->
+          <div class="tip-consult-add" />
+          <div style="padding-top: 0.125rem;padding-left: 0.875rem;color: #666666; font-weight: 700; font-size: 1rem;">宠主信息</div>
+        </div>
       </div>
       <!--      新建宠物-->
+      <div style="margin-left: 1rem">
         <el-row v-if="showPetInfo" :gutter="41">
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="宠主姓名">
               <el-input
                 v-model.trim="form.nickName"
@@ -230,7 +248,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="手机号">
               <el-input
                 v-model.trim="form.phoneNumber"
@@ -239,7 +257,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="用户ID">
               <el-input
                 v-model.trim="form.ownersId"
@@ -248,7 +266,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="创建日期">
               <el-input
                 v-model.trim="form.createTime"
@@ -257,7 +275,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col v-if="form.customers !=='0'" :span="8">
+          <el-col v-if="form.customers !=='0'" :span="8" class="input-bottom-style">
             <el-form-item label="会员等级">
               <el-input
                 v-model.trim="form.membershipLevel"
@@ -266,7 +284,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col v-if="form.customers !=='0'" :span="8">
+          <el-col v-if="form.customers !=='0'" :span="8" class="input-bottom-style">
             <el-form-item label="会员卡余额">
               <div style="display: flex; align-items: center;">
                 <el-input
@@ -278,7 +296,7 @@
               </div>
             </el-form-item>
           </el-col>
-        <el-col v-if="form.customers !=='0'" :span="8">
+          <el-col v-if="form.customers !=='0'" :span="8" class="input-bottom-style">
             <el-form-item label="状态">
               <el-select v-model="form.status" class="vaccine-situation" placeholder="-" disabled>
                 <el-option
@@ -290,7 +308,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        <el-col :span="8">
+          <el-col :span="8" class="input-bottom-style">
             <el-form-item label="绑定宠物数量">
               <el-input
                 v-model.trim="form.petCount"
@@ -300,7 +318,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+      </div>
     </el-form>
     <!--进度信息-->
     <schedule-info class="schedule_style" :schedule-key="scheduleKey" />
@@ -741,7 +759,7 @@ export default {
 <style lang="scss" scoped>
 .registration-add-module {
   background-color: #FFFFFF;
-  padding: 30px 32px 50px 32px;
+  padding: 1.875rem 3rem 3.125rem 2rem;
 
   .registration-title {
     font-size: 24px;
@@ -821,6 +839,7 @@ export default {
   .pet-breed-col {
     display: flex;
     flex-basis: 0;
+    margin-bottom: 0.125rem !important;
     flex-grow: 0;
   }
 
@@ -835,11 +854,37 @@ export default {
     }
   }
 }
+
 ::v-deep .el-dialog {
   width: 1200px;
 }
+
 /*进度条样式*/
-.schedule_style{
-  margin-top: 20px!important;
+.schedule_style {
+  margin-top: 20px !important;
+}
+
+/*底部提交返回按钮布局*/
+.footer-expenditure-style {
+  margin-top: 0rem;
+  margin-left: 8rem;
+}
+
+/*底部提交返回按钮布局*/
+.right-footer-consult-style {
+  margin-top: 1.875rem;
+  margin-left: 0rem;
+}
+
+/*输入框下边距应为24*/
+.input-bottom-style {
+  margin-bottom: 0.125rem !important;
+}
+
+/*tip竖条*/
+.tip-consult-add {
+  height: 1.5rem;
+  line-height: 1;
+  border-left: 0.1875rem solid #5FB54B;
 }
 </style>