Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterEdit.vue

@@ -160,6 +160,19 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="5">
+                <el-form-item label="体检类别" prop="medicalTypeId">
+                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
+                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small"
+                    @change="changeMedicalTypeId">
+                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" />
+            </el-row>
+            <el-row>
               <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
                   <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small"
@@ -170,7 +183,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="3">
+              <el-col :span="2">
                 <el-form-item label="民族" prop="nationId" label-width="50px">
                   <el-select v-model="form.nationId" placeholder="请选择" filterable clearable default-first-option
                     :filter-method="filterMethod" :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'"
@@ -179,19 +192,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="3" />
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small"
-                    @change="changeMedicalTypeId">
-                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="5">
                 <el-form-item label="工卡号" prop="jobCardNo">
                   <el-input v-model="form.jobCardNo" size="small"></el-input>