Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

src/pages/main/dialog/ComputerDialog.vue

           </div>
         </div>
 
+        <div class="item" v-if="template_id == 6">
+          <label class="name" for="xll">引血(ml/min)</label>
+          <div class="content">
+            <input type="tel" @focus="inputFocus"  id="xll" v-model="blood_drawing"/>
+          </div>
+        </div>
 
         <div class="item">
           <h2 class="name">上机时间</h2>
           </div>
         </div>
 
+        
+
 
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
         isPremission: false,
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
+        template_id: 0,
+        blood_drawing:100
       }
     },
     props: {
       }
     },
     created () {
+    
+      this.template_id = this.$store.getters.user.template_info.template_id;
       var date = this.$route.query && this.$route.query.date
       date *= 1000
       var newDate = new Date(date)
         }
       }
 
+
+
     },
     methods: {
+      inputFocus: function (event) {
+        var input = event.target
+        setTimeout(function () {
+          input.scrollIntoView()
+        }, 0)
+
+        if (input.setSelectionRange) {
+          setTimeout(function () {
+            input.setSelectionRange(0, input.value.length)
+          }, 0)
+        } else if (input.createTextRange) {
+          var rng = input.createTextRange()
+          rng.move('character', input.value.length)
+          rng.select()
+        }
+      },
       modify(){
         let ParamsQuery = {}
         ParamsQuery['id'] = this.record.id
         ParamsQuery['bed'] = this.bed_id
         ParamsQuery['start_time'] = this.start_time_str
         ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+        ParamsQuery['blood_drawing'] = this.blood_drawing
 
         startDialysis(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             return false
           } else {
             Toast.success('上机成功')
+            var monitor = response.data.data.monitor
+            this.$emit('did_add_monitor', monitor)
             this.$emit('did_start', response.data.data.dialysis_order)
             var record = this.record
             for (const key in response.data.data.dialysis_order) {

src/pages/main/dialog/MonitDialog.vue

                 <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
                 <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-                <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
+                <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
+                <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
                 <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
                 <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
             </div>
             <div class="cell">
               <label>静脉压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.venous_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.venous_pressure" style="width:60%">
+               <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(1)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('跨膜压')">
               <label>跨膜压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.transmembrane_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.transmembrane_pressure" style="width:60%">
+              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(2)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('超滤量')">
-              <label>超滤量(L)</label>
+              <label v-if="template_id == 6">超滤量(ml)</label>
+              <label v-else>超滤量(L)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
                      v-model="form.ultrafiltration_volume">
             </div>
             </div>
             <div class="cell">
               <label>动脉压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.arterial_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.arterial_pressure" style="width:60%">
+              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(3)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('钠浓度')">
               <label>钠浓度(mmol/L)</label>
         currentIndex: -1,
         currentRow: null,
         rowClass: 'row-class-active',
-
+        template_id: 0,
         visibility: false,
         today_last_monitor_record : {},
         propForm: {
     },
     created () {
       var date = this.$route.query && this.$route.query.date
+      this.template_id = this.$store.getters.user.template_info.template_id;
       // date *= 1000;
       // var newDate = new Date(date);
       // var cDate = new Date();
       this.form.operate_time = this.pickertime.getTime()
     },
     methods: {
+      venousPressureChange(type){
+        if (type == 1) {
+          this.form.venous_pressure = this.form.venous_pressure * 7.5
+        } else if(type == 2) {
+          this.form.transmembrane_pressure = this.form.transmembrane_pressure * 7.5
+        } else {
+          this.form.arterial_pressure = this.form.arterial_pressure * 7.5
+        }
+      },
       isShow (name) {
         var filedList = this.$store.getters.user.fileds
 
           this.today_last_monitor_record = resp.monitor
 
           
-          this.form.operate_time = Date.parse(new Date())
+          // this.form.operate_time = Date.parse(new Date())
+          this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time+3600)* 1000 : Date.parse(new Date())
           this.form.pulse_frequency = '' //this.last_monitor_record.pulse_frequency;
           this.form.breathing_rated = resp.monitor.breathing_rate?resp.monitor.breathing_rate:'';
           this.form.systolic_bp = '' //this.last_monitor_record.systolic_blood_pressure;
           this.form.arterial_pressure = '' //this.last_monitor_record.arterial_pressure;
           this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
           this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate?resp.monitor.ultrafiltration_rate:'';
-          this.form.ultrafiltration_volume = ''// this.last_monitor_record.ultrafiltration_volume;
+          this.form.ultrafiltration_volume =  resp.monitor.ultrafiltration_volume?resp.monitor.ultrafiltration_volume:'';
           this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:'';
           this.form.dialysate_temperature =  resp.monitor.dialysate_temperature?resp.monitor.dialysate_temperature:'';
           this.form.temperature = resp.monitor.temperature?resp.monitor.temperature:'';
               this.form.conductivity = ''
               this.form.displacement_flow_quantity = ''
 
-              this.last_monitor_record.sodium_concentration =
-                monitor.sodium_concentration
-              this.last_monitor_record.dialysate_temperature =
-                monitor.dialysate_temperature
+              // this.last_monitor_record.sodium_concentration =
+              //   monitor.sodium_concentration
+              // this.last_monitor_record.dialysate_temperature =
+              //   monitor.dialysate_temperature
 
               Toast.success('新增成功')
               this.formPanel = false

src/pages/main/dialog/PlaneDialog.vue

     special_premission: {
       type: Array,
     },
+    last_monitor_record: {
+      type: Object,
+    }
   },mounted() {
-      if(this.record.id == 0){
+      if(this.last_monitor_record.id == 0){
         this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
       }else{
-        if(this.record.end_time == 0){
-          this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-        }else{
-          this.end_time_str = parseTime(this.record.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-        }
+        this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
       }
     },
   created(){
 
   },
   methods: {
+    set_last_monitor_record(monitor) {
+      this.last_monitor_record = monitor
+      this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    },
     modify(){
       let ParamsQuery = {}
       ParamsQuery['id'] = this.record.id

src/pages/main/dialog/ThorougDialog.vue

       let tempHour = ''
       let tempMinute = ''
 
-      if (this.record != null && this.record.id != '') {
+      if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
-      } else if (this.last_record != null && this.last_record.id != "") {
-        this.$set(this.formValue, "patient_gose", this.last_record.patient_gose)
-        this.$set(this.formValue, "blood_access_part_id", this.last_record.blood_access_part_id)
-        this.$set(this.formValue, "blood_access_part_opera_id", this.last_record.blood_access_part_opera_id)
-        this.$set(this.formValue, "internal_fistula", this.last_record.internal_fistula)
-        this.$set(this.formValue, "internal_fistula_tremor_ac", this.last_record.internal_fistula_tremor_ac)
-      }
+      }else if (this.last_record != null && this.last_record.id != "") {
+        for (const key in this.formValue) {
+          // console.log(key, this.record[key]);
+          this.formValue[key] = this.last_record[key];
+        }
+        if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
+          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+          this.$set(this.formValue, "weight_after", this.record.weight_after)
+          this.$set(this.formValue, "weight_loss", this.record.weight_loss)
+        } else {
+          this.$set(this.formValue, "actual_ultrafiltration", '')
+          this.$set(this.formValue, "weight_after", '')
+          this.$set(this.formValue, "weight_loss", '')
+        }
+      } 
+  
 
 
 

src/pages/main/today/TodayTab.vue

                        :device_numbers="device_numbers" :admin_map="admin_user_map"
                        :special_premission="special_premission"
                        :device_number_map="device_number_map" @did_start="closeDialysisComputer"
-                       @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
+                        @did_add_monitor="didAddMonitor" @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
     </van-popup>
 
     <van-popup title="透析监测" v-model="menuList[6].showPopup" :overlay="true" :close-on-click-overlay="false">
     </van-popup>
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <plane-dialog :patient_prop="patient" :record="dialysis_order" :admins="admin_users" :admin_map="admin_user_map"
-                    :special_premission="special_premission"
+      <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
+                    :special_premission="special_premission" 
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
         // }
         this.monitor_records.reverse()
         this.last_monitor_record = monitor
+        this.$refs.plane_dialog.set_last_monitor_record(monitor)
       },
 
       didEditMonitor (monitor) {