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

src/styles/index.scss

   top: 50% !important;
   transform: translate(-50%,-50%) !important;
   margin-top: 0 !important; 
+}
+
+.el-message{
+  z-index: 2004!important;
 }

src/xt_pages/data/druguse.vue

               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱名称 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
+              <el-row>
+               <el-col :span="12">
+                  <el-form-item label="医嘱名称 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
+                  </el-form-item>
+               </el-col> 
               <!-- <el-form-item label="医嘱内容 :" prop="advice_desc">
                 <el-input v-model="templateForm.advice_desc" style="width:50%"></el-input>
               </el-form-item> -->
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
                     <el-col :span="8">
                     </el-col>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
                     <el-col :span="8">
                     </el-col>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="给药途径 :" prop="delivery_way">
                     <el-select
                     </el-select>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>  
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select

src/xt_pages/data/druguseTemplate.vue

 
               <el-row>
                 <el-col :span="12">
-                  <el-form-item :label="advice_content_name" required prop="advice_name">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
                     <el-input v-model="templateForm.advice_name"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-
-                  <el-form-item label="规格" prop="advice_desc">
+                  <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
 
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12" v-if="!isAddChild">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"
                     <el-col :span="8">
                       <el-input v-model="templateFormEdit.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.drug_spec_unit"
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.single_dose_unit"
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.prescribing_number_unit"
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
+             
                 <el-col :span="12" v-if="templateFormEdit.parent_id == 0">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱内容 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
-
               <el-row>
+                <el-col :span="12">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" ></el-input> 
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.drug_spec_unit"
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"