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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -20,7 +20,7 @@
         >
           <div class="order-yy-name">{{ orgname }}</div>
           <div class="order_title">
-            血液净化治疗记录单2
+            血液净化治疗记录单
           </div>
           <div class="row" style="margin-top: 15px;">
             <div class="inline_block">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -145,7 +145,7 @@
           align="right"
           :picker-options="pickerOptions1"
           format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
+          value-format="timestamp"
         ></el-date-picker>
         <el-input
           v-show="search_mode == 2"

src/xt_pages/user/dialysisSolution.vue

@@ -564,6 +564,7 @@
           dialysate_temperature: '',
           conductivity: '',
           doctor: '',
+          dialysate_formulation:'',
           remark: '',
           target_ktv:'',
           target_ultrafiltration:'',
@@ -1114,6 +1115,53 @@
           doctor: '',
           first_dialysis: '',
 
+
+
+          dialyzer: '',
+          dialysate_formulation:'',
+          hemodialysis_machine: '',
+          perfusion_apparatus: '',
+          blood_flow_volume: '',
+          dewater: '',
+          displace_liqui: 0,
+          replacement_way: '',
+          anticoagulant: '',
+          anticoagulant_shouji: '',
+          anticoagulant_weichi: '',
+          anticoagulant_zongliang: '',
+          anticoagulant_gaimingcheng: '',
+          anticoagulant_gaijiliang: '',
+          kalium: '',
+          replacement_total: '',
+          sodium: '',
+          calcium: '',
+          bicarbonate: '',
+          glucose: '',
+          dry_weight: '',
+          dialysate_flow: '',
+          dialysate_temperature: '',
+          conductivity: '',
+          remark: '',
+          target_ktv:'',
+          target_ultrafiltration:'',
+          dialyzer_perfusion_apparatus: '',
+          body_fluid: '',
+          body_fluid_other: '',
+          special_medicine: '',
+          special_medicine_other: '',
+          displace_liqui_part: '',
+          displace_liqui_value: '',
+          ultrafiltration: '',
+          blood_access: '',
+
+
+
+
+
+
+
+
+
           dialysis_duration: '3.30',
           dialysis_duration_hour: '3',
           dialysis_duration_minute: '30'