Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://112.74.16.180:9527"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/xt_pages/user/components/PatientForm.vue

@@ -87,14 +87,14 @@
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
+              <el-col :span="8" :style="isEdit?'width:360px':''"  >
                 <el-form-item label="患者来源 : " class="is-required" prop="source" >
                   <el-radio-group v-model="form.source">
                     <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;">
+              <el-col :span="8" :style="isEdit?'width:360px':''" >
                 <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
                   <el-radio-group v-model="form.lapseto">
                     <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
@@ -113,7 +113,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" >
+              <el-col :span="8" :style="isEdit?'width:360px':''" >
                 <el-form-item label="家庭住址 : " prop="homeAddress">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
@@ -185,12 +185,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8" :style="isEdit?'width:360px':''" >
                   <el-form-item label="工作单位 : " prop="work">
                     <el-input v-model="form.work"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="单位地址 : " prop="unit_address">
                     <el-input v-model="form.unit_address"></el-input>
                   </el-form-item>
@@ -241,17 +241,17 @@
 
         <div class="dataTitle">治疗信息</div>
         <el-row :span="24">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="主诉 : " prop="patient_complains">
               <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="现病史 : " prop="present_history">
               <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="既往史 : " prop="past_history">
               <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
             </el-form-item>
@@ -1010,6 +1010,7 @@
   .el-form{
   .el-col-6,.el-col-8{
     width: 430px;
+    height: 59px!important;
   }
   .el-form-item {
   .el-select {