Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -50,6 +50,22 @@
       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
+      <el-form-item label="疾病类型: " prop="name">
+        <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
+         <el-option
+            v-for="item in wayOptions"
+           :key="item.id"
+           :label="item.name"
+           :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="诊断: " prop="name">
+        <el-input v-model="patientInfo.health_care_no" placeholder=""></el-input>
+      </el-form-item>
+      <el-form-item label="过敏史: " prop="name">
+        <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
+      </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
@@ -87,189 +103,131 @@
       <el-form-item label="" prop="name">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-row :gutter = "20">
-        <el-col :span="24">
-          <el-form-item label="主诉:">
-              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledata"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.chief_conplaint">
-          </el-input>
-        </el-form-item>
-      </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-           <el-form-item label="现病史:">
-              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataOne"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item  prop="name" style="width:100%;">
-            <el-input
-              type="textarea"
-              :rows="2"
-              placeholder="请输入内容"
-              v-model="case_history.history_of_present_illness">
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-         <el-col :span="24">
-           <el-form-item label="既往史:">
-            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataTwo"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-         </el-col>
-         <el-col :span="24">
-            <el-form-item  prop="name" style="width:100%;">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="case_history.past_history">
-              </el-input>
-           </el-form-item>
-         </el-col>
-      </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item label="个人史:">
-            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataThree"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.personal_history">
-          </el-input>
-        </el-form-item>
-      </el-col>
-     </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item  label="家族史:">
-            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataFour"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-        <el-col :span="20">
-          <el-form-item prop="name" style="width:100%;">
-            <el-input
-              type="textarea"
-              :rows="2"
-              placeholder="请输入内容"
-              v-model="case_history.family_history">
-            </el-input>
-          </el-form-item>
-       </el-col>
-     </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item label="诊断信息:">
-            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataFive"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.diagnostic">
-          </el-input>
+      <el-form-item label="" prop="name" style="visibility: hidden;">
+        <div></div>
+      </el-form-item>
+      <el-form-item label="主诉:" style="width:49%;">
+        <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
+            <el-option
+              v-for="(item, index) in tabledata"
+              :label="item.title"
+              :value="item.content"
+              :key="index"
+            ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.chief_conplaint">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="现病史:" style="width:49%;">
+        <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataOne"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.history_of_present_illness">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="既往史:" style="width:49%;">
+        <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataTwo"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.past_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="个人史:" style="width:49%;">
+        <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataThree"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.personal_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item  label="家族史:" style="width:49%;">
+        <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataFour"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.family_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="诊断信息:" style="width:49%;">
+        <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataFive"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.diagnostic">
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="医嘱:" style="width:49%;">
+        <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataSix"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.doctor_advice">
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label ="备注"  prop="name" style="width:49%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.remark">
+        </el-input>
       </el-form-item>
-       </el-col>
-     </el-row>
-
-     <el-row :gutter="24">
-       <el-col :span="20">
-         <el-form-item label="医嘱:">
-            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataSix"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="doctor_advice" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.doctor_advice">
-          </el-input>
-        </el-form-item>
-       </el-col>
-     </el-row>
-
-        <el-form-item label ="备注"  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.remark">
-          </el-input>
-        </el-form-item>
-    
-    
-     
-    
-    
     </el-form>
 
   </div>