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

src/xt_pages/data/druguseTemplate.vue

                     </el-select>
                   </el-form-item>
                 </el-col>
-             
+
                 <el-col :span="12" v-if="templateFormEdit.parent_id == 0">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="医嘱内容 :" required prop="advice_name">
-                    <el-input v-model="templateForm.advice_name" ></el-input> 
+                    <el-input v-model="templateForm.advice_name" ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
           name: [{required: true, message: "请填写执行频率"}]
         },
         templateRules: {
-          advice_name: [{required: true, message: "请填写医嘱内容"}]
+          advice_name: [{required: true, message: "请填写医嘱内容"}],
+          advice_desc: [{required: true, message: "请填写规格"}]
+
         },
         templateEditRules: {
           advice_name: [{required: true, message: "请填写医嘱内容"}]

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

           <el-button round @click="deleteRecordAction">删除监测</el-button>
 
         </div>
-        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="monitors" border highlight-current-row 
+        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="monitors" border highlight-current-row
                   @current-change="tableCurrentRowChange" style="width: 100%" :class="current_row_class">
           <el-table-column label="时间" align="center" width="144">
             <template slot-scope="scope">
         </el-table>
       </div>
 
-      <div v-show="edit">
-        <el-form ref="form" :model="form" label-width="130px">
+      <!--<div v-show="edit">-->
+        <el-form   v-show="edit" ref="form" :model="form" label-width="130px" >
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="监测时间：">
               <el-button @click="cancelEditAction">取 消</el-button>
               <el-button type="primary" @click="submitAction">保 存</el-button>
         </div>
-      </div>
+      <!--</div>-->
     </el-dialog>
   </div>
 </template>