自动生成的宽度自适应

src/xt_pages/user/components/PatientForm.vue

@@ -37,13 +37,8 @@
               </el-col> -->
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="透析号 : " class="is-required">
-<<<<<<< .mine
                     <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
                     <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
-=======
-                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 1%;" ></el-input>
-                    <el-button style="width:70px;padding:10px 0;" disabled type="primary">自动生成</el-button>
->>>>>>> .theirs
                 </el-form-item>
               </el-col>
             </template>