From 5137ec5d7ae9cf901af52ce604c21ba30c4e6fee Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 29 May 2025 15:08:21 +0800
Subject: [PATCH] dev

---
 src/components/registration/Edit.vue | 78 ++++++++++++++--------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 009bc81..a40940d 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -34,6 +34,12 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item prop="type" label="费用类型">
+                  <el-select v-model="edit_data.type" :disabled="edit_data.status==0||isShowCard">
+                    <el-option label="自费" :value="1"></el-option>
+                    <el-option label="医保" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
               </div>
               <div class="middle">
                 <el-form-item prop="gender" label="性别">
@@ -63,6 +69,21 @@
                   <el-input v-model="edit_data.certNo" placeholder="请输入证件码"
                             :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></el-input>
                 </el-form-item>
+                <el-form-item v-if="!isBtnShow&&dateName!='预约'" label="时间">
+                  <div style="flex: 1;min-width: 0">现在</div>
+                </el-form-item>
+                <el-form-item v-else prop="date" label="预约日期">
+                  <el-date-picker
+                      v-model="edit_data.date"
+                      type="date"
+                      format="YYYY/MM/DD"
+                      value-format="YYYY-MM-DD"
+                      placeholder="选择日期"
+                      style="width: 100%"
+                      :disabledDate="disabledDate"
+                      unlink-panels
+                  />
+                </el-form-item>
 
               </div>
               <div class="right">
@@ -90,50 +111,26 @@
                     <el-option label="复诊" :value="1"></el-option>
                   </el-select>
                 </el-form-item>
-              </div>
-            </div>
-            <div style="display:flex;width:100%;">
-             <div class="type">
-               <el-form-item prop="type" label="费用类型">
-                 <el-select v-model="edit_data.type" :disabled="edit_data.status==0||isShowCard">
-                   <el-option label="自费" :value="1"></el-option>
-                   <el-option label="医保" :value="2"></el-option>
-                 </el-select>
-               </el-form-item>
-             </div>
-            <div class="item-btn">
-              <el-form-item label="时间">
-                <div style=" display: flex;width: 100%">
-                  <div style="flex: 1;min-width: 0" v-if="!isBtnShow&&dateName!='预约'">现在</div>
-                  <div v-else style="flex:1;min-width:0;display: flex;align-items: center">
-                    <el-date-picker
-                        v-model="edit_data.date"
-                        type="date"
-                        format="YYYY/MM/DD"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择日期"
-                        style="width: 50%"
-                        :disabledDate="disabledDate"
-                        unlink-panels
-                    />
+                <el-form-item :label="isBtnShow?'预约时间':' '">
+                  <div style="display: flex;justify-content: space-between">
                     <el-time-select
+                        v-if="isBtnShow"
                         v-model="edit_data.time"
                         start="08:00"
                         step="00:15"
                         end="22:00"
                         :min-time="getCurrentTime(edit_data.date)"
                         placeholder="选择时间"
-                        style="width: 50%"
+                        style="flex: 1;min-width: 0"
                     />
+                    <div v-else style="flex: 1;min-width: 0"></div>
+                    <span :class="{disabled:edit_data.status==1||edit_data.status==3||edit_data.status==0}"
+                          class="small-btn" @click="changeBtn">{{
+                        isBtnShow ? '挂号' : '预约'
+                      }}</span>
                   </div>
-                  <span v-if="dateName!='预约'"
-                        :class="{disabled:edit_data.status==1||edit_data.status==3||edit_data.status==0}"
-                        class="small-btn" @click="changeBtn">{{
-                      isBtnShow ? '挂号' : '预约'
-                    }}</span>
-                </div>
-              </el-form-item>
-            </div>
+                </el-form-item>
+              </div>
             </div>
             <el-form-item label="备注">
               <el-input v-model="edit_data.memo" placeholder="备注" :disabled="edit_data.status==0"></el-input>
@@ -551,16 +548,19 @@ defineExpose({init})
   flex: 1;
   min-width: 0;
 }
-.item-btn{
+
+.item-btn {
   flex: 2;
   min-width: 0;
   margin-left: 24px;
 }
-.type{
+
+.type {
   width: 235px;
   min-width: 0
 }
-:deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper){
-  margin-right: 24px;
+
+.small-btn {
+  width: 86px;
 }
 </style>
\ No newline at end of file