Merge remote-tracking branch 'origin/master'

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

@@ -453,7 +453,7 @@
                             <el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
                           </el-form-item>
                         </el-col>
-                        <el-row :span="24">
+                        <el-col :span="24">
                           <!-- 新学的第二种方法-->
                           <el-form-item
                             label="主诉"
@@ -476,8 +476,8 @@
                               show-word-limit
                             />
                           </el-form-item>
-                        </el-row>
-                        <el-row :span="24">
+                        </el-col>
+                        <el-col :span="24">
                           <el-form-item
                             label="医嘱"
                             prop="doctorAdvice"
@@ -499,8 +499,8 @@
                               type="textarea"
                             />
                           </el-form-item>
-                        </el-row>
-                        <el-row :span="24">
+                        </el-col>
+                        <el-col :span="24">
                           <el-form-item
                             label="诊断结果"
                             prop="diagnosisResult"
@@ -521,8 +521,8 @@
                               placeholder="请输入诊断结果"
                             />
                           </el-form-item>
-                        </el-row>
-                        <el-row :span="24">
+                        </el-col>
+                        <el-col :span="24">
                           <el-form-item label="处方单">
                             <el-button
                               class="fourWordsBtn"
@@ -533,7 +533,7 @@
                               开具处方
                             </el-button>
                           </el-form-item>
-                        </el-row>
+                        </el-col>
                       </el-row>
                     </el-form>
                   </el-row>