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

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -381,11 +381,14 @@
         label-width="90px"
       >
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
               <el-input v-model="nameForm.advice_name"></el-input>
             </el-form-item>
           </el-col>
+          
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
@@ -413,8 +416,6 @@
               </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">
@@ -464,8 +465,6 @@
               </el-col>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="给药途径 :" prop="delivery_way">
               <el-select
@@ -486,6 +485,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          
           <el-col :span="12">
             <el-form-item label="执行频率 :" prop="execution_frequency">
               <el-select