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

src/api/dialysis.js

@@ -252,3 +252,22 @@ export function CreateGroupAdvice(id, groupno, advices){
 
 
 
+export function GetSolution(params){
+  return request({
+    url:"/api/solution/get",
+    method:'get',
+    params:params,
+  })
+
+}
+
+
+
+export function CreateDryWeight(params){
+  return request({
+    url:"/api/dryweight/commit",
+    method:'post',
+    params:params,
+  })
+
+}

src/api/dialysis_record.js

@@ -43,7 +43,7 @@ export function editMonitor(patient_id, schedule_date, data) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time,schedual_type) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -51,7 +51,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     bed: bed_id,
     puncture_nurse: puncture_nurse_id,
     start_time: start_time,
-    lood_drawing: lood_drawing
+    lood_drawing: lood_drawing,
+    schedual_type:schedual_type,
   }
   return request({
     url: '/api/dialysis/start_record',
@@ -60,11 +61,12 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
   })
 }
 
-export function finishDialysis(patient_id, schedule_date, nurse_id) {
+export function finishDialysis(patient_id, schedule_date,end_time, nurse_id) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
-    nurse: nurse_id
+    nurse: nurse_id,
+    end_time:end_time,
   }
   return request({
     url: '/api/dialysis/finish',
@@ -94,5 +96,51 @@ export function getLongAdvice(params) {
 }
 
 
+export function GetSchedualNumber(params) {
+  return request({
+    url:'/api/schedule/get',
+    method:'Get',
+    params:params,
+  })
+}
+
+
+
+export function PostModifyStartDialysis(params) {
+  return request({
+    url:'/api/start_dialysis/modify',
+    method:'Post',
+    params:params,
+  })
+}
+
+
+
+
+
+
+
+export function PostModifyFinishDialysis(params) {
+  return request({
+    url:'/api/finish_dialysis/modify',
+    method:'Post',
+    params:params,
+  })
+}
+
+
+
+export function getTodayMonitor(params) {
+  return request({
+    url:'/api/today_monitor/get',
+    method:'Get',
+    params:params,
+  })
+}
+
+
+
+
+
 
 

src/api/patient.js

@@ -332,3 +332,14 @@ export function getAllData(id, page, limit) {
   })
 }
 
+
+
+
+
+
+
+
+
+
+
+

src/store/modules/globalConfig.js

@@ -104,10 +104,10 @@ const global_config = {
     },
     anticoagulants_confit: {// 抗凝剂
       1: { id: 1, name: '无肝素', type: 1, shouji: 2, weichi: 2, zongliang: 2, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'mg', weichi_unit: 'mg/h', zongliang_unit: 'mg', gaimingcheng_unit: '', gaijiliang_unit: '' },
-      2: { id: 2, name: '普通肝素', type: 1, shouji: 1, weichi: 1, zongliang: 1, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'mg', weichi_unit: 'mg/h', zongliang_unit: 'mg', gaimingcheng_unit: '', gaijiliang_unit: '' },
-      3: { id: 3, name: '低分子肝素', type: 1, shouji: -1, weichi: -1, zongliang: 1, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'lu', weichi_unit: 'lu', zongliang_unit: 'lu', gaimingcheng_unit: '', gaijiliang_unit: '' },
+      2: { id: 2, name: '普通肝素', type: 1, shouji: 1, weichi: 1, zongliang: 1, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'iu', weichi_unit: 'iu/h', zongliang_unit: 'iu', gaimingcheng_unit: '', gaijiliang_unit: '' },
+      3: { id: 3, name: '低分子肝素', type: 1, shouji: 1, weichi: 1, zongliang: 1, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'iu', weichi_unit: 'iu/h', zongliang_unit: 'iu', gaimingcheng_unit: '', gaijiliang_unit: '' },
       4: { id: 4, name: '阿加曲班', type: 1, shouji: 1, weichi: 1, zongliang: 1, gaimingcheng: -1, gaijiliang: -1, shouji_unit: 'mg', weichi_unit: 'mg/h', zongliang_unit: 'mg', gaimingcheng_unit: '', gaijiliang_unit: '' },
-      5: { id: 5, name: '枸橼酸钠', type: 1, shouji: -1, weichi: 1, zongliang: -1, gaimingcheng: 1, gaijiliang: 1, shouji_unit: '', weichi_unit: 'ml/h', zongliang_unit: '', gaimingcheng_unit: 'ml/h', gaijiliang_unit: '' }
+      5: { id: 5, name: '枸橼酸钠', type: 1, shouji: -1, weichi: 1, zongliang: -1, gaimingcheng: 1, gaijiliang: 1, shouji_unit: '', weichi_unit: 'ml/h', zongliang_unit: '', gaimingcheng_unit: 'ml', gaijiliang_unit: '' }
     },
     anticoagulants_set: {
       type: 2

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -10,7 +10,7 @@
         </ul>
       </div>
       <ul class="info clearfix">
-        <li>  
+        <li>
           <label>姓名 : </label>
           <span>{{ patient.id == 0 ? "" : patient.name }}</span>
         </li>
@@ -56,7 +56,7 @@ export default {
   data() {
     return {
       title: '基本信息',
-      dialysis_time: moment(new Date()).format('YYYY-MM-DD')
+      dialysis_time:0,
       // steps: [
       //   { title: "透析处方" },
       //   { title: "接诊评估" },
@@ -106,7 +106,8 @@ export default {
     }
   },
   created() {
-    console.log('patinents是什么ha ', this.patient)
+    this.dialysis_time = parseTime(this.$route.query.date, '{y}-{m}-{d}')
+
   }
 }
 </script>
@@ -206,7 +207,7 @@ export default {
   }
 }
 .info {
-    padding:20px 40px;  
+    padding:20px 40px;
     li {
       float: left;
       width: 28%;

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -11,93 +11,149 @@
           <label>目标超滤量 : </label>
           <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
           <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
+        </li>
+
+
 
+
+        <li v-if="isShow('抗凝剂')">
+          <label>抗凝剂 : </label>
+          <span class="content">{{anticoagulant}}</span>
         </li>
-        <li v-if="isShow('首剂')">
-          <label>首剂 : </label>
-          <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
-          <span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>
+
+
+
+        <li v-if="isShow('总量')&&getValueStr('anticoagulant','anticoagulant') != 5">
+          <label>总量: </label>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
+
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
         </li>
-        <li v-if="isShow('钙')">
-          <label>钙: </label>
-          <span class="content">{{calcium != '0'?calcium:""}}</span>
-          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
+
+
+
+        <li v-if="isShow('钙剂量')&&getValueStr('anticoagulant','anticoagulant') == 5">
+          <label>钙剂量: </label>
+          <span class="content">{{getValueStr('anticoagulant_gaijiliang','anticoagulant_gaijiliang')}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{'ml'}}</span>
+        </li>
+
+
+        <li v-if="isShow('钠')">
+          <label>钠 : </label>
+          <span class="content">{{sodium != '0'?sodium:""}}</span>
+          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
         </li>
+
+        <li v-if="isShow('体液过多症状')">
+          <label>体液过多症状 : </label>
+          <span class="content">{{body_fluid}}</span>
+          <span class="unit"></span>
+        </li>
+
+
+
         <li v-if="isShow('置换量')">
           <label>置换量 : </label>
           <span class="content">{{replacement_total != '0'?replacement_total:""}}</span>
           <span class="unit">{{replacement_total != '0'?"L":""}}</span>
         </li>
 
+
+        <li v-if="isShow('透析前使用其他特殊药物')">
+          <label>透析前使用其他特殊药物: </label>
+          <span class="content">{{special_medicine_other}}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
           <span class="content">{{glucose != '0'?glucose:""}}</span>
           <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
         </li>
-         <li v-if="isShow('透析时长')">
+
+
+      </ul>
+
+
+      <ul>
+        <li v-if="isShow('透析时长')">
           <label>透析时长 : </label>
           <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
         </li>
-         <li v-if="isShow('透析液配方')">
-          <label>透析液配方 : </label>
-          <span class="content">{{dialysate_formulation}}</span>
+        <li v-if="isShow('透析液温度')">
+          <label>透析液温度 : </label>
+          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
+          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
         </li>
-         <li v-if="isShow('维持')">
-          <label>维持 : </label>
-          <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
-          <span class="unit">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+
+
+        <li v-if="isShow('首剂')&&getValueStr('anticoagulant','anticoagulant') != 5">
+          <label>首剂 : </label>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
+
+          <!--<span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>-->
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_shouji != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_shouji != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_shouji != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
+
         </li>
-      </ul>
-      <ul>
+
+        <li v-if="isShow('钙名称')&&getValueStr('anticoagulant','anticoagulant') == 5">
+          <label>钙名称: </label>
+          <span class="content">{{getValueStr('anticoagulant_gaimingcheng','anticoagulant_gaimingcheng')}}</span>
+        </li>
+
         <li v-if="isShow('钾')">
           <label>钾 : </label>
           <span class="content">{{kalium != '0'?kalium:""}}</span>
           <span class="unit">{{kalium != '0'?"mmol/L":""}}</span>
         </li>
+
+
+
         <li v-if="isShow('碳酸氢盐')">
           <label>碳酸氢盐 : </label>
           <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
           <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
         </li>
-        <!-- <li>
-          <label>干体重 : </label>
-          <span class="content">{{dry_weight}}</span>
-          <span class="unit">kg</span>
-        </li> -->
-        <li v-if="isShow('透析液温度')">
-          <label>透析液温度 : </label>
-          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
-          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
+
+        <li v-if="isShow('体液过多其他症状')">
+          <label>体液过多其他症状 : </label>
+          <span class="content">{{body_fluid_other}}</span>
+          <span class="unit"></span>
         </li>
-         <li v-if="isShow('血流量')">
+
+
+
+
+
+        <li v-if="isShow('血流量')">
           <label>血流量 : </label>
           <span class="content">{{blood_flow_volume != '0'?blood_flow_volume:''}}</span>
           <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
-        <li v-if="isShow('抗凝剂')">
-          <label>抗凝剂 : </label>
-          <span class="content">{{anticoagulant}}</span>
-        </li>
-          <li v-if="isShow('总量')">
-          <label>总量: </label>
-          <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
-          <span class="unit">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
-        </li>
-        <li v-if="isShow('钠')">
-          <label>钠 : </label>
-          <span class="content">{{sodium != '0'?sodium:""}}</span>
-          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
+
+        <li v-if="isShow('透析液配方')">
+          <label>透析液配方 : </label>
+          <span class="content">{{dialysate_formulation}}</span>
         </li>
+
+
           <li v-if="isShow('透析液流量')">
           <label>透析液流量 : </label>
           <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
           <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
         </li>
-           <li v-if="isShow('电导度')">
-          <label>电导度 : </label>
-          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
-          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
-        </li>
+
       </ul>
       <ul>
 
@@ -106,44 +162,58 @@
           <span class="content">{{dialyzer_perfusion_apparatus}}</span>
           <span class="unit"></span>
         </li>
-
-        <li v-if="isShow('体液过多症状')">
-          <label>体液过多症状 : </label>
-          <span class="content">{{body_fluid}}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('实际超滤量')">
+          <label>实际超滤量: </label>
+          <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>
+          <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
         </li>
-        <li v-if="isShow('体液过多其他症状')">
-          <label>体液过多其他症状 : </label>
-          <span class="content">{{body_fluid_other}}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('维持')&&getValueStr('anticoagulant','anticoagulant') != 5">
+          <label>维持 : </label>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
+          <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
+
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
         </li>
-        <li v-if="isShow('透析前使用特殊药物')">
-          <label>透析前使用特殊药物: </label>
-          <span class="content">{{special_medicine}}</span>
-          <span class="unit"></span>
+
+        <li v-if="isShow('钙')">
+          <label>钙: </label>
+          <span class="content">{{calcium != '0'?calcium:""}}</span>
+          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
         </li>
-        <li v-if="isShow('透析前使用其他特殊药物')">
-          <label>透析前使用其他特殊药物: </label>
-          <span class="content">{{special_medicine_other}}</span>
-          <span class="unit"></span>
+
+        <li v-if="isShow('电导度')">
+          <label>电导度 : </label>
+          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
         </li>
+
+
         <li v-if="isShow('置换液')">
           <label v-if="this.$store.getters.xt_user.template_info.template_id != 6">置换液: </label>
           <label v-if="this.$store.getters.xt_user.template_info.template_id == 6">置换方式: </label>
 
-          <span class="content">{{displace_liqui}}</span>
+          <span class="content">{{displace_liqui != '0'?displace_liqui:''}}</span>
+          <span class="unit">{{displace_liqui != '0'?'L':''}}</span>
+        </li>
+
+
+        <li v-if="isShow('透析前使用特殊药物')">
+          <label>透析前使用特殊药物: </label>
+          <span class="content">{{special_medicine}}</span>
           <span class="unit"></span>
         </li>
+
+
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>
           <span class="content">{{blood_access}}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('实际超滤量')">
-          <label>实际超滤量: </label>
-          <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>
-          <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
-        </li>
+
         <li v-if="isShow('目标KT/V')">
           <label>目标KT/V: </label>
           <span class="content">{{target_ktv != '0'? target_ktv:''}}</span>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -1,375 +1,465 @@
 <template>
-    <div>
-        <div class="grid">
-            <div class="list">
-                <ul>
-                    <li @click="showPrescription">
-                        <img src="@/assets/record/1.png">
-                        <p>透析处方</p>
-                    </li>
-                    <li @click="showAccepts">
-                        <img src="@/assets/record/2.png">
-                        <p>接诊评估</p>
-                    </li>
-                    <li @click="showAssessmentBefore">
-                        <img src="@/assets/record/3.png">
-                        <p>透前评估</p>
-                    </li>
-                    <li @click="showDoctorAdviceDialog">
-                        <img src="@/assets/record/4.png">
-                        <p>临时医嘱</p>
-                    </li>
-                    <li @click="showDoubleCheck">
-                        <img src="@/assets/record/5.png">
-                        <p>双人核对</p>
-                    </li>
-                </ul>
-            </div>
-            <div class="list">
-                <ul>
-                    <li @click="showComputerDialog">
-                        <img src="@/assets/record/6.png" >
-                        <p>透析上机</p>
-                    </li>
-                    <li @click="showMonitorDialog">
-                        <img src="@/assets/record/7.png" >
-                        <p>透析监测</p>
-                    </li>
-                    <li @click="showFinishDialog">
-                        <img src="@/assets/record/8.png" >
-                        <p>透析下机</p>
-                    </li>
-                    <li @click="showAssessmentAfterDialog">
-                        <img src="@/assets/record/9.png" >
-                        <p>透后评估</p>
-                    </li>
-                    <li @click="showrTeatmentSummary" >
-                        <img src="@/assets/record/10.png" >
-                        <p>治疗小结</p>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <div class="middleLine"></div>
-
-        <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription" :solution="solution" @advice="adviceFunc"
-                                      :niprocart_info="niprocart_info" :jms_info="jms_info" :fistula_needle_set_info="fistula_needle_set_info"
-        :fistula_needle_set_16_info="fistula_needle_set_16_info"  :hemoperfusion_info="hemoperfusion_info" :dialyser_sterilised_info="dialyser_sterilised_info"
-        :filtryzer_info="filtryzer_info" :dialyzers_info="dialyzers_info" :injector_info="injector_info" :bloodlines_info="bloodlines_info"  :tubingHemodialysis_info="tubingHemodialysis_info"
-        :safe_package_info="safe_package_info" :aliquid_info="aliquid_info" :config="config" :admin_users="admin_users"  :targetAdvices="longAdvices"
-                                      :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
-
-        ></dialysis-prescription-dialog>
-
-        <double-check-dialog title="双人核对" ref="doubleCheck" :patient="patient" :double_check="double_check" :admin_users="admin_users" ></double-check-dialog>
-
-        <accepts-treatment-dialog title="接诊评估" ref="accepts" :patient="patient" :receiver_treatment_access="receiver_treatment_access"></accepts-treatment-dialog>
-
-        <assessment-before-dislysis-dialog title="透前评估" ref="assessmentBefore" :patient="patient" :predialysis_evaluation="predialysis_evaluation"></assessment-before-dislysis-dialog>
-
-        <treatment-summary-dialog title="治疗小结" ref="treatmentSummary" :patient="patient" :treatment_summary="treatment_summary"></treatment-summary-dialog>
-
-        <doctor-advice-dialog title="临时医嘱" ref="doctor_advice" :doctor_advices="doctor_advices" :patient="patient" :admin_users="admin_users" :dialysis_order="dialysis_order" ></doctor-advice-dialog>
-
-        <computer-dialog title="透析上机" ref="computer_dialog" :dialysis_order="dialysis_order" :schedule="schedual" :admins="admin_users" :device_numbers="device_numbers"></computer-dialog>
-
-        <monitor-dialog title="透析监测" ref="monitor_dialog" :monitors="monitor_records"></monitor-dialog>
-
-        <finish-dialog title="透析下机" ref="finish_dialog" :dialysis_order="dialysis_order" :schedule="schedual" :admins="admin_users"></finish-dialog>
-
-        <assessment-after-dislysis title="透后评估" ref="assessment_after_dislysis" :assessment_after_dislysis="assessment_after_dislysis" :patient="patient"  :dialysis_order="dialysis_order"></assessment-after-dislysis>
+  <div>
+    <div class="grid">
+      <div class="list">
+        <ul>
+          <li @click="showPrescription">
+            <img src="@/assets/record/1.png">
+            <p>透析处方</p>
+          </li>
+          <li @click="showAccepts">
+            <img src="@/assets/record/2.png">
+            <p>接诊评估</p>
+          </li>
+          <li @click="showAssessmentBefore">
+            <img src="@/assets/record/3.png">
+            <p>透前评估</p>
+          </li>
+          <li @click="showDoctorAdviceDialog">
+            <img src="@/assets/record/4.png">
+            <p>临时医嘱</p>
+          </li>
+          <li @click="showDoubleCheck">
+            <img src="@/assets/record/5.png">
+            <p>双人核对</p>
+          </li>
+        </ul>
+      </div>
+      <div class="list">
+        <ul>
+          <li @click="showComputerDialog">
+            <img src="@/assets/record/6.png">
+            <p>透析上机</p>
+          </li>
+          <li @click="showMonitorDialog">
+            <img src="@/assets/record/7.png">
+            <p>透析监测</p>
+          </li>
+          <li @click="showFinishDialog">
+            <img src="@/assets/record/8.png">
+            <p>透析下机</p>
+          </li>
+          <li @click="showAssessmentAfterDialog">
+            <img src="@/assets/record/9.png">
+            <p>透后评估</p>
+          </li>
+          <li @click="showrTeatmentSummary">
+            <img src="@/assets/record/10.png">
+            <p>治疗小结</p>
+          </li>
+        </ul>
+      </div>
     </div>
+
+    <div class="middleLine"></div>
+
+    <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription"
+                                  :solution="solution" @advice="adviceFunc"
+                                  :niprocart_info="niprocart_info" :jms_info="jms_info"
+                                  :fistula_needle_set_info="fistula_needle_set_info"
+                                  :fistula_needle_set_16_info="fistula_needle_set_16_info"
+                                  :hemoperfusion_info="hemoperfusion_info"
+                                  :dialyser_sterilised_info="dialyser_sterilised_info"
+                                  :filtryzer_info="filtryzer_info" :dialyzers_info="dialyzers_info"
+                                  :injector_info="injector_info" :bloodlines_info="bloodlines_info"
+                                  :tubingHemodialysis_info="tubingHemodialysis_info"
+                                  :safe_package_info="safe_package_info" :aliquid_info="aliquid_info" :config="config"
+                                  :admin_users="admin_users" :targetAdvices="longAdvices"
+                                  :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
+
+                                  :predialysis="predialysis_evaluation"
+                                  :last_predialysis="last_predialysis_evaluation"
+                                  :record="assessment_after_dislysis"
+                                  :last_record="last_assessment_after_dislysis"
+                                  :last_prescription="last_dialysis_prescribe"
+                                  :dry_weight="last_dryWeight_dislysis"
+                                  :schedual="schedual"
+
+    ></dialysis-prescription-dialog>
+
+    <double-check-dialog title="双人核对" ref="doubleCheck" :patient="patient" :double_check="double_check"
+                         :admin_users="admin_users"></double-check-dialog>
+
+    <accepts-treatment-dialog title="接诊评估" ref="accepts" :patient="patient"
+                              :receiver_treatment_access="receiver_treatment_access"></accepts-treatment-dialog>
+
+    <assessment-before-dislysis-dialog title="透前评估" ref="assessmentBefore" :patient="patient" :last_predialysis="last_predialysis_evaluation"
+                                       :predialysis_evaluation="predialysis_evaluation" :admin_users="admin_users"  :dry_weight="last_dryWeight_dislysis"
+    ></assessment-before-dislysis-dialog>
+
+    <treatment-summary-dialog title="治疗小结" ref="treatmentSummary" :patient="patient"
+                              :treatment_summary="treatment_summary"></treatment-summary-dialog>
+
+    <doctor-advice-dialog title="临时医嘱" ref="doctor_advice" :doctor_advices="doctor_advices" :patient="patient"
+                          :admin_users="admin_users" :dialysis_order="dialysis_order"></doctor-advice-dialog>
+
+    <computer-dialog title="透析上机" ref="computer_dialog" :dialysis_order="dialysis_order" :schedule="schedual" @monitor="add_monitor"
+                     :admins="admin_users" :device_numbers="device_numbers" :special_premission="special_premission"></computer-dialog>
+
+    <monitor-dialog title="透析监测" ref="monitor_dialog" :monitors="monitor_records" ></monitor-dialog>
+
+    <finish-dialog title="透析下机" ref="finish_dialog" :dialysis_order="dialysis_order" :schedule="schedual"
+                   :admins="admin_users"  @assessmentAfterDislysis="assessmentAfterDislysisFunc" :special_premission="special_premission"></finish-dialog>
+
+    <assessment-after-dislysis title="透后评估" ref="assessment_after_dislysis"
+                               :assessment_after_dislysis="assessment_after_dislysis" :patient="patient"
+                               :dialysis_order="dialysis_order"></assessment-after-dislysis>
+  </div>
 </template>
 
 <script>
-import dialysisPrescriptionDialog from './dialog/dialysisPrescriptionDialog'
-import doubleCheckDialog from './dialog/doubleCheckDialog'
-import AssessmentAfterDislysis from './dialog/AssessmentAfterDislysis'
-import acceptsTreatmentDialog from './dialog/acceptsTreatmentDialog'
-import assessmentBeforeDislysisDialog from './dialog/assessmentBeforeDislysisDialog'
-import MonitorDialog from './dialog/monitor_dialog'
-import DoctorAdviceDialog from './dialog/DoctorAdviceDialog'
-import treatmentSummaryDialog from './dialog/treatmentSummaryDialog'
-import ComputerDialog from './dialog/computer_dialog'
-import FinishDialog from './dialog/finish_dialog'
-
-export default {
-  name: 'NavIgation',
-  components: {
-    dialysisPrescriptionDialog,
-    doubleCheckDialog,
-    AssessmentAfterDislysis,
-    acceptsTreatmentDialog,
-    assessmentBeforeDislysisDialog,
-    treatmentSummaryDialog,
-    MonitorDialog,
-    DoctorAdviceDialog,
-    ComputerDialog,
-    FinishDialog
-  },
-  data() {
-    return {
-    }
-  },
-  props: {
-    longAdvices: { // 临时医嘱
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    waitUploadAdvices: { // 临时医嘱
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    is_open: { // 临时医嘱
-      type: Number,
-      default: () => {
-        return 0
-      }
-    },
-    patient: { // 患者信息
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    schedual: { // 患者排班信息
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    prescription: { // 透析处方
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    solution: { // 透析方案
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    receiver_treatment_access: { // 接诊评估
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    predialysis_evaluation: { // 透前评估
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    doctor_advices: { // 临时医嘱
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    double_check: { // 双人核对
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    assessment_after_dislysis: { // 透后评估
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    treatment_summary: { // 治疗小结
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    monitor_records: { // 透析监测
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    dialysis_order: { // 透析记录
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
-    admin_users: { // 系统用户列表
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    devices: { // 设备
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    device_numbers: { // 床位
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+  import dialysisPrescriptionDialog from './dialog/dialysisPrescriptionDialog'
+  import doubleCheckDialog from './dialog/doubleCheckDialog'
+  import AssessmentAfterDislysis from './dialog/AssessmentAfterDislysis'
+  import acceptsTreatmentDialog from './dialog/acceptsTreatmentDialog'
+  import assessmentBeforeDislysisDialog from './dialog/assessmentBeforeDislysisDialog'
+  import MonitorDialog from './dialog/monitor_dialog'
+  import DoctorAdviceDialog from './dialog/DoctorAdviceDialog'
+  import treatmentSummaryDialog from './dialog/treatmentSummaryDialog'
+  import ComputerDialog from './dialog/computer_dialog'
+  import FinishDialog from './dialog/finish_dialog'
 
-    niprocart_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
+  export default {
+    name: 'NavIgation',
+    components: {
+      dialysisPrescriptionDialog,
+      doubleCheckDialog,
+      AssessmentAfterDislysis,
+      acceptsTreatmentDialog,
+      assessmentBeforeDislysisDialog,
+      treatmentSummaryDialog,
+      MonitorDialog,
+      DoctorAdviceDialog,
+      ComputerDialog,
+      FinishDialog
     },
 
-    jms_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+    data() {
+      return {
 
-    fistula_needle_set_info: {
-      type: Array,
-      default: () => {
-        return []
       }
+    },mounted(){
     },
 
-    fistula_needle_set_16_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+    props: {
+      longAdvices: { // 临时医嘱
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      waitUploadAdvices: { // 临时医嘱
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      is_open: { // 临时医嘱
+        type: Number,
+        default: () => {
+          return 0
+        }
+      },
+      patient: { // 患者信息
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      schedual: { // 患者排班信息
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      prescription: { // 透析处方
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      solution: { // 透析方案
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      receiver_treatment_access: { // 接诊评估
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      predialysis_evaluation: { // 透前评估
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      doctor_advices: { // 临时医嘱
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      double_check: { // 双人核对
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      assessment_after_dislysis: { // 透后评估
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      treatment_summary: { // 治疗小结
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      monitor_records: { // 透析监测
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      dialysis_order: { // 透析记录
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      admin_users: { // 系统用户列表
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      devices: { // 设备
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      device_numbers: { // 床位
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-    hemoperfusion_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+      niprocart_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-    dialyser_sterilised_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+      jms_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-    filtryzer_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+      fistula_needle_set_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-    dialyzers_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    injector_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    bloodlines_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    tubingHemodialysis_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    safe_package_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    aliquid_info: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    config: {
-      type: Object,
-      default: () => {
-        return { id: 0 }
-      }
-    },
+      fistula_needle_set_16_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-    admin_user_map: { // {user_id: admin_user object}
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    device_map: { // {device_id: device object}
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    device_number_map: { // {device_number_id: device_number object}
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  methods: {
-    adviceFunc:function(){
+      hemoperfusion_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyser_sterilised_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      filtryzer_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyzers_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      injector_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      bloodlines_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      tubingHemodialysis_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      safe_package_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      aliquid_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      headNurses: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      config: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+
+      admin_user_map: { // {user_id: admin_user object}
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      device_map: { // {device_id: device object}
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      device_number_map: { // {device_number_id: device_number object}
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+
+      last_predialysis_evaluation: { //最后一条透前
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      last_monitor_record: { //最后一条监测记录
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      last_assessment_after_dislysis: { //最后一条透后记录 (除了今天录的)
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      }, last_dialysis_prescribe: { //最后一条透析处方(除了今天录的)
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      }, last_dryWeight_dislysis: { //最后一条干体重 (除了今天录的)
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      }, special_premission: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
 
-      this.$emit("advice")
-    },
-    showMonitorDialog: function() {
-      this.$refs.monitor_dialog.show()
-    },
-    showAssessmentAfterDialog: function() {
-      this.$refs.assessment_after_dislysis.show()
-    },
-    showDoctorAdviceDialog: function() {
-      this.$refs.doctor_advice.show()
-    },
-    showComputerDialog: function() {
-      this.$refs.computer_dialog.show()
-    },
-    showFinishDialog: function() {
-      this.$refs.finish_dialog.show()
-    },
-    showPrescription: function() {
-      this.$refs.prescription.show()
-    },
-    showAccepts: function() {
-      this.$refs.accepts.show()
-    },
-    showAssessmentBefore: function() {
-      this.$refs.assessmentBefore.show()
-    },
-    showDoubleCheck: function() {
-      this.$refs.doubleCheck.show()
     },
-    showrTeatmentSummary: function() {
-      this.$refs.treatmentSummary.show()
+    methods: {
+      setLastRecord:function(lastPredialysisEvaluation,lastMonitorRecord,lastAssessmentAfterDislysis,lastDialysisPrescribe,lastDryWeightDislysis){
+           this.$refs.assessmentBefore.setLastRecord(lastPredialysisEvaluation,lastDryWeightDislysis)
+
+      },
+
+      add_monitor:function(monitor){
+
+
+        this.monitor_records.push(monitor)
+        this.monitor_records.sort((a, b) => b.operate_time - a.operate_time)
+        this.monitor_records.reverse()
+        this.$refs.monitor_dialog.setRecords(this.monitor_records)
+      },
+      adviceFunc: function() {
+
+        this.$emit('advice')
+      },
+      showMonitorDialog: function() {
+        this.$refs.monitor_dialog.show()
+      },
+      showAssessmentAfterDialog: function() {
+        this.$refs.assessment_after_dislysis.show()
+      },
+      showDoctorAdviceDialog: function() {
+        this.$refs.doctor_advice.show()
+      },
+      showComputerDialog: function() {
+        this.$refs.computer_dialog.show()
+      },
+      showFinishDialog: function() {
+        this.$refs.finish_dialog.show()
+      },
+      showPrescription: function() {
+        this.$refs.prescription.show()
+      },
+      showAccepts: function() {
+        this.$refs.accepts.show()
+      },
+      showAssessmentBefore: function() {
+        this.$refs.assessmentBefore.show()
+      },
+      showDoubleCheck: function() {
+        this.$refs.doubleCheck.show()
+      },
+      showrTeatmentSummary: function() {
+        this.$refs.treatmentSummary.show()
+      },assessmentAfterDislysisFunc:function(val) {
+        this.assessment_after_dislysis = val
+        this.$refs.assessment_after_dislysis.setRecords(this.assessment_after_dislysis)
+        this.$emit('assessmentAfterDislysis', this.assessment_after_dislysis)
+
+
+      }
     }
   }
-}
 </script>
 <style style="stylesheet/scss" lang="scss" scoped>
   .grid {

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -16,7 +16,8 @@
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>
           <span class="content" v-if="actual_ultrafiltration!='0'">{{ actual_ultrafiltration }}</span>
-          <span class="unit" v-if="actual_ultrafiltration!='0'">ml</span>
+          <span class="unit" v-if="actual_ultrafiltration!='0'&& this.$store.getters.xt_user.template_info.template_id == 6">ml</span>
+          <span class="unit" v-if="actual_ultrafiltration!='0'&& this.$store.getters.xt_user.template_info.template_id != 6">L</span>
         </li>
         <li v-if="isShow('凝血')">
           <label>透析器凝血 : </label>
@@ -71,11 +72,11 @@
 
         <li v-if="isShow('并发症')">
           <label>并发症: </label>
-          <span class="content">{{ complication }}</span>
+          <span class="content">{{ this.record.complication }}</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">
           <label>压迫后内瘘震颤: </label>
-          <span class="content">{{ internal_fistula_tremor_ac_name }}</span>
+          <span class="content">{{ getInternal() }}</span>
         </li>
 
         <li v-if="isShow('交待病房护士/患者/陪人观察内容')&&patient_gose==3">
@@ -84,24 +85,24 @@
         </li>
         <li v-if="isShow('体温')">
           <label>体温 : </label>
-          <span class="content" v-if="temperature!='0'">{{ temperature }}</span>
-          <span class="unit" v-if="temperature!='0'">℃</span>
+          <span class="content" v-if="this.record.temperature">{{ this.record.temperature }}</span>
+          <span class="unit" v-if="this.record.temperature">℃</span>
         </li>
         <li v-if="isShow('脉率')">
           <label>脉率 : </label>
-          <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
-          <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
+          <span class="content" v-if="this.record.pulse_frequency">{{ this.record.pulse_frequency }}</span>
+          <span class="unit" v-if="this.record.pulse_frequency">次/分</span>
         </li>
         <li v-if="isShow('呼吸频率')">
           <label>呼吸频率 : </label>
-          <span class="content" v-if="breathing_rate !='0'">{{ breathing_rate }}</span>
-          <span class="unit" v-if="breathing_rate !='0'">次/min</span>
+          <span class="content" v-if="this.record.breathing_rate">{{ this.record.breathing_rate }}</span>
+          <span class="unit" v-if="this.record.breathing_rate">次/min</span>
         </li>
 
         <li v-if="isShow('实际治疗时长')">
           <label>实际治疗时长 : </label>
-          <span class="content" v-if="actual_treatment_hour!='0'">{{ actual_treatment_hour }}时</span>
-          <span class="content" v-if="actual_treatment_minute!='0'">{{ actual_treatment_minute }}分</span>
+          <span class="content" v-if="this.record.actual_treatment_hour">{{ this.record.actual_treatment_hour }}小时</span>
+          <span class="content" v-if="this.record.actual_treatment_minute">{{ this.record.actual_treatment_minute }}分钟</span>
         </li>
         <li v-if="isShow('透析中入量')">
           <label>透析中入量: </label>
@@ -121,28 +122,25 @@
         </li>
         <li v-if="isShow('其他观察内容')&&patient_gose==3">
           <label>其他观察内容 : </label>
-          <span class="content">{{ observation_content_other }}</span>
-        </li>
-        <li v-if="isShow('拔针后穿刺点渗血')">
-          <label for="bzh">拔针后穿刺点渗血: </label>
-          <span id="bzh" class="content">{{puncture_point_oozing_blood_name}}</span>
+          <span class="content">{{observation_content_other }}</span>
         </li>
+
       </ul>
       <ul>
         <li v-if="isShow('透析过程')">
           <label for="tw">透析过程 : </label>
           <span class="content" id="tw" v-if="this.record.dialysis_process == 1">完成</span>
-          <span class="content" id="tw" v-if="this.record.dialysis_process == 2">提前{{in_advance_minute}}min</span>
+          <span class="content" id="tw" v-if="this.record.dialysis_process == 2">提前{{this.record.in_advance_minute}}min</span>
         </li>
         <li v-if="this.record.dialysis_process == 2&&isShow('透析过程提前原因')">
           <label for="tw">透析过程提前原因 : </label>
-          <span class="content" id="tw">{{in_advance_reason}}</span>
+          <span class="content" id="tw">{{this.record.in_advance_reason}}</span>
         </li>
 
 
         <li v-if="isShow('内瘘管拔针后压迫止血时间')">
           <label for="ml">内瘘管拔针后压迫止血时间 : </label>
-          <span id="ml" class="content" v-if="hemostasis_minute">{{hemostasis_minute}}min</span>
+          <span id="ml" class="content" v-if="this.record.hemostasis_minute">{{this.record.hemostasis_minute}}min</span>
           <span id="ml" class="content" v-else>-min</span>
         </li>
         <li v-if="isShow('内瘘管拔针后压迫止血操作')">
@@ -180,7 +178,7 @@
       </ul>
 
     </div>
-    <div class="note">备注 : <span>{{ remark }}</span></div>
+    <div class="note">备注 : <span>{{ this.record.remark }}</span></div>
     <div class="middleLine"></div>
   </div>
 </template>
@@ -192,15 +190,7 @@
     name: 'DialysisPrescription',
     data() {
       return {
-        title: '透后评估 ',
-        complication: '',
-        internal_fistula_tremor_ac_name:'',
-        temperature: '',
-        breathing_rate:'',
-        actual_treatment_hour:'',
-        actual_treatment_minute: '',
-        hemostasis_minute:'',
-        remark:''
+        title: '透后评估 '
       }
     },
     props: {
@@ -349,6 +339,7 @@
           return '-'
         }
         const vascular_access = this.$store.getters.vascular_access_desc
+        console.log(vascular_access)
         let name = '-'
         for (var index in vascular_access) {
           if (vascular_access[index].id == this.record.blood_access_part_opera_id) {
@@ -368,6 +359,17 @@
         if (this.record.id == 0) {
           return
         }
+        switch (this.record.puncture_point_haematoma) {
+          case 1:
+            return '有'
+            break
+          case 2:
+            return '无'
+            break
+          default:
+            return '-'
+            break
+        }
       }
     }, breathing_rate: function() {
       if (this.record.id == 0) {
@@ -415,42 +417,10 @@
     complication: function() {
       if (this.record.id == 0) {
         return '-'
-      } 
-      if(this.record.complication){
-        return this.record.complication
-      } else{
-        return '-'
-      }
-    },
-    internal_fistula_tremor_ac_name: function() {
-      if (this.record.id == 0) {
-        return '-'
-      }
-      switch (this.record.internal_fistula_tremor_ac) {
-        case 1:
-          return '存在'
-          break
-        case 2:
-          return '减弱'
-          break
-        case 3:
-          return '无'
-          break
-        default:
-          return '-'
-      }
-      switch (this.record.puncture_point_haematoma) {
-        case 1:
-          return '有'
-          break
-        case 2:
-          return '无'
-          break
-        default:
-          return '-'
-          break
       }
+      return this.record.complication
     },
+
     temperature: function() {
       if (this.record.id == 0) {
         return '-'
@@ -493,31 +463,13 @@
       }
       return this.record.observation_content
     },
-    // complication: function() {
-    //   if (this.record.id == 0) {
-    //     return '-'
-    //   }
-    //   return this.record.complication
-    // },
-    // internal_fistula_tremor_ac_name: function() {
-    //   if (this.record.id == 0) {
-    //     return '-'
-    //   }
-    //   switch (this.record.internal_fistula_tremor_ac) {
-    //     case 1:
-    //       return '存在'
-    //       break
-    //     case 2:
-    //       return '减弱'
-    //       break
-    //     case 3:
-    //       return '无'
-    //       break
-    //     default:
-    //       return '-'
-    //       break
-    //   }
-    // },
+    complication: function() {
+      if (this.record.id == 0) {
+        return '-'
+      }
+      return this.record.complication
+    },
+
 
     remark: function() {
       if (this.record.id == 0) {
@@ -551,6 +503,25 @@
       return this.record.in_advance_reason_other
     },
     methods: {
+      getInternal: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        switch (this.record.internal_fistula_tremor_ac) {
+          case 1:
+            return '存在'
+            break
+          case 2:
+            return '减弱'
+            break
+          case 3:
+            return '无'
+            break
+          default:
+            return '-'
+        }
+
+      },
       getOpera: function(id) {
         var hemostasis_opera = this.$store.getters.hemostasis_opera
         var hemostasisOperaName = ''

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

@@ -52,7 +52,10 @@
 
         <el-row :gutter="20"> -->
           <el-col :span="8" v-if="isShow('实际超滤量')">
-            <el-form-item label="实际超滤量(L): " >
+            <el-form-item label="实际超滤量(L): " v-if="this.template_id != 6" >
+              <el-input v-model="form.actual_ultrafiltration"></el-input>
+            </el-form-item>
+            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6" >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
           </el-col>
@@ -61,14 +64,15 @@
               <el-input v-model="form.actual_displacement"></el-input>
             </el-form-item>
           </el-col>
+
+
+
+
           <el-col :span="8"  v-if="isShow('实际治疗时长')">
             <el-form-item label="实际治疗时长(时):">
               <!-- <el-input v-model="form.actual_treatment_hour"></el-input> -->
               <el-time-picker
                 v-model="actualTreatmentHourShow"
-                :picker-options="{
-                                        selectableRange: '00:01:00 - 23:59:00'
-                                    }"
                 placeholder="透析时长"
                 style="width:100%;"
                 value-format="H:m"
@@ -423,8 +427,7 @@ export default {
         loading: false,
         record_date: '',
         isVisibility: false,
-
-        actualTreatmentHourShow: new Date(2018, 1, 1, 3, 0),
+        template_id:0,
         cruorOptions: [],
         symptomsOptions: [],
         internalFistulaOptions: [],
@@ -433,6 +436,7 @@ export default {
           {id: 1, name: 'g'},
           {id: 2, name: 'ml'},
         ],
+        actualTreatmentHourShow:'',
         vascularAccessDescOptions: [],
         catheterOptions: [],
         complicationOptions: [],
@@ -758,6 +762,7 @@ export default {
 
       show() {
         this.isVisibility = true
+
       },
 
       hide() {
@@ -771,7 +776,12 @@ export default {
           }
         }
         return false
-      }
+      },  setRecords (records) {
+        for (var index in records) {
+          this.$set(this.assessment_after_dislysis, index, records[index])
+        }
+        this.actualTreatmentHourShow = new Date(2018, 1, 1, this.assessment_after_dislysis['actual_treatment_hour'], this.assessment_after_dislysis['actual_treatment_minute'])
+      },
     },
     created() {
       console.log('this.form', this.form)
@@ -785,8 +795,7 @@ export default {
       this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
       this.patientGoseOptions = this.$store.getters.patient_gose
       this.observationContentOptions = this.$store.getters.observation_content
-
-      console.log(this.patient)
+      this.template_id = this.$store.getters.xt_user.template_info.template_id;
 
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')

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

@@ -0,0 +1,174 @@
+<template>
+  <el-dialog
+    :visible.sync="visibility"
+    width="500px"
+    :modal-append-to-body="false"
+    :append-to-body="true"
+  >
+    <div >
+      <div class="DialogTit">
+        <div class="back" @click="cancle()">
+          <span class="iconfont">&#xe720; </span>返回
+        </div>
+        <h1 class="name">
+          {{ patient_prop.name }} [透析号 {{ patient_prop.dialysis_no }} ]
+        </h1>
+        <span @click="comfirm" class="success" style="visibility: hidden;"
+        >确定</span>
+      </div>
+
+      <div class="DialogContent">
+        <div class="item">
+          <label class="name" for="txms">本次透析日期</label>
+          <div class="content">
+            <span class="text" id="txms"> {{ dialysis_date }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透前体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{ predialysis.weight_before }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">干体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{ last_predialysis.dry_weight }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">衣物重（kg）</label>
+          <div class="content">
+          <span class="text" id="txms">{{
+            predialysis.additional_weight
+          }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重增加（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{ add_weight }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透后体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{ record.weight_after }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重减少（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{ record.weight_loss }}</span>
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">上次透后体重（kg）</label>
+          <div class="content">
+          <span class="text" id="txms">{{
+            last_record.weight_after
+          }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+
+<script>
+  import { parseTime } from '@/utils'
+
+  export default {
+    name: 'MsgTip',
+    created() {
+      if (
+        this.predialysis.weight_before > 0 &&
+        this.last_record.weight_after > 0
+      ) {
+        this.add_weight = parseFloat(
+          this.predialysis.weight_before - this.last_record.weight_after
+        ).toFixed(2)
+      }
+    },
+    data() {
+      return {
+        result: [],
+        id: 0,
+        selectName: '',
+        add_weight: 0
+      }
+    },
+    props: {
+      predialysis: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+      last_predialysis: {
+        type: Object
+      },
+      record: {
+        type: Object
+      },
+      last_record: {
+        type: Object
+      },
+      patient_prop: {
+        type: Object
+      },
+      prescription_prop: {
+        type: Object
+      }
+    },
+    computed: {
+      dialysis_date: function() {
+        return parseTime(this.$route.query.date, '{y}/{m}/{d}')
+      }
+    },
+    methods: {
+      cancle: function() {
+        this.$emit('menu-msg-tip')
+      },
+      comfirm: function() {
+        this.$emit('menu-msg-tip')
+      },
+      getValue: function() {
+        let form = {}
+
+        let results = []
+
+        for (let i = 0; i < this.propsForm.list.length; i++) {
+          for (let a = 0; a < this.propsForm.result.length; a++) {
+            if (this.propsForm.list[i].id == this.propsForm.result[a]) {
+              results.push(this.propsForm.list[i])
+            }
+          }
+        }
+
+        var obj5 = {}
+        results = results.reduce((cur, next) => {
+          obj5[next.id] ? '' : (obj5[next.id] = true && cur.push(next))
+          return cur
+        }, [])
+
+        results
+
+        return results
+      }
+    },
+    watch: {
+      visibility(val) {
+        //初始化数据操作
+      }
+    }
+  }
+</script>
+
+<style  scoped>
+
+
+
+</style>

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

@@ -2,28 +2,34 @@
   <div>
     <el-dialog title="透析上机" :visible.sync="visible" width="854px" :modal-append-to-body="false">
       <el-form :model="form" label-width="100px">
+
+        <el-form-item label="班次">
+          <el-select v-model="schedual_type" placeholder="请选择班次" @change="changeSchedualType">
+            <el-option v-for="(item, index) in schedules_type" :key="index" :value="item.id" :label="item.name" ></el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="上机床位">
-          <el-select v-model="form.bed_id" placeholder="" :disabled="dialysis_order.id != 0">
+          <el-select v-model="form.bed_id" placeholder="请选择上机床位" >
             <el-option v-for="(bed, index) in zone_beds" :key="index" :value="bed.id" :label="bed.number"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="上机护士">
-          <el-select v-model="form.nurse_id" placeholder="" :disabled="dialysis_order.id != 0">
+          <el-select v-model="form.nurse_id" placeholder="请选择上机护士" >
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="穿刺护士">
-          <el-select v-model="form.puncture_nurse_id" placeholder="" :disabled="dialysis_order.id != 0">
+          <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士" >
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="引血(ml/min)" v-if="template_id == 6" >
-          <el-input type="number" v-model="form.lood_drawing" style="width:200px;"></el-input>
+          <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
-    
+
         <el-form-item label="上机时间 :" style="width:300px">
           <el-date-picker
-            :disabled="dialysis_order.id != 0"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
             value-format="yyyy-MM-dd HH:mm"
@@ -35,6 +41,8 @@
         <el-form-item>
           <el-button v-if="dialysis_order.id == 0" @click="submit" type="primary" :loading="loading">执行上机</el-button>
           <el-button v-else type="info" :disabled="true">已上机</el-button>
+          <el-button v-if="dialysis_order.id > 0 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)" type="primary" @click="editOrder">修改上机</el-button>
+
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -43,26 +51,35 @@
 </template>
 
 <script>
-  import { startDialysis } from '@/api/dialysis_record'
+  import { startDialysis,GetSchedualNumber,PostModifyStartDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
 
   export default {
     name: 'ComputerDialog',
     data() {
       return {
+        zone_beds:[],
         visible: false,
         loading: false,
         template_id: 0,
         patient_id: 0,
         schedule_date: 0,
         start_time: 0,
+        creator:0,
         form: {
           bed_id: '',
           nurse_id: '',
           start_time: '',
           puncture_nurse_id: '',
-          lood_drawing: 100
-        }
+          blood_drawing: 100
+        },
+        schedual_type:0,
+        schedules_type: [
+          {id: 1, name:"上午"},
+          {id: 2, name:"下午"},
+          {id: 3, name:"晚上"},
+        ], // 该排班的区里的床位
+        isPremission:false,
       }
     },
     props: {
@@ -77,29 +94,41 @@
       },
       device_numbers: {
         type: Array
-      }
+      },
+      special_premission: {
+        type: Array,
+      },
+    },mounted(){
+
+
+
+
     },
     created() {
+
       this.template_id = this.$store.getters.xt_user.template_info.template_id
       this.patient_id = this.$route.query.patient_id
       this.schedule_date = this.$route.query.date
-
-      this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
       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 : this.dialysis_order.puncture_nurse
-      this.form.lood_drawing = 0
-
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
+
+
+
+
+
+
+
     },
     watch: {
       'schedule.id': function() {
-        this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
       },
       'dialysis_order.id': function() {
-        console.log(this.dialysis_order)
-        this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
+
+
+
         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 : this.dialysis_order.puncture_nurse
 
@@ -117,21 +146,90 @@
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         this.form.start_time = this.dialysis_order.id == 0 ? time : this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
+
+
+
+
+
+
+
+
       }
     },
     computed: {
-      zone_beds: function() {
-        var beds = []
-        for (let index = 0; index < this.device_numbers.length; index++) {
-          const device_number = this.device_numbers[index]
-          if (device_number.zone_id == this.schedule.partition_id) {
-            beds.push(device_number)
-          }
-        }
-        return beds
-      }
+      // zone_beds: function() {
+      //   var beds = []
+      //   for (let index = 0; index < this.device_numbers.length; index++) {
+      //     const device_number = this.device_numbers[index]
+      //     beds.push(device_number)
+      //   }
+      //   console.log(this.device_numbers)
+      //   return beds
+      // }
     },
     methods: {
+      changeSchedualType:function(schedual_type){
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = schedual_type
+        GetSchedualNumber(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            return false
+          } else {
+            this.temp_device_numbers = response.data.data.number
+            for (let index = 0; index < this.temp_device_numbers.length; index++) {
+              const device_number = this.temp_device_numbers[index]
+              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+            }
+            this.zone_beds = this.temp_device_numbers
+            this.form.bed_id = this.zone_beds[0].id
+
+          }
+        })
+
+      },
+      GetSchedualNumber:function(){
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = this.schedual_type
+        GetSchedualNumber(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.temp_device_numbers = response.data.data.number
+            for (let index = 0; index < this.temp_device_numbers.length; index++) {
+              const device_number = this.temp_device_numbers[index]
+              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+            }
+            this.zone_beds = this.temp_device_numbers
+
+            this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
+            if(this.dialysis_order.id == 0) {
+              let isFilter = true
+              for (let i = 0; i < this.zone_beds.length; i++) {
+                if(this.zone_beds[i].id == this.schedule.bed_id ){
+                  isFilter = false
+
+                }
+              }
+              if(isFilter){
+                this.form.bed_id = this.zone_beds[0].id
+              }
+            }else{
+              for (let i = 0; i < this.device_numbers.length; i++){
+                if (this.device_numbers[i].id == this.dialysis_order.bed_id){
+                  let obj = {}
+                  obj = this.device_numbers[i]
+                  if(obj['number'].indexOf(this.device_numbers[i]['zone_name']) == -1) {
+                    obj['number'] = this.device_numbers[i]['zone_name'] + "-" + this.device_numbers[i]['number']
+                  }
+                  this.zone_beds.unshift(obj)
+                  this.zone_beds.sort((a, b) => a.id -b.id)
+                }
+              }
+            }
+          }
+        })
+      },
       getTime(value, temp) {
         if (value != undefined) {
           return parseTime(value, temp)
@@ -159,13 +257,51 @@
             '-' +
             (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         }
+
+        if (this.dialysis_order.id == 0) {
+          let now = new Date()
+          let hour = now.getHours()
+          if (hour >= 6 && hour < 12){
+            this.schedual_type = 1
+
+          }else if(hour >= 12 && hour < 18){
+
+            this.schedual_type = 2
+
+
+          }else if(hour >= 18){
+            this.schedual_type = 3
+          }
+        } else {
+
+          this.schedual_type = this.dialysis_order.schedual_type
+        }
+
+
+        if (this.dialysis_order.id > 0) {
+          for (let i = 0; i < this.special_premission.length; i++) {
+            if (this.$store.getters.xt_user.user.id == this.special_premission[i].admin_user_id) {
+              this.isPremission = true
+            }
+          }
+        }
+
+        if (this.dialysis_order.id > 0) {
+          if (this.dialysis_order.creator == 0) {
+            this.creator = this.dialysis_order.start_nurse
+          } else {
+            this.creator = this.dialysis_order.creator
+          }
+        }
+
+        this.GetSchedualNumber()
       },
       hide: function() {
         this.visible = false
       },
       submit: function() {
         this.loading = true
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time,this.schedual_type).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -174,11 +310,41 @@
             for (const key in resp_dialysis_order) {
               this.$set(this_order, key, resp_dialysis_order[key])
             }
+            this.hide()
+            this.$emit('monitor',  resp.data.monitor)
+            this.$message.success("上机成功")
+
           } else {
             this.$message.error(resp.msg)
           }
         })
-      }
+      }, editOrder(){
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = this.schedual_type
+        ParamsQuery['id'] = this.dialysis_order.id
+        ParamsQuery['nurse'] = this.form.nurse_id
+        ParamsQuery['bed'] = this.form.bed_id
+        ParamsQuery['start_time'] =  this.form.start_time
+        ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
+        PostModifyStartDialysis(ParamsQuery).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.$message.success("修改成功")
+
+            var resp_dialysis_order = resp.data.dialysis_order
+            var this_order = this.dialysis_order
+            for (const key in resp_dialysis_order) {
+              this.$set(this_order, key, resp_dialysis_order[key])
+              this.$emit('assessmentAfterDislysis', resp.data.after)
+
+            }
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      },
+
     }
   }
 </script>

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

@@ -7,16 +7,17 @@
       :modal-append-to-body="false"
       :append-to-body="true"
     >
-      <el-button @click="handlePatientInfo">{{patient.name}}</el-button>
+      <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{patient.name}}</el-button>
 
       <el-form ref="dialysisPrescription" :model="dialysisPrescription" label-width="148px">
         <el-row :gutter="24">
           <el-col :span="8" v-if="isShows('透析模式')">
             <el-form-item label="透析模式">
-              <el-select v-model="dialysisPrescription.mode_id" @change="changePrescription(dialysisPrescription.mode_id)" >
+              <el-select v-model="dialysisPrescription.mode_id"
+                         @change="changePrescription(dialysisPrescription.mode_id)">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="item in treatment_mode" :label="item.name" :value="item.id"
-                           :key="item.id"></el-option>
+                <el-option v-for="(item,index) in treatment_mode" :label="item.name" :value="item.id"
+                           :key="index+1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -52,7 +53,7 @@
               <!-- <el-input type="number" v-model="dialysisPrescription.dialysate_formulation"></el-input> -->
               <el-select v-model="dialysisPrescription.dialysate_formulation" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="(option, index) in dialysate_formulation_options" :key="index" :label="option.name"
+                <el-option v-for="(option, index) in dialysate_formulation_options" :key="index+1" :label="option.name"
                            :value="option.id"></el-option>
               </el-select>
             </el-form-item>
@@ -69,11 +70,6 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
-            <el-form-item label="置换量(L)：">
-              <el-input type="number" v-model="dialysisPrescription.replacement_total"></el-input>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="8" v-if="isShows('抗凝剂')">
             <el-form-item label="抗凝剂：">
@@ -81,7 +77,7 @@
                          @change="changeThisAnticoagulant">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="item in anticoagulantsConfit" :label="item.name" :key="item.id"
+                <el-option v-for="(item,index) in anticoagulantsConfit" :label="item.name" :key="index + 1"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
@@ -90,22 +86,26 @@
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1&&isShows('首剂')">
             <el-form-item :label="'首剂('+anticoagulant.shouji_unit+') : '">
-              <el-input type="number" v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
-            </el-form-item>
-
+              <el-input type="number"  v-if="dialysisPrescription.anticoagulant != 1"  v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+              <el-input type="number" disabled   v-if="dialysisPrescription.anticoagulant == 1" v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
 
+            </el-form-item>
           </el-col>
 
+
           <el-col :span="8" v-if="anticoagulant.weichi != -1&&isShows('维持')">
             <el-form-item :label="'维持('+anticoagulant.weichi_unit+') : '" v-if="anticoagulant.weichi != -1">
-              <el-input type="number" v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"  v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"  v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="anticoagulant.zongliang != -1&&isShows('总量')">
             <el-form-item :label="'总量('+anticoagulant.zongliang_unit+') : '">
-              <el-input type="number" v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1" v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1" v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+
             </el-form-item>
           </el-col>
 
@@ -117,17 +117,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="anticoagulant.gaijiliang != -1&&isShows('钙剂量')">
-            <el-form-item label="钙剂量(ml/h) : ">
+            <el-form-item label="钙剂量(ml) : ">
               <el-input type="number" v-model="dialysisPrescription.anticoagulant_gaijiliang"
                         :disabled="anticoagulant.gaijiliang==1?false:true" placeholder="钙剂量"></el-input>
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
+            <el-form-item label="置换量(L)：">
+              <el-input type="number" v-model="dialysisPrescription.replacement_total"></el-input>
+            </el-form-item>
+          </el-col>
 
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
 
           <el-col :span="8" v-if="isShows('钾')">
             <el-form-item label="钾(mmol/L)： ">
@@ -149,9 +150,6 @@
           </el-col>
 
 
-          <!-- </el-row>
-
-          <el-row :gutter="20"> -->
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器：">
@@ -189,7 +187,7 @@
               >
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="item in body_fluid_option" :label="item.name" :key="item.id"
+                <el-option v-for="(item,index) in body_fluid_option" :label="item.name" :key="index+1"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
@@ -214,7 +212,7 @@
               >
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="item in special_medicine_option" :label="item.name" :key="item.id"
+                <el-option v-for="(item,index) in special_medicine_option" :label="item.name" :key="index+1"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
@@ -231,19 +229,21 @@
 
           <el-row :gutter="20" > -->
           <el-col :span="8">
-            <el-form-item label="置换液：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id != 6" v-show="huShow">
+            <el-form-item label="置换液：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id != 6"
+                          v-show="huShow">
               <el-select v-model="dialysisPrescription.displace_liqui_part" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
+                <el-option v-for="(option, index) in displace_liqui_part_option" :key="index+1"
                            :label="option.name" :value="option.id"></el-option>
               </el-select>
             </el-form-item>
 
 
-            <el-form-item label="置换方式：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id == 6">
+            <el-form-item label="置换方式："
+                          v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id == 6">
               <el-select v-model="dialysisPrescription.displace_liqui_part" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
+                <el-option v-for="(option, index) in displace_liqui_part_option" :key="index+1"
                            :label="option.name" :value="option.id"></el-option>
               </el-select>
             </el-form-item>
@@ -262,7 +262,7 @@
               <el-select v-model="dialysisPrescription.blood_access" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in blood_access_option" :key="index"
+                <el-option v-for="(option, index) in blood_access_option" :key="index+1"
                            :label="option.name" :value="option.id"></el-option>
               </el-select>
             </el-form-item>
@@ -289,7 +289,7 @@
             <el-form-item label="血液透析干粉：">
               <el-select v-model="dialysisPrescription.niprocart" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option v-for="(option, index) in niprocart_info" :key="index"
+                <el-option v-for="(option, index) in niprocart_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -301,7 +301,7 @@
               <el-select v-model="dialysisPrescription.jms" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in jms_info" :key="index"
+                <el-option v-for="(option, index) in jms_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -313,7 +313,7 @@
               <el-select v-model="dialysisPrescription.fistula_needle_set" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in fistula_needle_set_info" :key="index"
+                <el-option v-for="(option, index) in fistula_needle_set_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -325,7 +325,7 @@
               <el-select v-model="dialysisPrescription.fistula_needle_set_16" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in fistula_needle_set_16_info" :key="index"
+                <el-option v-for="(option, index) in fistula_needle_set_16_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -337,7 +337,7 @@
               <el-select v-model="dialysisPrescription.hemoperfusion" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in hemoperfusion_info" :key="index"
+                <el-option v-for="(option, index) in hemoperfusion_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -349,7 +349,7 @@
               <el-select v-model="dialysisPrescription.dialyser_sterilised" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in dialyser_sterilised_info" :key="index"
+                <el-option v-for="(option, index) in dialyser_sterilised_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -361,7 +361,7 @@
               <el-select v-model="dialysisPrescription.filtryzer" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in filtryzer_info" :key="index"
+                <el-option v-for="(option, index) in filtryzer_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -373,7 +373,7 @@
               <el-select v-model="dialysisPrescription.dialyzers" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in dialyzers_info" :key="index"
+                <el-option v-for="(option, index) in dialyzers_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -385,7 +385,7 @@
               <el-select v-model="dialysisPrescription.injector" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in injector_info" :key="index"
+                <el-option v-for="(option, index) in injector_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -397,7 +397,7 @@
               <el-select v-model="dialysisPrescription.bloodlines" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in bloodlines_info" :key="index"
+                <el-option v-for="(option, index) in bloodlines_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -409,7 +409,7 @@
               <el-select v-model="dialysisPrescription.tubing_hemodialysis" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in tubingHemodialysis_info" :key="index"
+                <el-option v-for="(option, index) in tubingHemodialysis_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -421,7 +421,7 @@
               <el-select v-model="dialysisPrescription.package" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in safe_package_info" :key="index"
+                <el-option v-for="(option, index) in safe_package_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -433,7 +433,7 @@
               <el-select v-model="dialysisPrescription.a_liquid" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="(option, index) in aliquid_info" :key="index"
+                <el-option v-for="(option, index) in aliquid_info" :key="index+1"
                            :label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>
               </el-select>
             </el-form-item>
@@ -469,7 +469,7 @@
     >
 
       <el-checkbox-group v-model="checkedCities">
-        <el-checkbox style="display:block;vertical-align: middle" v-for="(advice, index) in targetAdvices"
+        <el-checkbox  style="display: flex;align-items: center" v-for="(advice, index) in targetAdvices"
                      :label="advice.id"
                      :key="index"
                      :value="advice.id"
@@ -479,7 +479,7 @@
           <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div>
           <br/>
           <div style="padding-bottom: 10px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
-          <div style="padding-bottom: 10px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每日必推</div>
+          <div style="padding-bottom: 10px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每次必推</div>
           <div style="padding-bottom: 10px;padding-left: 10px" v-if="advice.frequency_type == 2"> 推送频率&nbsp;{{advice.day_count}}天/次</div>
           <div style="padding-bottom: 10px;padding-left: 10px" v-if="advice.frequency_type == 3"> 推送频率&nbsp;每周{{advice.week_day}}</div>
         </el-checkbox>
@@ -493,22 +493,70 @@
     </el-dialog>
 
 
+    <el-dialog
+      :title="patient.name"
+      :visible.sync="msgtip_visibility"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      width="30%"
+    >
+      <div class="newLine">
+        <span>本次透析日期</span>
+        <span>{{dialysis_date}}</span>
+      </div>
+      <div class="newLine">
+        <span>透前体重(kg)</span>
+        <span>{{ predialysis.weight_before }}</span>
+      </div>
+      <div class="newLine">
+        <span>干体重(kg)</span>
+        <span>{{ last_predialysis?last_predialysis.dry_weight:''}}</span>
+      </div>
+      <div class="newLine">
+        <span>衣物重(kg)</span>
+        <span>{{
+            predialysis.additional_weight
+          }}</span>
+      </div>
+      <div class="newLine">
+        <span>体重增加(kg)</span>
+        <span>{{ add_weight }}</span>
+      </div>
+      <div class="newLine">
+        <span>透后体重(kg)</span>
+        <span>{{ record.weight_after }}</span>
+      </div>
+      <div class="newLine">
+        <span>体重减少(kg)</span>
+        <span>{{ record.weight_loss }}</span>
+      </div>
+      <div class="newLine">
+        <span>上次透后体重(kg)</span>
+        <span>{{last_record?last_record.weight_after:''}}</span>
+      </div>
 
-
-
+      <span slot="footer" class="dialog-footer">
+            <el-button @click="cancleMsg()">取 消</el-button>
+            <el-button type="primary" @click="cancleMsg()">确 定</el-button>
+          </span>
+    </el-dialog>
 
   </div>
 
 </template>
 
 <script>
-  import { postPrescription, postSoulution, CreateGroupAdvice } from '@/api/dialysis'
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { uParseTime } from '@/utils/tools'
   import store from '@/store'
+  import MsgTip from './MsgTip'
+  import { calculateAnticoagulantZL} from '@/utils/tools'
 
   export default {
     name: 'dialysisPrescriptionDialog',
+    components: { MsgTip },
     props: {
       is_open: {
         type: Number,
@@ -627,6 +675,7 @@
         }
       },
 
+
       prescription: { // 透析处方
         type: Object,
         default: () => {
@@ -660,13 +709,49 @@
           return new Array()
         }
       },
-      zhiShow: false,
-      totalShow: false,
-      huShow: false
 
+      predialysis: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      last_predialysis: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      record: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      last_record: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      }, dry_weight: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+
+    },
+    computed: {
+      dialysis_date: function() {
+        return uParseTime(this.$route.query.date, '{y}/{m}/{d}')
+      }
     },
     data() {
       return {
+        zhiShow: false,
+        totalShow: false,
+        huShow: false,
+        showName:'',
         isShowRemindAdvice: false,
         checkedCities: [],
         isVisibility: false,
@@ -676,16 +761,19 @@
         record_date: '',
         time: '',
         treatment_mode: [],
+        timeValue: '',
         deviceList: [],
         replacement_ways: [],
         anticoagulantsConfit: {},
         dialysate_formulation_options: [],
-
+        add_weight:0,
         body_fluid_option: [],
         special_medicine_option: [],
         displace_liqui_part_option: [],
         blood_access_option: [],
         is_pre: 0,
+        msgtip_visibility: false,
+
         dialysisPrescription: {
           replacement_total: '',
           mode_id: '',
@@ -742,7 +830,15 @@
           bloodlines: '',
           tubing_hemodialysis: '',
           package: '',
-          a_liquid: ''
+          a_liquid: '',
+
+
+          no_anticoagulant_shouji: '0',
+          no_anticoagulant_weichi: '0',
+          no_anticoagulant_zongliang: '0',
+
+
+
         },
 
         anticoagulant: {
@@ -766,6 +862,10 @@
       }
     },
     methods: {
+      menuMsgTip: function() {
+        this.msgtip_visibility = false
+        this.isVisibility = true
+      },
       handleAdviceCommit() {
         let results = []
         for (let i = 0; i < this.targetAdvices.length; i++) {
@@ -1781,22 +1881,67 @@
               val.child[i]['single'] = ''
             }
             name = name + '▲' + val.child[i].advice_name + '' +
-            val.child[i].advice_desc +
-            val.child[i].drug_spec_unit +
-            val.child[i].presc +
-            val.child[i].single
+              val.child[i].advice_desc +
+              val.child[i].drug_spec_unit +
+              val.child[i].presc +
+              val.child[i].single
           }
           return val.advice_name + '  ' + advice_desc + ' ' +
-          val.drug_spec_unit +
-          prescribing_number +
-          ' ' + single_dose + ' ' + ' ' + val.delivery_way + ' ' + val.execution_frequency + val.remark + name
+            val.drug_spec_unit +
+            prescribing_number +
+            ' ' + single_dose + ' ' + ' ' + val.delivery_way + ' ' + val.execution_frequency + val.remark + name
         } else {
           return val.advice_name + '  ' + advice_desc +
-          prescribing_number +
-          ' ' + single_dose + ' ' + ' ' + val.delivery_way + ' ' + val.execution_frequency + val.remark
+            prescribing_number +
+            ' ' + single_dose + ' ' + ' ' + val.delivery_way + ' ' + val.execution_frequency + val.remark
         }
       },
       changePrescription(id) {
+
+        let ParamsQuery = {}
+        ParamsQuery['patient_id'] = this.$route.query.patient_id
+        ParamsQuery['mode_id'] = id
+        GetSolution(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.$message.success('切换成功')
+            if (response.data.data.solution != null) {
+              for (const key in response.data.data.solution) { //长期处方不为空
+                if (key != 'target_ultrafiltration') {
+                  this.dialysisPrescription[key] = response.data.data.solution[key]
+                }
+              }
+            } else {
+              if (response.data.data.prescription != null) {  //临时处方不为空
+                for (const key in response.data.data.prescription) {
+                  if (key != 'target_ultrafiltration') {
+                    this.dialysisPrescription[key] = response.data.data.prescription[key]
+                  }
+                }
+              } else {
+                for (const key in this.dialysisPrescription) { //临时处方为空
+                  if (key != 'target_ultrafiltration') {
+                    this.dialysisPrescription[key] = ''
+                  }
+                }
+                this.dialysisPrescription.mode_id = id
+              }
+            }
+          }
+
+          if (this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
+            this.timeValue = ''
+            this.time = '03:00'
+
+          } else {
+
+            this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
+            this.time = (this.dialysisPrescription.dialysis_duration_hour > 10 ? this.dialysisPrescription.dialysis_duration_hour : '0' + this.dialysisPrescription.dialysis_duration_hour) + ':' + (this.dialysisPrescription.dialysis_duration_minute > 10 ? this.dialysisPrescription.dialysis_duration_minute : '0' + this.dialysisPrescription.dialysis_duration_minute)
+          }
+        })
+
         if (id === 1 || id === 3 || id === 4 || id === 6 || id === 7 || id === 8 || id === 9 || id === 10 || id === 11 || id === 13 || id === 14 || id === 15 || id === 16) {
           this.zhiShow = false
           this.huShow = false
@@ -1806,14 +1951,26 @@
           this.huShow = true
           this.totalShow = true
         }
-      },handlePatientInfo(){
-
-
-
+      }, handlePatientInfo() {
+        this.isVisibility = false
+        this.msgtip_visibility = true
+      },cancleMsg(){
 
+        this.isVisibility = true
+        this.msgtip_visibility = false
       }
     },
     created() {
+
+
+      if (
+        this.predialysis.weight_before > 0 &&
+        this.last_record.weight_after > 0
+      ) {
+        this.add_weight = parseFloat(
+          this.predialysis.weight_before - this.last_record.weight_after
+        ).toFixed(2)
+      }
       this.treatment_mode = this.$store.getters.treatment_mode
       this.perfusion_apparatus = getDataConfig('hemodialysis', 'perfusion_apparatus')
       this.replacement_ways = getDataConfig('hemodialysis', 'replacement_ways')
@@ -1830,10 +1987,137 @@
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
     },
     watch: {
-      isVisibility(val) {
+      "dialysisPrescription.dialysis_duration_hour":function(){
+        let  dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+
+        if (this.dialysisPrescription.dialysis_duration_minute == ''){
+          dialysis_duration_minute = 0
+        }else{
+          dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
+        }
+
+        if (this.dialysisPrescription.dialysis_duration_hour == ''){
+          dialysis_duration_hour = 0
+
+        }else{
+
+          dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
+
+        }
+        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+
+
+
+
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
+      },
+      "dialysisPrescription.dialysis_duration_minute":function(){
+        let  dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+
+        if (this.dialysisPrescription.dialysis_duration_minute == ''){
+          dialysis_duration_minute = 0
+        }else{
+          dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
+        }
+
+        if (this.dialysisPrescription.dialysis_duration_hour == ''){
+          dialysis_duration_hour = 0
+
+        }else{
+
+          dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
+
+        }
+        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+
+
 
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
       },
-      'prescription.id': function() {
+      "dialysisPrescription.anticoagulant_shouji":function(){
+
+        let  dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+
+        if (this.dialysisPrescription.dialysis_duration_minute == ''){
+          dialysis_duration_minute = 0
+        }else{
+          dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
+        }
+
+        if (this.dialysisPrescription.dialysis_duration_hour == ''){
+          dialysis_duration_hour = 0
+
+        }else{
+
+          dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
+
+        }
+        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+
+
+        console.log(duration)
+
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
+      },
+      "dialysisPrescription.anticoagulant_weichi":function(){
+        let  dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+
+        if (this.dialysisPrescription.dialysis_duration_minute == ''){
+          dialysis_duration_minute = 0
+        }else{
+          dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
+        }
+
+        if (this.dialysisPrescription.dialysis_duration_hour == ''){
+          dialysis_duration_hour = 0
+
+        }else{
+
+          dialysis_duration_hour = this.dialysisPrescription.dialysis_duration_hour
+
+        }
+        duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
+
+        console.log(duration)
+
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+          this.dialysisPrescription.anticoagulant_zongliang = ''
+        }
+      }, 'prescription.id': function() {
         if (this.prescription.id > 0) {
           for (var index in this.dialysisPrescription) {
             this.dialysisPrescription[index] = this.prescription[index]
@@ -2073,9 +2357,18 @@
 
 </script>
 
-<style scoped>
+<style rel="stylesheet/scss" lang="scss" scoped>
   .el-checkbox, .el-checkbox__input {
     vertical-align: middle;
   }
 
+
+  .newLine {
+    display: flex;
+    justify-content: space-between;
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+  }
+
 </style>

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

@@ -43,6 +43,16 @@
       </el-form-item>
     </el-form>
 
+    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form-item label="核对时间 : ">
+        <el-time-picker
+          v-model="time"
+          format='HH:mm'
+          value-format="HH:mm"
+          placeholder="请输入核对时间">
+        </el-time-picker>
+      </el-form-item>
+    </el-form>
 
 
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
@@ -51,7 +61,6 @@
     </el-form>
 
 
-
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
       <el-button type="primary" @click="handleComfirm">保 存</el-button>
@@ -62,134 +71,286 @@
 </template>
 
 <script>
-  import {postDoubleCheck} from "@/api/dialysis";
-  import {uParseTime} from "@/utils/tools";
+  import { postDoubleCheck } from '@/api/dialysis'
+  import { uParseTime } from '@/utils/tools'
 
   export default {
-    name: "doubleCheckDialog",
+    name: 'doubleCheckDialog',
     data() {
       return {
         isVisibility: false,
-
+        time:'',
         isClose: false,
         doubleReview: {
-          dialysis_item_check: "1",
-          dialysis_parameter_check: "1",
-          vascular_access_verification: "1",
-          pipeline_connection_check: "1",
-          dialysis_item_desc: "",
-          dialysis_parameter_desc: "",
-          vascular_access_desc: "",
-          pipeline_connection_desc: "",
-          collator: "",
+          dialysis_item_check: '1',
+          dialysis_parameter_check: '1',
+          vascular_access_verification: '1',
+          pipeline_connection_check: '1',
+          dialysis_item_desc: '',
+          dialysis_parameter_desc: '',
+          vascular_access_desc: '',
+          pipeline_connection_desc: '',
+          collator: '',
 
           creater: 0,
           modifier: 0,
           created_time: 0,
           updated_time: 0,
+          check_time: 0,
+          first_check_time: 0
         },
 
-        record_date: ""
-      };
+        record_date: ''
+      }
     }, methods: {
       show() {
-        this.isVisibility = true;
+        this.isVisibility = true
+
+
+
+
       },
       hide() {
-        this.isVisibility = false;
+        this.isVisibility = false
       },
-      handleCancle: function () {
-        this.isVisibility = false;
+      handleCancle: function() {
+        this.isVisibility = false
 
-      }, handleComfirm: function () {
+      }, handleComfirm: function() {
 
         if (this.patient.id <= 0) {
-          this.$message.error("没有选择患者")
+          this.$message.error('没有选择患者')
           return
         }
 
-        let ParamsQuery = this.doubleReview;
-        ParamsQuery["patient"] = this.patient.id;
-        ParamsQuery["record_date"] = this.record_date;
+        let ParamsQuery = this.doubleReview
+        ParamsQuery['patient'] = this.patient.id
+        ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['check_time'] = this.record_date +" "+ this.time
+
         postDoubleCheck(ParamsQuery).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.$notify({
-              title: "成功",
-              message: "提交成功",
-              type: "success",
+              title: '成功',
+              message: '提交成功',
+              type: 'success',
               duration: 2000
-            });
-            this.doubleReview.created_time =   response.data.data.doubleCheck.created_time
-            this.doubleReview.creater =  response.data.data.doubleCheck.creater
-            this.doubleReview.updated_time =  response.data.data.doubleCheck.updated_time
-            this.doubleReview.modifier =   response.data.data.doubleCheck.modifier
+            })
+
+            this.doubleReview.creater = response.data.data.doubleCheck.creater;
+            this.doubleReview.check_time =
+              response.data.data.doubleCheck.check_time;
+            this.doubleReview.first_check_time =
+              response.data.data.doubleCheck.first_check_time;
+            this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
 
 
-            let doublecheck_resp = response.data.data.doubleCheck;
-            var doubleCheck = this.double_check;
+            let doublecheck_resp = response.data.data.doubleCheck
+            var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {
               // doubleCheck[index] = doublecheck_resp[index];
               this.$set(doubleCheck, index, doublecheck_resp[index])
             }
             this.hide()
           }
-        });
+        })
 
-      }, getFirstCheckDesc: function () {
-        let time = uParseTime(this.doubleReview.created_time, "{y}-{m}-{d}  {h}:{i}")
-        if (this.doubleReview.creater <= 0) {
-          return "";
-        }
+      },
+      getFirstCheckDesc: function() {
+        if (
+          this.doubleReview.first_check_time > 0 &&
+          this.doubleReview.check_time > 0
+        ) {
+          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
+            let time = uParseTime(
+              this.doubleReview.first_check_time,
+              "{y}-{m}-{d}  {h}:{i}"
+            );
+            if (this.doubleReview.creater <= 0) {
+              return "";
+            }
 
-        var desc = "";
-        if (this.admin_users == null || typeof this.admin_users == "undefined") {
-          return "";
-        }
+            var desc = "";
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == "undefined"
+            ) {
+              return "";
+            }
 
-        var leng = this.admin_users.length;
-        if (leng == 0) {
-          return "";
-        }
+            var leng = this.admin_users.length;
+            if (leng == 0) {
+              return "";
+            }
+
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.creater) {
+                let name = this.admin_users[index].name;
+                desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+
+                break;
+              }
+            }
+            return desc;
+          } else {
+            let time = uParseTime(
+              this.doubleReview.check_time,
+              "{y}-{m}-{d}  {h}:{i}"
+            );
+            if (this.doubleReview.modifier <= 0) {
+              return "";
+            }
+
+            var desc = "";
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == "undefined"
+            ) {
+              return "";
+            }
+
+            var leng = this.admin_users.length;
+            if (leng == 0) {
+              return "";
+            }
+
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.modifier) {
+                let name = this.admin_users[index].name;
+                desc = "首次核对人员:" + name + " 首次核对时间:" + time;
 
-        for (let index = 0; index < leng; index++) {
-          if (this.admin_users[index].id == this.doubleReview.creater) {
-            let name = this.admin_users[index].name;
-            desc = "首次核对人员:"+name +"  首次核对时间:"+time
-            break;
+                break;
+              }
+            }
+            return desc;
+          }
+        } else {
+          let time = uParseTime(
+            this.doubleReview.first_check_time,
+            "{y}-{m}-{d}  {h}:{i}"
+          );
+          if (this.doubleReview.creater <= 0) {
+            return "";
           }
-        }
-        return desc;
 
-      }, getScondCheckDesc: function () {
+          var desc = "";
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == "undefined"
+          ) {
+            return "";
+          }
 
-        let time = uParseTime(this.doubleReview.updated_time, "{y}-{m}-{d} {h}:{i}")
-        if (this.doubleReview.modifier <= 0) {
-          return "";
-        }
-        var desc = "";
-        if (this.admin_users == null || typeof this.admin_users.length == "undefined") {
-          return desc;
-        }
-        var leng = this.admin_users.length;
-        if (leng == 0) {
+          var leng = this.admin_users.length;
+          if (leng == 0) {
+            return "";
+          }
+
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.creater) {
+              let name = this.admin_users[index].name;
+              desc = "首次核对人员:" + name + " 首次核对时间:" + time;
+
+              break;
+            }
+          }
           return desc;
         }
-        for (let index = 0; index < leng; index++) {
-          if (this.admin_users[index].id == this.doubleReview.modifier) {
-            let name = this.admin_users[index].name;
-            desc = "第二次核对人员:"+name +"  第二次核对时间:"+time
-            break;
+      },
+      getScondCheckDesc: function() {
+        if (
+          this.doubleReview.first_check_time > 0 &&
+          this.doubleReview.check_time > 0
+        ) {
+          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
+            let time = uParseTime(
+              this.doubleReview.check_time,
+              "{y}-{m}-{d} {h}:{i}"
+            );
+            if (this.doubleReview.modifier <= 0) {
+              return "";
+            }
+            var desc = "";
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == "undefined"
+            ) {
+              return desc;
+            }
+            var leng = this.admin_users.length;
+            if (leng == 0) {
+              return desc;
+            }
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.modifier) {
+                let name = this.admin_users[index].name;
+                desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+                break;
+              }
+            }
+            return desc;
+          } else {
+            let time = uParseTime(
+              this.doubleReview.first_check_time,
+              "{y}-{m}-{d} {h}:{i}"
+            );
+            if (this.doubleReview.creater <= 0) {
+              return "";
+            }
+            var desc = "";
+            if (
+              this.admin_users == null ||
+              typeof this.admin_users.length == "undefined"
+            ) {
+              return desc;
+            }
+            var leng = this.admin_users.length;
+            if (leng == 0) {
+              return desc;
+            }
+            for (let index = 0; index < leng; index++) {
+              if (this.admin_users[index].id == this.doubleReview.creater) {
+                let name = this.admin_users[index].name;
+                desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+                break;
+              }
+            }
+            return desc;
+          }
+        } else {
+          let time = uParseTime(
+            this.doubleReview.check_time,
+            "{y}-{m}-{d} {h}:{i}"
+          );
+          if (this.doubleReview.modifier <= 0) {
+            return "";
           }
+          var desc = "";
+          if (
+            this.admin_users == null ||
+            typeof this.admin_users.length == "undefined"
+          ) {
+            return desc;
+          }
+          var leng = this.admin_users.length;
+          if (leng == 0) {
+            return desc;
+          }
+          for (let index = 0; index < leng; index++) {
+            if (this.admin_users[index].id == this.doubleReview.modifier) {
+              let name = this.admin_users[index].name;
+              desc = "第二次核对人员:" + name + " 第二次核对时间:" + time;
+              break;
+            }
+          }
+          return desc;
         }
-        return desc;
-
-      }
-
-
+      },
     },
+
     props: {
       admin_users: { //系统用户列表
         type: Array,
@@ -201,49 +362,72 @@
       double_check: { // 双人核对
         type: Object,
         default: () => {
-          return {id: 0}
+          return { id: 0 }
         }
       },
       patient: { // 患者信息
         type: Object,
         default: () => {
-          return {id: 0}
+          return { id: 0 }
         }
-      },
+      }
 
     },
     watch: {
       isVisibility(val) {
 
-      }, "double_check.id": function () {
+      }, 'double_check.id': function() {
         if (this.double_check.id > 0) {
           for (var index in this.doubleReview) {
-            this.doubleReview[index] = this.double_check[index] + "";
+            this.doubleReview[index] = this.double_check[index] + ''
           }
-          this.doubleReview.created_time =   this.double_check['created_time']
-          this.doubleReview.creater =  this.double_check['creater']
-          this.doubleReview.updated_time =  this.double_check['updated_time']
-          this.doubleReview.modifier =   this.double_check['modifier']
+          this.doubleReview.created_time = this.double_check['created_time']
+          this.doubleReview.creater = this.double_check['creater']
+          this.doubleReview.updated_time = this.double_check['updated_time']
+          this.doubleReview.modifier = this.double_check['modifier']
 
 
-          console.log( this.doubleReview)
+          this.doubleReview.dialysis_item_desc = this.double_check['dialysis_item_desc'];
+          this.doubleReview.dialysis_parameter_desc = this.double_check['dialysis_parameter_desc'];
+          this.doubleReview.vascular_access_desc = this.double_check['vascular_access_desc'];
+          this.doubleReview.pipeline_connection_desc = this.double_check['pipeline_connection_desc'];
 
 
+          this.doubleReview.created_time =this.double_check['created_time']
+          this.doubleReview.creater =this.double_check['creater']
+          this.doubleReview.updated_time = this.double_check['updated_time']
+          this.doubleReview.modifier = this.double_check['modifier']
+          this.doubleReview.check_time = this.double_check['check_time']
+          this.doubleReview.first_check_time =  this.double_check['first_check_time']
 
         } else {
-          this.dialysis_item_check = "1"
-          this.dialysis_parameter_check = "1"
-          this.vascular_access_verification = "1"
-          this.pipeline_connection_check = "1"
-
+          this.dialysis_item_check = '1'
+          this.dialysis_parameter_check = '1'
+          this.vascular_access_verification = '1'
+          this.pipeline_connection_check = '1'
+
+          this.doubleReview.dialysis_item_desc = "";
+          this.doubleReview.dialysis_parameter_desc = "";
+          this.doubleReview.vascular_access_desc = "";
+          this.doubleReview.pipeline_connection_desc = "";
         }
-      },
+      }
 
     },
     created() {
-      var date = this.$route.query && this.$route.query.date;
-      this.record_date = uParseTime(date, '{y}-{m}-{d}');
-    },
+      var date = this.$route.query && this.$route.query.date
+      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      var nowHours = nowDate.getHours()
+      var nowMinutes = nowDate.getMinutes()
+      var time =  (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
+      this.time = time
+
+    }
 
   }
 </script>

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

@@ -1,124 +1,201 @@
 <template>
-    <div>
-        <el-dialog title="透析下机" :visible.sync="visible" width="854px" :modal-append-to-body="false" >
-            <div class="txsj">
-            </div>
-            <el-form :model="form" label-width="80px">
-                <el-form-item label="下机护士">
-                    <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0 && dialysis_order.stage == 1)">
-                        <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
-                    </el-select>
-                </el-form-item>
-
-              <el-form-item label="下机时间 :"  style="width:275px">
-                <el-date-picker
-                  type="datetime"
-                  format="yyyy-MM-dd HH"
-                  value-format="yyyy-MM-dd HH"
-                  placeholder="选择时间"
-                  v-model="start_time"
-                  style="width:100%;"
-                ></el-date-picker>
-              </el-form-item>
-
-                <el-form-item>
-                    <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit" :loading="loading" type="primary">执行下机</el-button>
-                    <el-button v-else-if="(dialysis_order.id != 0 && dialysis_order.stage == 2)" :disabled="true" type="info">已下机</el-button>
-                    <el-button v-else :disabled="true" type="info">未上机</el-button>
-                </el-form-item>
-
-            </el-form>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog title="透析下机" :visible.sync="visible" width="854px" :modal-append-to-body="false">
+      <div class="txsj">
+      </div>
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="下机护士">
+          <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
+            <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="下机时间 :" style="width:275px">
+          <el-date-picker
+            type="datetime"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
+            placeholder="选择时间"
+            v-model="end_time"
+            style="width:100%;"
+          ></el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit" :loading="loading"
+                     type="primary">执行下机
+          </el-button>
+          <!--<el-button v-else-if="(dialysis_order.id != 0 && dialysis_order.stage == 2)" :disabled="true" type="info">-->
+            <!--已下机-->
+          <!--</el-button>-->
+          <!--<el-button v-else :disabled="true" type="info">未上机</el-button>-->
+          <el-button
+            v-if="dialysis_order.stage == 2 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            type="primary" @click="modifyFinish">修改下机
+          </el-button>
+
+
+        </el-form-item>
+
+      </el-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { finishDialysis } from "@/api/dialysis_record"
-import { parseTime } from "@/utils"
+  import { finishDialysis,PostModifyFinishDialysis } from '@/api/dialysis_record'
+  import { parseTime } from '@/utils'
 
-export default {
-    name: "FinishDialog",
+  export default {
+    name: 'FinishDialog',
     data() {
-        return {
-            visible: false,
-            loading: false,
+      return {
+        visible: false,
+        loading: false,
+        creator: 0,
+        patient_id: 0,
+        schedule_date: 0,
+        isPremission:false,
+        end_time: '',
 
-            patient_id: 0,
-            schedule_date: 0,
-            start_time: '',
-
-            form: {
-                nurse_id: 0,
-            }
+        form: {
+          nurse_id: 0
         }
+      }
     },
     props: {
-        dialysis_order: {
-            type: Object,
-        },
-        schedule: {
-            type: Object,
-        },
-        admins: {
-            type: Array,
-        },
+      dialysis_order: {
+        type: Object
+      },
+      schedule: {
+        type: Object
+      },
+      admins: {
+        type: Array
+      }, special_premission: {
+        type: Array,
+      },
     },
     created() {
+
+    },
+    watch: {
+      'dialysis_order.id': function() {
+        if (this.dialysis_order.id == 0) {
+          this.form.nurse_id = 0
+        } else if (this.dialysis_order.stage == 1) {
+          this.form.nurse_id = this.$store.getters.xt_user.user.id
+        } else {
+          this.form.nurse_id = this.dialysis_order.finish_nurse
+        }
+      }
+    },
+    methods: {
+      show: function() {
+        this.visible = true
+        var nowDate = new Date()
+        var nowYear = nowDate.getFullYear()
+        var nowMonth = nowDate.getMonth() + 1
+        var nowDay = nowDate.getDate()
+        var nowHours = nowDate.getHours()
+        var nowMinutes = nowDate.getMinutes()
+        var time =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         this.patient_id = this.$route.query.patient_id
         this.schedule_date = this.$route.query.date
+        console.log(this.dialysis_order.end_time)
+
+        this.end_time = this.dialysis_order.finish_creator == 0 ? time : this.getTime(this.dialysis_order.end_time, '{y}-{m}-{d} {h}:{i}')
 
         if (this.dialysis_order.id == 0) {
-            this.form.nurse_id = 0
+          this.form.nurse_id = 0
         } else if (this.dialysis_order.stage == 1) {
-            this.form.nurse_id = this.$store.getters.xt_user.user.id
+          this.form.nurse_id = this.$store.getters.xt_user.user.id
         } else {
-            this.form.nurse_id = this.dialysis_order.finish_nurse
+          this.form.nurse_id = this.dialysis_order.finish_nurse
         }
-    },
-    watch: {
-        "dialysis_order.id": function() {
-            if (this.dialysis_order.id == 0) {
-                this.form.nurse_id = 0
-            } else if (this.dialysis_order.stage == 1) {
-                this.form.nurse_id = this.$store.getters.xt_user.user.id
-            } else {
-                this.form.nurse_id = this.dialysis_order.finish_nurse
+
+
+        if (this.dialysis_order.finish_creator > 0) {
+          for (let i = 0; i < this.special_premission.length; i++) {
+            if (this.$store.getters.xt_user.user.id == this.special_premission[i].admin_user_id) {
+              this.isPremission = true
             }
-        },
-    },
-    methods: {
-        show: function() {
-            this.visible = true
-        },
-        hide: function() {
-            this.visible = false
-        },
-        submit: function() {
-            this.loading = true
-            finishDialysis(this.patient_id, parseTime(this.schedule_date, "{y}-{m}-{d}"), this.form.nurse_id).then(rs => {
-                this.loading = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    var dialysis_order = resp.data.dialysis_order
-                    var this_order = this.dialysis_order
-                    for (const key in dialysis_order) {
-                        // this.dialysis_order[key] = dialysis_order[key]
-                        this.$set(this_order, key, dialysis_order[key])
-                    }
-
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            })
-        },
-    },
-}
+          }
+        }
+
+        if (this.dialysis_order.finish_creator > 0) {
+            this.creator = this.dialysis_order.finish_creator
+        }
+
+
+        console.log(this.creator)
+        console.log(this.isPremission)
+
+
+
+      },
+      hide: function() {
+        this.visible = false
+      },modifyFinish:function(){
+        let ParamsQuery = {};
+        ParamsQuery["id"] = this.dialysis_order.id;
+        ParamsQuery["nurse"] = this.form.nurse_id;
+        ParamsQuery["end_time"] = this.end_time;
+        PostModifyFinishDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+
+            return false;
+          } else {
+            this.$message.success("修改成功")
+            var record = this.dialysis_order;
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key]);
+            }
+            console.log(response.data.data.after)
+            this.$emit('assessmentAfterDislysis', response.data.data.after)
+          }
+        });
+
+
+      },
+      submit: function() {
+        this.loading = true
+        finishDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.end_time, this.form.nurse_id).then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            var dialysis_order = resp.data.dialysis_order
+            var this_order = this.dialysis_order
+            for (const key in dialysis_order) {
+              this.$set(this_order, key, dialysis_order[key])
+            }
+            this.hide()
+            this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      }, getTime(value, temp) {
+        if (value != undefined) {
+          return parseTime(value, temp)
+        }
+        return ''
+      }
+    }
+  }
 </script>
 
 
 <style scoped>
-.txsj{
+  .txsj {
     text-align: center;
     margin-bottom: 20px;
-}
+  }
 </style>

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

@@ -317,7 +317,7 @@
 <script>
   import { parseTime } from '@/utils'
   import { getDataConfig } from '@/utils/data'
-  import { editMonitor, postDelMonitorInfo } from '@/api/dialysis_record'
+  import { editMonitor, postDelMonitorInfo,getTodayMonitor } from '@/api/dialysis_record'
   import store from '@/store'
 
 export default {
@@ -331,7 +331,7 @@ export default {
         patient_id: 0,
         schedule_date: 0,
         template_id: 0,
-
+        isAdd:false,
         // monitoring_date: 0,
 
         form: {
@@ -421,7 +421,45 @@ export default {
         this.setEditMonitor(null)
         this.$refs.table.setCurrentRow(null)
         this.edit = true
+        this.isAdd = true
+        this.getLastRecordTody()
+
+      },
+      getLastRecordTody () {
+        let params = {
+          patient_id: this.patient_id
+        }
+
+        getTodayMonitor(params).then(rs => {
+          var resp = rs.data.data
+          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.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
+          this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
+          this.form.venous_pressure = '' // this.last_monitor_record.venous_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 = 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.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
+          this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
+          this.form.conductivity = ''
+          this.form.displacement_flow_quantity = ''
+
+          this.form.ktv = '' // this.last_monitor_record.ktv;
+          this.form.symptom = '' // this.last_monitor_record.symptom;
+          this.form.dispose = '' // this.last_monitor_record.dispose;
+          this.form.result = '' // this.last_monitor_record.result;
+
+
+        })
       },
+
       modifyRecordAction: function() {
         if (this.table_current_row == null) {
           this.$message.error('请选择一条监测记录')
@@ -430,6 +468,7 @@ export default {
         this.setEditMonitor(this.table_current_row)
         this.$refs.table.setCurrentRow(null)
         this.edit = true
+        this.isAdd = false
       },
       cancelEditAction: function() {
         this.setEditMonitor(null)
@@ -507,7 +546,7 @@ export default {
 
       submitAction: function() {
         // TODO loading
-        var is_new = this.form.id == 0
+        var is_new = this.form.id
         this.form.operate_time = parseInt(this.form.operate_time / 1000)
         this.form.systolic_bp = parseFloat(this.form.systolic_bp) == NaN ? 0 : parseFloat(this.form.systolic_bp)
         this.form.diastolic_bp = parseFloat(this.form.diastolic_bp) == NaN ? 0 : parseFloat(this.form.diastolic_bp)
@@ -534,7 +573,8 @@ export default {
           var resp = rs.data
           if (resp.state == 1) {
             var monitor = resp.data.monitor
-            if (is_new) {
+
+            if (this.isAdd) {
               this.monitors.unshift(monitor)
             } else {
               for (let index = 0; index < this.monitors.length; index++) {
@@ -589,6 +629,9 @@ export default {
           this.result_selecteds = []
         }
       },
+      setRecords (records) {
+        this.monitors = records
+      },
       resultSelectorChange: function() {
         if (this.result_selecteds.length > 0) {
           this.form.result = this.result_selecteds.join(',') + ','

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -1,4 +1,4 @@
-<template>
+ <template>
   <div class="plate-box">
     <h2 class="DetailsTit"><span>{{ title }}</span></h2>
     <div class="plate " >

src/xt_pages/dialysis/details/index.vue

@@ -8,6 +8,7 @@
     </div>
     <div class="details-bg" v-loading.fullscreen.lock="loading">
       <nav-igation
+        ref="nav"
         title="弹窗导航"
         @advice="adviceFunc"
         :patient="patient"
@@ -45,6 +46,16 @@
         :longAdvices="longAdvices"
         :waitUploadAdvices="waitUploadAdvices"
         :is_open="is_open"
+        :last_predialysis_evaluation = "lastPredialysisEvaluation"
+        :last_monitor_record = "lastMonitorRecord"
+        :last_assessment_after_dislysis = "lastAssessmentAfterDislysis"
+        :last_dialysis_prescribe = "lastDialysisPrescribe"
+        :last_dryWeight_dislysis = "lastDryWeightDislysis"
+        :special_premission = "headNurses"
+        @assessmentAfterDislysis="assessmentAfterDislysisFunc"
+
+
+
       >
       </nav-igation>
 
@@ -322,7 +333,15 @@
         tubingHemodialysis_info: [],
         safe_package_info: [],
         aliquid_info: [],
-        config: {}
+        config: {},
+
+        lastPredialysisEvaluation:{id: 0},
+        lastMonitorRecord:{id: 0},
+        lastAssessmentAfterDislysis:{id: 0},
+        lastDryWeightDislysis:{id: 0},
+        headNurses:[],
+        lastDialysisPrescribe:{id:0}
+
       }
     },
     created() {
@@ -358,7 +377,7 @@
 
         steps[4].finish = this.double_check.id > 0 && this.double_check.creater > 0 && this.double_check.modifier > 0
         steps[6].finish = this.monitor_records.length > 0
-        steps[8].finish = this.assessment_after_dislysis.id > 0
+        steps[8].finish = this.assessment_after_dislysis.id > 0 && this.assessment_after_dislysis.creater > 0
         steps[9].finish = this.treatment_summary.id > 0
 
         return steps
@@ -428,6 +447,10 @@
           this.loading = false
         })
 
+      },assessmentAfterDislysisFunc:function(val){
+        for (var index in val) {
+          this.$set(this.assessment_after_dislysis, index, val[index])
+        }
       },
       didDelMonitor(record_id) {
         var mrl = this.monitor_records.length
@@ -446,14 +469,11 @@
           var resp = rs.data
           if (resp.state == 1) {
             var patient = resp.data.patient // 患者信息
-            console.log('patient是史森明', patient)
             var schedual = resp.data.schedual // 患者排班信息
             var prescription = resp.data.prescription // 透析处方
-            console.log('prescription', prescription)
             var solution = resp.data.solution // 透析方案
             var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
             var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-            console.log('predialysis_evaluation', predialysis_evaluation)
             var doctor_advices = resp.data.doctor_advices // 临时医嘱
             var double_check = resp.data.double_check // 双人核对
             var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
@@ -475,7 +495,30 @@
             var safe_package_info = resp.data.safe_package_info
             var aliquid_info = resp.data.aliquid_info
 
+
+            var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
+            var lastMonitorRecord = resp.data.lastMonitorRecord
+            var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
+            var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
+            var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
+
+
+            this.$refs.nav.setLastRecord(lastPredialysisEvaluation,lastMonitorRecord,lastAssessmentAfterDislysis,lastDialysisPrescribe,lastDryWeightDislysis)
+
+
+
+
+            var headNurses = resp.data.headNurse
+
+
             var config = resp.data.config
+            this.lastPredialysisEvaluation = lastPredialysisEvaluation
+            this.lastMonitorRecord = lastMonitorRecord
+            this.lastAssessmentAfterDislysis = lastAssessmentAfterDislysis
+            this.lastDialysisPrescribe = lastDialysisPrescribe
+            this.lastDryWeightDislysis = lastDryWeightDislysis
+            this.headNurses = headNurses
+
 
             this.niprocart_info = niprocart_info
             this.jms_info = jms_info

src/xt_pages/dialysis/dialysisPage.vue

@@ -3446,7 +3446,10 @@ import { getDataConfig } from '@/utils/data'
       },
       // 医嘱相关
       getAdviceConfig() {
-        getAdviceConfig().then(response => {
+        let params = { //医嘱类型 0临时医嘱模版   1长期医嘱模版
+          type: 0
+        }
+        getAdviceConfig(params.type).then(response => {
           if (response.data.state == 1) {
             this.deliveryWayOptions = response.data.data.drugways
             this.executionFrequencyOptions = response.data.data.efs

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -21,27 +21,27 @@
         </div>
         <div class="inline_block">
           门诊：
-            <div class="under_line" style="width: 30px;text-align: center;">
-                <check-box  :checked="patientInfo_source_1 "></check-box>
-            </div>
+          <div class="under_line" style="width: 30px;text-align: center;">
+            <check-box  :checked="patientInfo_source_1 "></check-box>
+          </div>
         </div>
         <div class="inline_block">
           病区：
-            <div class="under_line" style="width: 50px;text-align: center;">
-                {{'/'}}
-            </div>
+          <div class="under_line" style="width: 50px;text-align: center;">
+            {{'/'}}
+          </div>
         </div>
         <div class="inline_block">
           床号：
-            <div class="under_line" style="width: 50px;text-align: center;">
-                {{'/'}}
-            </div>
+          <div class="under_line" style="width: 50px;text-align: center;">
+            {{'/'}}
+          </div>
         </div>
         <div class="inline_block">
           透析号：
-            <div class="under_line" style="width: 70px;text-align: center;">
-              {{patientInfo.dialysis_no}}
-            </div>
+          <div class="under_line" style="width: 70px;text-align: center;">
+            {{patientInfo.dialysis_no}}
+          </div>
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           住院号/门诊号：
@@ -145,95 +145,95 @@
                     </div>
                   </div>
 
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
-                    导管：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{predialysis.catheter?predialysis.catheter:'/'}}
-                    </div>
+                <div class="inline_block" style="margin-left:10px;flex:1;">
+                  导管：
+                  <div class="under_line" style="width: 150px;text-align: center">
+                    {{predialysis.catheter?predialysis.catheter:'/'}}
                   </div>
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
-                    穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
-                      /
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
-                      绳梯
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 2">
-                      扣眼
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
-                      区域
-                    </div>
+                </div>
+                <div class="inline_block" style="margin-left:10px;flex:1;">
+                  穿刺方式：
+                  <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    /
                   </div>
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
-                    穿刺针：
-                    <div class="under_line" style="width: 100px;text-align: center">
-                      {{predialysis.puncture_needle?predialysis.puncture_needle:'/'}}
-                    </div>
+                  <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
+                    绳梯
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 2">
+                    扣眼
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
+                    区域
                   </div>
                 </div>
-                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1;">
-                    透析方式：
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
-                      /
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==1">
-                      HD
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==2">
-                      HDF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==3">
-                      HD+HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==4">
-                      HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==5">
-                      HF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==6">
-                      SCUF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==7">
-                      IUF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==8">
-                      HFHD
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==9">
-                      HFHD+HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==10">
-                      PHF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==11">
-                      HFR
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==12">
-                      HDF+HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==13">
-                      CRRT
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==14">
-                      腹水回输
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==15">
-                      HD前置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==16">
-                      HD后置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==17">
-                      HDF前置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==18">
-                      HDF后置换
-                    </div>
+                <div class="inline_block" style="margin-left:10px;flex:1;">
+                  穿刺针：
+                  <div class="under_line" style="width: 100px;text-align: center">
+                    {{predialysis.puncture_needle?predialysis.puncture_needle:'/'}}
                   </div>
+                </div>
+              </div>
+              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                <div class="inline_block" style="flex:1;">
+                  透析方式：
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
+                    /
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==1">
+                    HD
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==2">
+                    HDF
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==3">
+                    HD+HP
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==4">
+                    HP
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==5">
+                    HF
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==6">
+                    SCUF
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==7">
+                    IUF
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==8">
+                    HFHD
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==9">
+                    HFHD+HP
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==10">
+                    PHF
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==11">
+                    HFR
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==12">
+                    HDF+HP
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==13">
+                    CRRT
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==14">
+                    腹水回输
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==15">
+                    HD前置换
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==16">
+                    HD后置换
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==17">
+                    HDF前置换
+                  </div>
+                  <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==18">
+                    HDF后置换
+                  </div>
+                </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     置换方式：
@@ -339,58 +339,70 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;">
                   流量：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
-                    </div>
-                    ml/min
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
                   </div>
+                  ml/min
                 </div>
-                <div class="row" style="padding: 2px 0;line-height:23px;">
-                  <div class="inline_block" >
-                    抗凝剂：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{prescription.anticoagulant_name?prescription.anticoagulant_name:'/'}}
-                    </div>
+              </div>
+              <div class="row" style="padding: 2px 0;line-height:23px;">
+                <div class="inline_block" >
+                  抗凝剂：
+                  <div class="under_line" style="width: 150px;text-align: center">
+                    {{prescription.anticoagulant_name?prescription.anticoagulant_name:'/'}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
-                    首剂：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_shouji?prescription.anticoagulant_shouji:'/'}}
-                    </div>
-                    lu
+                </div>
+                <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
+                  首剂：
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.anticoagulant_shouji?prescription.anticoagulant_shouji:'/'}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;">
+                  <span v-if="prescription.anticoagulant == 4">mg</span>
+                  <span v-if="prescription.anticoagulant == 3">iu</span>
+                  <span v-if="prescription.anticoagulant == 2">iu</span>
+                  <span v-if="prescription.anticoagulant == 1">mg</span>
+
+                </div>
+                <div class="inline_block" style="margin-left:20px;">
                   维持：
-                    <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
-                    </div>
-                    <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
-                    </div>
-                    <span v-if="prescription.anticoagulant != 5">lu</span>
-                    <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                  <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
-                    钙名称：
-                    <div class="under_line" style="width: 150px;text-align: center;">
-                      {{prescription.anticoagulant_gaimingcheng?prescription.anticoagulant_gaimingcheng:'/'}}
-                    </div>
+                  <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
-                    钙剂量：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_gaijiliang?prescription.anticoagulant_gaijiliang:'/'}}
-                    </div>
-                    ml/h
+                  <span v-if="prescription.anticoagulant == 5">ml</span>
+                  <span v-if="prescription.anticoagulant == 4">mg</span>
+                  <span v-if="prescription.anticoagulant == 3">iu</span>
+                  <span v-if="prescription.anticoagulant == 2">iu</span>
+                  <span v-if="prescription.anticoagulant == 1">mg</span>
+
+                </div>
+                <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
+                  钙名称：
+                  <div class="under_line" style="width: 150px;text-align: center;">
+                    {{prescription.anticoagulant_gaimingcheng?prescription.anticoagulant_gaimingcheng:'/'}}
+                  </div>
+                </div>
+                <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
+                  钙剂量：
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.anticoagulant_gaijiliang?prescription.anticoagulant_gaijiliang:'/'}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
+                  ml
+                </div>
+                <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
                   总量：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_zongliang?prescription.anticoagulant_zongliang:'/'}}
-                    </div>
-                    lu
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                    {{prescription.anticoagulant_zongliang?prescription.anticoagulant_zongliang:'/'}}
                   </div>
-                  <div class="inline_block" style="margin-left:20px;">
+                  <span v-if="prescription.anticoagulant == 4">mg</span>
+                  <span v-if="prescription.anticoagulant == 3">iu</span>
+                  <span v-if="prescription.anticoagulant == 2">iu</span>
+                  <span v-if="prescription.anticoagulant == 1">mg</span>
+
+                </div>
+                <div class="inline_block" style="margin-left:20px;">
                   透析机号：
                   <div class="under_line" style="width: 50px;text-align: center;">
                     {{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}

src/xt_pages/home/index.vue

@@ -113,47 +113,6 @@
           ></el-pagination>
         </div>
 
-        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
-
-        <el-dialog title="病人姓名" :visible.sync="dialogVisible" width="30%">
-          <div class="newLine">
-            <span>本次透析日期</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>透前体重(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>干体重(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>衣物重(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>体重增加(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>透后体重(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>体重减少(kg)</span>
-            <span>123</span>
-          </div>
-          <div class="newLine">
-            <span>上次透后体重(kg)</span>
-            <span>123</span>
-          </div>
-
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-          </span>
-        </el-dialog>
       </div>
     </section>
   </div>

src/xt_pages/user/doctorAdvice.vue

@@ -1,25 +1,25 @@
 <template>
   <div class="patient-container">
 
-    <el-dialog title="透析处方长期医嘱医生确认推送提醒" :visible.sync="dialogConfigVisible">
-      <el-form>
-        <el-form-item label="是否开启推送:">
-          <el-radio-group v-model="is_open_remind" @change="changeRemind">
-            <el-radio :label="1">开启</el-radio>
-            <el-radio :label="2">不开启</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-
-    </el-dialog>
+    <!--<el-dialog title="透析处方长期医嘱医生确认推送提醒" :visible.sync="dialogConfigVisible">-->
+    <!--<el-form>-->
+    <!--<el-form-item label="是否开启推送:">-->
+    <!--<el-radio-group v-model="is_open_remind" @change="changeRemind">-->
+    <!--<el-radio :label="1">开启</el-radio>-->
+    <!--<el-radio :label="2">不开启</el-radio>-->
+    <!--</el-radio-group>-->
+    <!--</el-form-item>-->
+    <!--</el-form>-->
+
+    <!--</el-dialog>-->
 
     <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
     <div class="patient-app-container advice-container app-container">
       <div class="cellButton" style="float:right;">
-        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"
-                   @click="dialogConfigVisible = true"
-                   type="primary" icon="el-icon-circle-plus-outline">长期医嘱提醒配置
-        </el-button>
+        <!--<el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"-->
+        <!--@click="dialogConfigVisible = true"-->
+        <!--type="primary" icon="el-icon-circle-plus-outline">长期医嘱提醒配置-->
+        <!--</el-button>-->
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small" @click="openNew"
                    type="primary" icon="el-icon-circle-plus-outline">新增
         </el-button>
@@ -63,13 +63,13 @@
                         :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"
                         :picker-options="pickerOptions" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
       </div>
-      <el-table id="oictable" @cell-click="clickuseradvicecell" :header-cell-style="{
-                  backgroundColor: 'rgb(245, 247, 250)',
-                  color: '#606266'
-                }"
-                :row-style="{ color: '#303133' }"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" :cell-class-name="adviceNameShow" >
+      <el-table id="oictable" @cell-click="clickuseradvicecell"
+                :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" row-class-name="user-advice-table-row"
+                :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row
+                @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;"
+                :cell-class-name="adviceNameShow">
 
-      <el-table-column align="center" label="全选" width="60px" type="selection" fixed></el-table-column>
+        <el-table-column align="center" label="全选" width="60px" type="selection" fixed></el-table-column>
         <!--<el-table-column type="index" :index="indexMethod"  label="序号" width="60px" align="center"></el-table-column>-->
         <el-table-column label="期效" width="60px" property="advice_type" align="center" fixed>
           <template slot-scope="scope">
@@ -94,7 +94,7 @@
 
               <el-dropdown-menu slot="dropdown">
                 <!--<el-dropdown-item :disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-                                  <!--@click.native="openEdit(scope.$index, scope.row)">修改医嘱-->
+                <!--@click.native="openEdit(scope.$index, scope.row)">修改医嘱-->
                 <!--</el-dropdown-item>-->
                 <el-dropdown-item v-if="scope.row.advice_type == 1"
                                   :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -396,7 +396,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button
             :disabled="$store.getters.xt_user.subscibe.state==3 || groupForm.adviceNames.length == 0?true:false"
-            type="primary" @click="submitgroupAdvice('groupForm')">保 存
+            type="primary" @click="submitgroupAdvice('groupForm')" :loading="addLoading">保 存
           </el-button>
         </div>
       </el-dialog>
@@ -1415,7 +1415,6 @@
                   duration: 2000
                 })
 
-
                 this.dialogFormVisible = false
                 this.resetForm(formName)
                 var advice = response.data.data.advice
@@ -1499,7 +1498,7 @@
                     }
                     if (
                       response.data.data.advices[index].parent_id in childMap ===
-                    false
+                      false
                     ) {
                       childMap[response.data.data.advices[index].parent_id] = []
                     }
@@ -2168,20 +2167,20 @@
           this.adviceForm.advice_desc = this.adviceTemplateMaps[key].advice_desc
           this.adviceForm.single_dose_unit = this.adviceTemplateMaps[
             key
-          ].single_dose_unit
+            ].single_dose_unit
           this.adviceForm.single_dose =
             this.adviceTemplateMaps[key].single_dose + ''
           this.adviceForm.prescribing_number_unit = this.adviceTemplateMaps[
             key
-          ].prescribing_number_unit
+            ].prescribing_number_unit
           this.adviceForm.prescribing_number =
             this.adviceTemplateMaps[key].prescribing_number + ''
           this.adviceForm.delivery_way = this.adviceTemplateMaps[
             key
-          ].delivery_way
+            ].delivery_way
           this.adviceForm.execution_frequency = this.adviceTemplateMaps[
             key
-          ].execution_frequency
+            ].execution_frequency
         }
       },
       indexMethod(index) {
@@ -2426,6 +2425,7 @@
         getDoctorAdviceList(this.listQuery).then(response => {
           if (response.data.state == 1) {
             this.adviceTableData = response.data.data.advices
+            console.log('数据是什么', this.adviceTableData)
             this.operators = response.data.data.operators
             if (this.operators.length > 0) {
               var operatorsLen = this.operators.length
@@ -2662,10 +2662,10 @@
             var item = {
               advice_name: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].advice_name,
+                ].advice_name,
               advice_desc: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].advice_desc,
+                ].advice_desc,
               single_dose:
                 '' +
                 this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
@@ -2678,7 +2678,7 @@
                   .drug_spec,
               drug_spec_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].drug_spec_unit,
+                ].drug_spec_unit,
               prescribing_number:
                 '' +
                 this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
@@ -2687,15 +2687,15 @@
                 .DoctorAdviceTemplate[index].prescribing_number_unit,
               delivery_way: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].delivery_way,
+                ].delivery_way,
               execution_frequency: this.adviceTemplateMaps[mapid]
                 .DoctorAdviceTemplate[index].execution_frequency,
               advice_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].id,
+                ].id,
               selection: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].selection,
+                ].selection,
 
               day_count: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].day_count,
               week_days: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].week_days,
@@ -2715,7 +2715,7 @@
               var parentRow = thisRowKey
               var children = this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
                 index
-              ].children
+                ].children
               for (const key in children) {
                 thisRowKey++
                 var child = {
@@ -3034,41 +3034,41 @@
                       if (_this.groupSelectRow.row_key == children[j].row_key) {
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].advice_name =
+                          ].advice_name =
                           _this.nameForm.advice_name
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].advice_desc =
+                          ].advice_desc =
                           _this.nameForm.advice_desc
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].single_dose =
+                          ].single_dose =
                           '' + _this.nameForm.single_dose
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].single_dose_unit =
+                          ].single_dose_unit =
                           _this.nameForm.single_dose_unit
                         _this.groupForm.adviceNames[index].children[j].drug_spec =
                           '' + _this.nameForm.drug_spec
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].drug_spec_unit =
+                          ].drug_spec_unit =
                           _this.nameForm.drug_spec_unit
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].prescribing_number =
+                          ].prescribing_number =
                           '' + _this.nameForm.prescribing_number
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].prescribing_number_unit =
+                          ].prescribing_number_unit =
                           _this.nameForm.prescribing_number_unit
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].delivery_way =
+                          ].delivery_way =
                           _this.nameForm.delivery_way
                         _this.groupForm.adviceNames[index].children[
                           j
-                        ].execution_frequency =
+                          ].execution_frequency =
                           _this.nameForm.execution_frequency
 
                         _this.$set(
@@ -3083,7 +3083,6 @@
                   }
                 }
               } else {
-                console.log('111111')
                 for (let index = 0; index < ale; index++) {
                   if (
                     _this.groupSelectRow.row_key ==
@@ -3094,8 +3093,6 @@
                     _this.groupForm.adviceNames[index].advice_desc =
                       _this.nameForm.advice_desc
 
-
-
                     _this.groupForm.adviceNames[index].single_dose =
                       '' + _this.nameForm.single_dose
                     _this.groupForm.adviceNames[index].single_dose_unit =
@@ -3368,29 +3365,29 @@
       }
       this.listQuery.id = this.patientID
 
-      var nowDate = new Date()
-      var nowYear = nowDate.getFullYear()
-      var nowMonth = nowDate.getMonth() + 1
-      var nowDay = nowDate.getDate()
-
-      this.listQuery.end_time =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
-
-      nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
-      nowMonth = nowDate.getMonth() + 1
-      nowDay = nowDate.getDate()
-
-      this.listQuery.start_time =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
+      // var nowDate = new Date()
+      // var nowYear = nowDate.getFullYear()
+      // var nowMonth = nowDate.getMonth() + 1
+      // var nowDay = nowDate.getDate()
+
+      // this.listQuery.end_time =
+      //   nowYear +
+      //   '-' +
+      //   (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      //   '-' +
+      //   (nowDay < 10 ? '0' + nowDay : nowDay)
+      //
+      // nowDate.setMonth(nowDate.getMonth() - 1)
+      // nowYear = nowDate.getFullYear()
+      // nowMonth = nowDate.getMonth() + 1
+      // nowDay = nowDate.getDate()
+      //
+      // this.listQuery.start_time =
+      //   nowYear +
+      //   '-' +
+      //   (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      //   '-' +
+      //   (nowDay < 10 ? '0' + nowDay : nowDay)
 
       // this.fetchAllDoctorAndNurse();
       this.fetchAllAdminUsers()
@@ -3601,33 +3598,26 @@
     transform: rotate(90deg) !important;
   }
 
-.user-advice-table-row:hover > td {
-  background: #fff !important;
-}
-.user-advice-table-row td:hover {
-  background: #fff !important;
-}
-#user-advice-select-template-table .el-table__row {
-  display: table-row !important;
-}
-#user-advice-select-template-table .el-table__expand-icon {
-  -webkit-transform: rotate(90deg) !important;
-  transform: rotate(90deg) !important;
-}
-.advicenamedisplay .cell {
-    /* float: left; */
-    text-align: center;
-}
-.el-table td,
-.el-table th.is-leaf,
-.el-table--border,
-.el-table--group {
-  border-color: #d0d3da;
-}
-.el-table--border::after,
-.el-table--group::after,
-.el-table::before {
-  background-color: #d0d3da;
-}
+  .user-advice-table-row:hover > td {
+    background: #fff !important;
+  }
+
+  .user-advice-table-row td:hover {
+    background: #fff !important;
+  }
+
+  #user-advice-select-template-table .el-table__row {
+    display: table-row !important;
+  }
+
+  #user-advice-select-template-table .el-table__expand-icon {
+    -webkit-transform: rotate(90deg) !important;
+    transform: rotate(90deg) !important;
+  }
+
+  .advicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
 </style>
 

src/xt_pages/workforce/components/tableData.vue

@@ -290,7 +290,7 @@
       <span slot="footer" class="dialog-footer">
           <el-button @click="msDialogVisible = false">取 消</el-button>
           <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
-                     @click="submitTiaoZMS('changeSchedule')">保 存</el-button>
+                     @click="submitMode('changeSchedule')">保 存</el-button>
         </span>
     </el-dialog>
     <el-dialog
@@ -936,6 +936,38 @@
           }
         })
       },
+      submitMode(formName) {
+            this.changing_mode = true
+            this.changeSchedule.change_action = 'change_mode'
+            ChangeSchedule(this.currentData.id, this.changeSchedule).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+              } else {
+                this.$message({
+                  type: 'success',
+                  message: '修改成功!'
+                })
+                var that = this
+                var schedule = response.data.data.schedule
+                this.scheduleZone.forEach(function(zone, index) {
+                  if (zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
+                    var weekPath = that.weekPath(schedule.schedule_week, schedule.schedule_type)
+                    if (weekPath.length == 2) {
+                      var weekPathKey = weekPath[0] + '_' + weekPath[1]
+                      that.scheduleZone[index][weekPathKey].mode_id = schedule.mode_id
+                      that.scheduleZone[index][weekPathKey].mode_name = typeof (that.modeOptions[schedule.mode_id]) === 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
+                    }
+                  }
+                })
+                this.msDialogVisible = false
+              }
+              this.changing_mode = false
+            }).catch(err => {
+              this.$message.error(err)
+              this.changing_mode = false
+            })
+      },
+
       submitTiaoZMS(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -978,51 +1010,55 @@
         this.device_id = this.current_devices[0].id
       }, changeScheduleType(schedule_type) {
         const params = {
-          type: schedule_type
+          type: schedule_type,
+          date: this.currentData.schedule_date,
+
         }
         getUrgentScheduleInitData(params).then(rs => {
           if (rs.data.state == 1) {
             this.origin_schedules = rs.data.data.schedules
-            this.patients = rs.data.data.patients
-            this.modes = rs.data.data.modes
             this.origin_device_numbers = rs.data.data.device_numbers
 
-            for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
-              for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
-                if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
-                  this.origin_device_numbers.splice(y, 1)
-                }
+            var zone_device_map = {};
+            for (
+              let index = 0;
+              index < this.origin_device_numbers.length;
+              index++
+            ) {
+              const device_number = this.origin_device_numbers[index];
+              if (
+                zone_device_map[device_number.zone_name] == null ||
+                zone_device_map[device_number.zone_name] == undefined
+              ) {
+                zone_device_map[device_number.zone_name] = [];
               }
+              zone_device_map[device_number.zone_name].push(device_number);
             }
+            this.zone_device_map = zone_device_map;
 
-            var zone_device_map = {}
-            for (let index = 0; index < this.origin_device_numbers.length; index++) {
-              const device_number = this.origin_device_numbers[index]
-              if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
-                zone_device_map[device_number.zone.name] = []
-              }
-              zone_device_map[device_number.zone.name].push(device_number)
-            }
-            this.zone_device_map = zone_device_map
-            // debugger
+            this.zone_names = Object.keys(this.zone_device_map);
+
+            console.log(this.current_devices)
 
-            this.zone_names = Object.keys(this.zone_device_map)
             if (this.zone_names.length > 0) {
-              this.zone_name = this.zone_names[0]
-              this.current_devices = this.zone_device_map[this.zone_name]
-              this.device_id = this.current_devices[0].id
+              this.zone_name = this.zone_names[0];
+              this.current_devices = this.zone_device_map[this.zone_name];
+              this.device_id = this.current_devices[0].id;
             }
+            console.log(this.current_devices)
+
+
             this.zone_device_options = [
               { values: this.zone_names },
               // { values: this.getDeviceNumberNames(this.current_devices) },
               { values: this.current_devices }
-            ]
+            ];
+
+            console.log(this.current_devices)
           } else {
-            Toast.fail(rs.data.msg)
           }
         }).catch(err => {
           this.loading = false
-          Toast.fail(err)
         })
       },
       submitTiaoX() {
@@ -1055,50 +1091,89 @@
             } else {
               this.jihaos = []
             }
+
             const params = {
               type: this.currentData.schedule_type,
-              date: this.currentData.schedule_date
+              date: this.currentData.schedule_date,
             }
             getUrgentScheduleInitData(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
               } else {
                 if (response.data.state == 1) {
+
                   this.origin_schedules = response.data.data.schedules
                   this.origin_device_numbers = response.data.data.device_numbers
 
-                  for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
-                    for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
-                      if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
-                        this.origin_device_numbers.splice(y, 1)
-                      }
-                    }
-                  }
-                  // debugger
-                  var zone_device_map = {}
-                  for (let index = 0; index < this.origin_device_numbers.length; index++) {
-                    const device_number = this.origin_device_numbers[index]
-                    if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
-                      zone_device_map[device_number.zone.name] = []
+
+                  var zone_device_map = {};
+                  for (
+                    let index = 0;
+                    index < this.origin_device_numbers.length;
+                    index++
+                  ) {
+                    const device_number = this.origin_device_numbers[index];
+                    if (
+                      zone_device_map[device_number.zone_name] == null ||
+                      zone_device_map[device_number.zone_name] == undefined
+                    ) {
+                      zone_device_map[device_number.zone_name] = [];
                     }
-                    zone_device_map[device_number.zone.name].push(device_number)
+                    zone_device_map[device_number.zone_name].push(device_number);
                   }
-                  this.zone_device_map = zone_device_map
-
-                  this.zone_names = Object.keys(this.zone_device_map)
+                  this.zone_device_map = zone_device_map;
+                  this.zone_names = Object.keys(this.zone_device_map);
                   if (this.zone_names.length > 0) {
-                    this.zone_name = this.zone_names[0]
-                    this.current_devices = this.zone_device_map[this.zone_name]
-                    this.device_id = this.current_devices[0].id
-                  }
+                    this.zone_name = this.zone_names[0];
+                    this.current_devices = this.zone_device_map[this.zone_name];
+
+                    console.log(this.zone_device_map[this.zone_name])
 
+                    this.device_id = this.current_devices[0].id;
+                  }
                   this.zone_device_options = [
                     { values: this.zone_names },
                     // { values: this.getDeviceNumberNames(this.current_devices) },
                     { values: this.current_devices }
-                  ]
+                  ];
+
+
+
+
+
+
+                  //
+                  // for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
+                  //   for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
+                  //     if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
+                  //       this.origin_device_numbers.splice(y, 1)
+                  //     }
+                  //   }
+                  // }
+                  // // debugger
+                  // var zone_device_map = {}
+                  // for (let index = 0; index < this.origin_device_numbers.length; index++) {
+                  //   const device_number = this.origin_device_numbers[index]
+                  //   if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
+                  //     zone_device_map[device_number.zone.name] = []
+                  //   }
+                  //   zone_device_map[device_number.zone.name].push(device_number)
+                  // }
+                  // this.zone_device_map = zone_device_map
+                  //
+                  // this.zone_names = Object.keys(this.zone_device_map)
+                  // if (this.zone_names.length > 0) {
+                  //   this.zone_name = this.zone_names[0]
+                  //   this.current_devices = this.zone_device_map[this.zone_name]
+                  //   this.device_id = this.current_devices[0].id
+                  // }
+                  //
+                  // this.zone_device_options = [
+                  //   { values: this.zone_names },
+                  //   // { values: this.getDeviceNumberNames(this.current_devices) },
+                  //   { values: this.current_devices }
+                  // ]
                 } else {
-                  Toast.fail(rs.data.msg)
                 }
               }
             }).catch(err => {
@@ -1328,54 +1403,6 @@
         } else {
           this.jihaos = []
         }
-        const params = {
-          type: row.schedule_type
-        }
-        getUrgentScheduleInitData(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-          } else {
-            if (response.data.state == 1) {
-              this.origin_schedules = response.data.data.schedules
-              this.origin_device_numbers = response.data.data.device_numbers
-
-              for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
-                for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
-                  if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
-                    this.origin_device_numbers.splice(y, 1)
-                  }
-                }
-              }
-
-              var zone_device_map = {}
-              for (let index = 0; index < this.origin_device_numbers.length; index++) {
-                const device_number = this.origin_device_numbers[index]
-                if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
-                  zone_device_map[device_number.zone.name] = []
-                }
-                zone_device_map[device_number.zone.name].push(device_number)
-              }
-              this.zone_device_map = zone_device_map
-
-              this.zone_names = Object.keys(this.zone_device_map)
-              if (this.zone_names.length > 0) {
-                this.zone_name = this.zone_names[0]
-                this.current_devices = this.zone_device_map[this.zone_name]
-                this.device_id = this.current_devices[0].id
-              }
-
-              this.zone_device_options = [
-                { values: this.zone_names },
-                // { values: this.getDeviceNumberNames(this.current_devices) },
-                { values: this.current_devices }
-              ]
-            } else {
-              Toast.fail(rs.data.msg)
-            }
-          }
-        }).catch(err => {
-          this.$message.error(err)
-        })
 
         this.searchTableVisible = false
         this.jhDialogVisible = true