5月5日杨青

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

@@ -11,10 +11,10 @@
       <el-form ref="form" :model="form" label-width="160px">
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('实际治疗时长')">
-            <el-form-item label="实际治疗时长(时):" :prop="isName('实际治疗时长')" :rules="isCheckmust('实际治疗时长')">
-              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> -->
+            <el-form-item label="实际治疗时长(时):" prop="actualTreatmentHourShow" :rules="isCheckmust('实际治疗时长')">
+              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> :prop="isName('实际治疗时长')"-->
               <el-time-picker
-                v-model="actualTreatmentHourShow"
+                v-model="form.actualTreatmentHourShow"
                 placeholder="透析时长"
                 style="width:100%;"
                 value-format="H:m"
@@ -620,9 +620,9 @@
           type="primary"
           @click="submitForm('form')"
           :loading="loading"
-          v-if="hasPermission"
+          
           >保 存</el-button>
-          <!--  -->
+          <!-- v-if="hasPermission" -->
       </span>
     </el-dialog>
 
@@ -697,7 +697,7 @@ export default {
       internalFistulaOptions: [],
       vascularAccessOptions: [],
       unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' },{ id: 3, name: 'kg' }],
-      actualTreatmentHourShow: '',
+      // actualTreatmentHourShow: '',
       vascularAccessDescOptions: [],
       catheterOptions: [],
       complicationOptions: [],
@@ -729,6 +729,7 @@ export default {
       },
 
       form: {
+        actualTreatmentHourShow: '',
         weight_after: '',
         weight_loss: '',
         temperature: '',
@@ -893,7 +894,7 @@ export default {
         if (this.assessment_after_dislysis['sealing_fluid_dispose'] == 0) {
           this.form['sealing_fluid_dispose'] = ''
         }
-        this.actualTreatmentHourShow = new Date(
+        this.form.actualTreatmentHourShow = new Date(
           2018,
           1,
           1,
@@ -1316,7 +1317,7 @@ export default {
       for (var index in records) {
         this.$set(this.assessment_after_dislysis, index, records[index])
       }
-      this.actualTreatmentHourShow = new Date(
+      this.form.actualTreatmentHourShow = new Date(
         2018,
         1,
         1,

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

@@ -218,15 +218,9 @@
         :rules="isCheckmust('跌倒风险预防措施')"
         v-if="isShow('跌倒风险预防措施')"
       >
-        <!--        <el-radio-->
-        <!--          v-for="(item, index) in precaution_arr"-->
-        <!--          :key="index"-->
-        <!--          :label="item.id"-->
-        <!--          v-model="receiveTreatmentAsses.precaution"-->
-        <!--          >{{ item.name }}-->
-        <!--        </el-radio>-->
-        
-        <el-checkbox-group v-model="precautionTwo">
+        <!--  prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施')
+           [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
+        <el-checkbox-group v-model="precautionTwo" @change="precautionchange">
           <el-checkbox
             v-for="item in precaution_arr"
             :label="item.name"
@@ -235,6 +229,7 @@
           >
         </el-checkbox-group>
       </el-form-item>
+
       <el-form-item
         label-width="200px"
         label="其他跌倒风险预防措施 : "
@@ -340,8 +335,8 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <!-- -->
-      <el-button type="primary" v-if="hasPermission" @click="handleComfirm('receiveTreatmentAsses')"
+      <!-- v-if="hasPermission"-->
+      <el-button type="primary"   @click="handleComfirm('receiveTreatmentAsses')"
         >保 存</el-button
       >
     </div>
@@ -394,8 +389,10 @@ export default {
         tumble: "",
         his_department: "",
         his_bed: "",
+        // precautionTwo: [],
       },
       precautionTwo: [],
+      arr:[]
     };
   },
   methods: {
@@ -419,22 +416,21 @@ export default {
       }
       this.accepts = accepts;
       // console.log("accepts", accepts);
-      var arr = [];
-      if (this.accepts.precaution) {
-        var precaution = this.accepts.precaution.split(",");
-        // console.log("precaution", precaution);
-        // console.log("hhh", this.precaution_arr);
-        for (let i = 0; i < precaution.length; i++) {
-          for (let j = 0; j < this.precaution_arr.length; j++) {
-            if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-              // console.log("aaaa");
-              arr.push(this.precaution_arr[j].name);
-            }
-          }
-        }
-        this.precautionTwo = arr;
-        // console.log("arr", arr);
-      }
+      // var arr = [];
+      // if (this.accepts.precaution) {
+      //   var precaution = this.accepts.precaution.split(",");
+      //   // console.log("precaution", precaution);
+      //   // console.log("hhh", this.precaution_arr);
+      //   for (let i = 0; i < precaution.length; i++) {
+      //     for (let j = 0; j < this.precaution_arr.length; j++) {
+      //       if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+      //         // console.log("aaaa");
+      //         this.arr.push(this.precaution_arr[j].name);
+      //       }
+      //     }
+      //   }
+      //   this.precautionTwo = this.arr;
+      // }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
@@ -458,18 +454,39 @@ export default {
     handleCancle: function () {
       this.isVisibility = false;
     },
-    handleComfirm: function (formName) {
-      var arr = [];
+    // 复选框跌倒风险措施
+    precautionchange(){
+    //   var arr = [];
+      console.log('sadffdasfdg',this.precautionTwo);
       for (let i = 0; i < this.precaution_arr.length; i++) {
         for (let j = 0; j < this.precautionTwo.length; j++) {
           if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-            arr.push(this.precaution_arr[i].id);
+            this.arr.push(this.precaution_arr[i].id);
           }
         }
       }
-      // console.log("arr", arr);
-      var obj = arr.join(",");
+      var obj = this.arr.join(",");
       this.receiveTreatmentAsses.precaution = obj;
+    //   if(arr.length>0){
+    //     return this.precautionTwo
+    //   }
+    //   console.log('arr的数据',arr);
+    //   console.log('sadffdasfdg',this.precautionTwo.length);
+    //   console.log('this.precaution_arr',arr.length);
+    },
+
+    handleComfirm: function (formName) {
+      // var arr = [];
+      // for (let i = 0; i < this.precaution_arr.length; i++) {
+      //   for (let j = 0; j < this.precautionTwo.length; j++) {
+      //     if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+      //       this.arr.push(this.precaution_arr[i].id);
+      //     }
+      //   }
+      // }
+      this.precautionchange()
+      // var obj = this.arr.join(",");
+      // this.receiveTreatmentAsses.precaution = obj;
       let ParamsQuery = this.receiveTreatmentAsses;
       // console.log("ParamsQuery", ParamsQuery);
       ParamsQuery["patient"] = this.patient.id;
@@ -541,18 +558,32 @@ export default {
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
         ) {
-          if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
-          return [
-            { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-            {
-              required: true,
-              pattern: /^[1-9]\d*$/,
-              message: `请输入${name}`,
-              trigger: ['blur','change']
-            },
-          ];
-        }
-          return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
+          if (name == "风险程度"||name == "病人情况"||name == '心理评估' ) {
+            return [
+              { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+              {
+                required: true,
+                pattern: /^[1-9]\d*$/,
+                message: `请输入${name}`,
+                trigger: ['blur','change']
+              },
+            ];
+          } 
+          // else if(name == '跌倒风险预防措施' && this.precautionTwo.length <= 0){
+          //   return [
+          //     { type:'array',required: true, message: `请选择${name}`,trigger: ['blur','change'] },
+          //     {
+          //       required: true,
+          //       pattern: /^[1-9]\d*$/,
+          //       message: `请选择${name}`,
+          //       trigger: ['blur','change']
+          //     },
+          //   ];
+          // }
+          else{
+            return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
+          }
+          
         }
 
         

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

@@ -1616,7 +1616,8 @@
       //   }
       //
       // }
-    }, watch: {
+    }, 
+    watch: {
       isVisibility(val) {
 
       },

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

@@ -111,7 +111,8 @@
           :prop="isName('换药护士')"
           :rules="isCheckmust('换药护士')"
         >
-          <el-select v-model="form.change_nurse" placeholder="换药护士">
+        <!--  -->
+          <el-select v-model="form.change_nurse" placeholder="请选择换药护士">
             <el-option
               v-for="(admin, index) in adminRoles"
               :key="index"
@@ -250,7 +251,6 @@
         >
           <el-select v-model="form.blood_access_id" placeholder="请选择" @change="changeBloodAccessOpion">
             <el-option :key="0" label="请选择" :value="0"></el-option>
-
             <el-option
               v-for="(option, index) in blood_access_option"
               :key="index + 'i'"
@@ -458,10 +458,10 @@ export default {
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
     this.patient_id = this.$route.query.patient_id;
     this.schedule_date = this.$route.query.date;
-    this.form.nurse_id =
-      this.dialysis_order.id == 0
-        ? this.$store.getters.xt_user.user.id
-        : this.dialysis_order.start_nurse;
+    // this.form.nurse_id =
+    //   this.dialysis_order.id == 0
+    //     ? this.$store.getters.xt_user.user.id
+    //     : this.dialysis_order.start_nurse;
     this.form.puncture_nurse_id =
       this.dialysis_order.id == 0
         ? this.$store.getters.xt_user.user.id
@@ -479,9 +479,9 @@ export default {
       this.form.change_nurse = this.$store.getters.xt_user.user.id;
     }
 
-    if (this.form.washpipe_nurse == 0) {
-      this.form.washpipe_nurse = this.$store.getters.xt_user.user.id;
-    }
+    // if (this.form.washpipe_nurse == 0) {
+    //   this.form.washpipe_nurse = this.$store.getters.xt_user.user.id;
+    // }
     if (this.form.difficult_puncture_nurse == 0) {
       this.form.difficult_puncture_nurse = this.$store.getters.xt_user.user.id;
     }

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

@@ -23,7 +23,6 @@
                     ref="dialysisPrescription"
                     :model="dialysisPrescription"
                     label-width="148px"
-
             >
                 <el-row :gutter="24">
                     <el-col :span="8" v-if="isShows('透析模式')">
@@ -43,7 +42,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="isShows('透析时长')">
-                        <el-form-item label="透析时长(h)：" :prop="isName('透析时长')" :rules="isCheckmust('透析时长')">
+                        <el-form-item label="透析时长(h)：" prop="dialysis_duration_hour" :rules="isCheckmust('透析时长')">
                             <el-input
                                     type="number"
                                     v-model="dialysisPrescription.dialysis_duration_hour"
@@ -1681,86 +1680,6 @@
         zongliang:"",
         educationList:[],
         value:"",
-
-        // rules : {
-        //   mode_id:[{required: true, message: '请选择透析模式', trigger: 'change'}],
-        //   dialysis_duration_hour:[{required: true, message: '请输入透析时长', trigger: 'blur'}],
-        //   dialysis_duration_minute:[{required: true, message: '请输入透析时长', trigger: 'blur'}],
-        //   blood_flow_volume:[{required: true, message: '请输入血流量', trigger: 'blur'}],
-        //   replacement_flow:[{required: true, message: '请输入置换流量', trigger: 'blur'}],
-        //   pre_impulse:[{required: true, message: '请输入预冲量', trigger: 'blur'}],
-        //   target_ultrafiltration:[{required: true, message: '请输入目标超滤量', trigger: 'blur'}],
-        //   prescription_water:[{required: true, message: '请输入处方脱水量', trigger: 'blur'}],
-        //   water_machine:[{required: true, message: '请选择带水上机', trigger: 'change'}],
-        //   is_water:[{required: true, message: '请选择是否单超脱水', trigger: 'change'}],
-        //   single_time:[{required: true, message: '请输入单超时长', trigger: 'blur'}],
-        //   single_water:[{required: true, message: '请输入单超脱水', trigger: 'blur'}],
-        //   drhy_water:[{required: true, message: '请输入曲线脱水', trigger: 'blur'}],
-        //   dry_water_hour:[{required: true, message: '请输入曲线脱水时长', trigger: 'blur'}],
-        //   dialysate_formulation:[{required: true, message: '请选择透析液配方', trigger: 'change'}],
-        //   anticoagulant:[{required: true, message: '请选择抗凝剂', trigger: 'change'}],
-        //   antioxidant_commodity_name:[{required: true, message: '请输入抗凝剂商品名称', trigger: 'blur'}],
-        //   heparin_sodium:[{required: true, message: '请输入肝素钠', trigger: 'blur'}],
-        //   nucleoprotamine:[{required: true, message: '请输入鱼精蛋白', trigger: 'blur'}],
-        //   push_the_protamine:[{required: true, message: '请输入下机前推注鱼精蛋白', trigger: 'blur'}],
-        //   add_amount:[{required: true, message: '请输入追加肝素量', trigger: 'blur'}],
-        //   calculateAnticoagulantZL:[{required: true, message: '请输入减肝素量', trigger: 'blur'}],
-        //   reduce_amount:[{required: true, message: '请输入减肝素量', trigger: 'blur'}],
-        //   anticoagulant_shouji:[{required: true, message: '请输入首剂', trigger: 'blur'}],
-        //   anticoagulant_weichi:[{required: true, message: '请输入维持', trigger: 'blur'}],
-        //   anticoagulant_zongliang:[{required: true, message: '请输入总量', trigger: 'blur'}],
-        //   prescribing_number:[{required: true, message: '请输入开药数量', trigger: 'blur'}],
-        //   replacement_total:[{required: true, message: '请输入置换量', trigger: 'blur'}],
-        //   displace_speed:[{required: true, message: '请输入置换速度', trigger: 'blur'}],
-        //   anticoagulant_gaimingcheng:[{required: true, message: '请输入钙名称', trigger: 'blur'}],
-        //   anticoagulant_gaijiliang:[{required: true, message: '请输入钙剂量', trigger: 'blur'}],
-        //   kalium:[{required: true, message: '请输入钾', trigger: 'blur'}],
-        //   sodium:[{required: true, message: '请输入钠', trigger: 'blur'}],
-        //   calcium:[{required: true, message: '请输入钙', trigger: 'blur'}],
-        //   bicarbonate:[{required: true, message: '请输入碳酸氢盐', trigger: 'blur'}],
-        //   dialysate_flow:[{required: true, message: '请输入透析液流量', trigger: 'blur'}],
-        //   dialysate_temperature:[{required: true, message: '请输入透析液温度', trigger: 'blur'}],
-        //   conductivity:[{required: true, message: '请输入电导率', trigger: 'blur'}],
-        //   dialyzer_perfusion_apparatus:[{required: true, message: '请输入透析器/灌流器', trigger: 'blur'}],
-        //   dialysis_dialyszers:[{required: true, message: '请输入透析器', trigger: 'blur'}],
-        //   dialysis_irrigation:[{required: true, message: '请输入灌流器', trigger: 'blur'}],
-        //   dialysis_strainer:[{required: true, message: '请输入滤过器', trigger: 'blur'}],
-        //   plasma_separator:[{required: true, message: '请输入血浆分离器', trigger: 'blur'}],
-        //   bilirubin_adsorption_column:[{required: true, message: '请输入胆红素吸附柱', trigger: 'blur'}],
-        //   body_fluid:[{required: true, message: '请选择体液过多症状', trigger: 'change'}],
-        //   body_fluid_other:[{required: true, message: '请输入体液过多其他症状', trigger: 'blur'}],
-        //   special_medicine:[{required: true, message: '请选择透析前使用特殊药物', trigger: 'change'}],
-        //   special_medicine_other:[{required: true, message: '请输入透析前使用其他特殊药物', trigger: 'blur'}],
-        //   value:[{required: true, message: '请选择透析备注', trigger: 'change'}],
-        //   dialysis_remark:[{required: true, message: '请输入透析备注', trigger: 'blur'}],
-        //   prescription_sodium:[{required: true, message: '请输入处方钠', trigger: 'blur'}],
-        //   start_sodium:[{required: true, message: '请输入开始钠', trigger: 'blur'}],
-        //   sodium_curve:[{required: true, message: '请输入钠曲线', trigger: 'blur'}],
-        //   dialysis_fluid_flow:[{required: true, message: '请输入透析液流速', trigger: 'blur'}],
-        //   sodium_bicarbonate_flow:[{required: true, message: '请输入碳酸氢钠流速', trigger: 'blur'}],
-        //   treatment_remark:[{required: true, message: '请输入病情处理', trigger: 'blur'}],
-        //   displace_liqui_part:[{required: true, message: '请选择置换液', trigger: 'change'}],
-        //   displace_liqui_value:[{required: true, message: '请输入置换液总量', trigger: 'blur'}],
-        //   target_ktv:[{required: true, message: '请输入目标KT/V', trigger: 'blur'}],
-        //   blood_access:[{required: true, message: '请选择血管通路', trigger: 'change'}],
-        //   anticoagulant_stop_time_hour:[{required: true, message: '请输入抗凝提前停止时间', trigger: 'blur'}],
-        //   anticoagulant_stop_time_min:[{required: true, message: '请输入抗凝提前停止时间', trigger: 'blur'}],
-        //   blood:[{required: true, message: '请输入抽血量', trigger: 'blur'}],
-        //   illness:[{required: true, message: '请选择病情', trigger: 'change'}],
-        //   amylaceum:[{required: true, message: '请输入葡萄糖', trigger: 'blur'}],
-        //   oxygen_uptake:[{required: true, message: '请选择是否吸氧', trigger: 'change'}],
-        //   oxygen_flow:[{required: true, message: '请输入吸氧流量', trigger: 'blur'}],
-        //   oxygen_time:[{required: true, message: '请输入吸氧时长', trigger: 'blur'}],
-        //   hemodialysis_pipelines_count:[{required: true, message: '请输入透析管路支数', trigger: 'blur'}],
-        //   hemodialysis_pipelines:[{required: true, message: '请选择透析管路', trigger: 'change'}],
-        //   puncture_needle:[{required: true, message: '请输入穿刺针', trigger: 'blur'}],
-        //   puncture_needle_count:[{required: true, message: '请输入穿刺针支数', trigger: 'blur'}],
-        //   epo:[{required: true, message: '请选择促红素', trigger: 'change'}],
-        //   epo_count:[{required: true, message: '请输入促红素支数', trigger: 'blur'}],
-        //   max_ultrafiltration_rate:[{required: true, message: '请输入最大超滤率', trigger: 'blur'}],
-        //   admin_user_id:[{required: true, message: '处方医生', trigger: 'blur'}],
-        //   // remark:[{required: true, message: '请输入备注', trigger: 'blur'}]
-        // }
       }
 
     },

src/xt_pages/user/components/PatientDetail.vue

@@ -821,10 +821,10 @@
     <!-- 打印预览 -->
     <div style="display: none">
       <div id="print-info-box">
-        <div class="print_main_content">
+        <div class="print_main_content" >
           <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
-          <div>
-            <table>
+          <div >
+            <table >
               <thead>
                 <!-- 用 thead 规定好宽度 -->
                 <tr v-show="false">
@@ -924,12 +924,12 @@
                     ></div>
                   </td>
                 </tr>
-                <tr>
+                <tr >
                   <td>
                     <div class="td_proj_title">现<br />病<br />史</div>
                   </td>
                   <td colspan="7">
-                    <div
+                    <div 
                       class="td_proj_content td_align_left"
                       v-html="patientPrint.present_history"
                     ></div>
@@ -1033,6 +1033,7 @@
         </div>
       </div>
     </div>
+    
     <div hidden="hidden">
       <div id="print-card-info">
         <div
@@ -2122,6 +2123,7 @@ export default {
   width: 960px;
   margin: 0 auto;
   padding: 0 0 20px 0;
+  /* page-break-after: always; */
 }
 .print_main_content .order_title {
   text-align: center;

src/xt_pages/user/sickHistory.vue

@@ -85,38 +85,38 @@
       <el-dialog title="新增病史记录" width="70%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
               <label class="title"><span class="name">病程标题</span> : </label>
               <el-input v-model="title" style="width: 150px"></el-input>
 
-              <label class="title"><span class="name">日期</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
               <el-date-picker v-model="sick_history_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd "></el-date-picker>
 
 
-              <label class="title"><span class="name">肾移植史</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
               <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
 
-              <label class="title"><span class="name">腹膜透析史</span> : </label>
+              <label class="title" ><span class="name">腹膜透析史</span> : </label>
               <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">医生</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
               <el-select style="width: 100px;" v-model="doctor_id" placeholder="请选择医生">
                 <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">过敏药物</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
               <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物">
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
@@ -127,7 +127,7 @@
 
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" >
               <label class="title"><span class="name">病史模版</span> : </label>
               <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
                 <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
@@ -139,14 +139,14 @@
               <keep-alive>
                 <editor ref="editor"
                         id="editors"
-                        style="width: 600px"
+                        style="width: 100%"
                         v-bind:r_content="new_content"
                 >
                 </editor>
               </keep-alive>
             </div>
 
-            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
                          @click="createAction" :loading="uploading_new_record">保存
@@ -155,41 +155,42 @@
           </div>
         </div>
       </el-dialog>
+
       <el-dialog title="修改病史记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
         <div>
           <div class="new_record_form">
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
               <label class="title"><span class="name">病程标题</span> : </label>
               <el-input v-model="edit_title" style="width: 150px"></el-input>
 
-              <label class="title"><span class="name">日期</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
               <el-date-picker v-model="edit_sick_history_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd "
+                              value-format="yyyy-MM-dd "></el-date-picker>
 
 
-              <label class="title"><span class="name">肾移植史</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
               <el-select style="width: 150px;" v-model="edit_is_shenyizhishi" placeholder="选择肾移植史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
 
-              <label class="title"><span class="name">腹膜透析史</span> : </label>
+              <label class="title" ><span class="name">腹膜透析史</span> : </label>
               <el-select style="width: 150px;" v-model="edit_is_fumotouxishi" placeholder="选择腹膜透析史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">医生</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
               <el-select style="width: 100px;" v-model="edit_doctor_id" placeholder="请选择医生">
                 <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">过敏药物</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
               <el-select style="width: 100px;" v-model="edit_is_guominyaowu" placeholder="选择过敏药物">
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
@@ -210,7 +211,7 @@
               <keep-alive>
                 <editor ref="edit_neditor"
                         id="editors"
-                        style="width: 600px"
+                        style="width: 100%"
                         v-bind:r_content="edit_new_content"
                 >
                 </editor>
@@ -218,7 +219,7 @@
             </div>
 
 
-            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
               <el-button @click="show_edit_dialog = false">取消</el-button>
               <el-button type="primary"
                          @click="modifyAction" :loading="uploading_new_record">保存
@@ -528,7 +529,8 @@ export default {
       this.requestSickHistory()
     }, endTimeChange(val) {
       this.requestSickHistory()
-    }, showDialog(){
+    }, 
+    showDialog(){
       for(let i = 0; i < this.doctorOptions.length; i++){
         if(this.doctorOptions[i].id == this.$store.getters.xt_user.user.id){
           this.doctor_id =this.$store.getters.xt_user.user.id