代码有冲突

config/dev.env.js

@@ -6,7 +6,11 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
+<<<<<<< HEAD
   BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+=======
+  BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
 
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

src/api/dialysis_record.js

@@ -1,82 +1,81 @@
 import request from '@/utils/request'
 
-export function getDialysisRecordInitData(){
-    return request({
-        url:'/api/dialysis/initdata',
-        method:'get',
-    })
+export function getDialysisRecordInitData() {
+  return request({
+    url: '/api/dialysis/initdata',
+    method: 'get'
+  })
 }
 
-export function getDialysisSchedules(ymd){
-    var params = {
-        date: ymd,
-    }
-    return request({
-        url:'/api/dialysis/schedules',
-        method:'get',
-        params: params,
-    })
+export function getDialysisSchedules(ymd) {
+  var params = {
+    date: ymd
+  }
+  return request({
+    url: '/api/dialysis/schedules',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getDialysisScheduleDetail(patient_id, ymd){
-    var params = {
-        patient_id: patient_id,
-        date: ymd,
-    }
-    return request({
-        url:'/api/dislysis/schedule',
-        method:'get',
-        params: params,
-    })
+export function getDialysisScheduleDetail(patient_id, ymd) {
+  var params = {
+    patient_id: patient_id,
+    date: ymd
+  }
+  return request({
+    url: '/api/dislysis/schedule',
+    method: 'get',
+    params: params
+  })
 }
 
-export function editMonitor(patient_id, schedule_date, data){
-    var params = {
-        patient_id: patient_id,
-        schedule_date: schedule_date,
-    }
-    return request({
-        url:'/api/dislysis/monitor/edit',
-        method:'post',
-        params: params,
-        data: data,
-    })
+export function editMonitor(patient_id, schedule_date, data) {
+  var params = {
+    patient_id: patient_id,
+    schedule_date: schedule_date
+  }
+  return request({
+    url: '/api/dislysis/monitor/edit',
+    method: 'post',
+    params: params,
+    data: data
+  })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id) {
-    var params = {
-        patient_id: patient_id,
-        date: schedule_date,
-        nurse: nurse_id,
-        bed: bed_id,
-    }
-    return request({
-        url:'/api/dialysis/start_record',
-        method:'post',
-        params: params,
-    })
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, puncture_nurse_id) {
+  var params = {
+    patient_id: patient_id,
+    date: schedule_date,
+    nurse: nurse_id,
+    bed: bed_id,
+    puncture_nurse: puncture_nurse_id
+  }
+  return request({
+    url: '/api/dialysis/start_record',
+    method: 'post',
+    params: params
+  })
 }
 
-export function finishDialysis(patient_id, schedule_date, nurse_id){
-    var params = {
-        patient_id: patient_id,
-        date: schedule_date,
-        nurse: nurse_id,
-    }
-    return request({
-        url:'/api/dialysis/finish',
-        method:'post',
-        params: params,
-    })
+export function finishDialysis(patient_id, schedule_date, nurse_id) {
+  var params = {
+    patient_id: patient_id,
+    date: schedule_date,
+    nurse: nurse_id
+  }
+  return request({
+    url: '/api/dialysis/finish',
+    method: 'post',
+    params: params
+  })
 }
 
-
-
 export function postDelMonitorInfo(params) {
   return request({
-    url:'/api/dialysis/monitor/del',
-    method:'post',
-    params:params,
+    url: '/api/dialysis/monitor/del',
+    method: 'post',
+    params: params
   })
 }
 

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

@@ -12,6 +12,11 @@
             <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-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:300px">
           <el-date-picker
             :disabled="dialysis_order.id != 0"
@@ -52,6 +57,7 @@
           bed_id: '',
           nurse_id: '',
           start_time:'',
+          puncture_nurse_id:'',
         }
       }
     },
@@ -77,6 +83,12 @@
 
       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
+
+      if(this.form.puncture_nurse_id == 0){
+        this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
+      }
+
 
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
@@ -106,6 +118,8 @@
         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
+
         this.form.start_time = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_time
 
       }
@@ -137,7 +151,7 @@
       },
       submit: function() {
         this.loading = true
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.puncture_nurse_id).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -11,6 +11,10 @@
           <label>上机护士 : </label>
           <span class="content">{{ nurse }}</span>
         </li>
+        <li>
+          <label>穿刺护士 : </label>
+          <span class="content">{{ puncture_nurse }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
@@ -71,7 +75,12 @@
       return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时{i}分");
 
 
-    },
+    },puncture_nurse:function() {
+      if (this.record.id == 0) {
+        return "-"
+      }
+      return this.admin_map[this.record.puncture_nurse] == null ? "" : this.admin_map[this.record.puncture_nurse].name
+    }
   },
   methods: {
 

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -12,7 +12,7 @@
         </div>
         <div class="inline_block" style="margin-left:25px;">
           姓名：
-          <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
+          <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
         </div>
         <div class="inline_block" style="margin-left: 25px;">
           性别：
@@ -22,12 +22,12 @@
         </div>
         <div class="inline_block" style="margin-left: 25px;">
           年龄：
-          <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
+          <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
           岁
         </div>
         <div class="inline_block" style="margin-left: 25px;">
           住院号：
-          <div class="under_line" style="width: 100px;">
+          <div class="under_line" style="width: 100px;text-align: left">
             {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
           </div>
         </div>
@@ -56,16 +56,16 @@
                   </div>
                   <div class="inline_block" style="margin-left: 30px;">
                     透析频次：
-                    <div class="under_line" style="width: 50px;">
+                    <div class="under_line" style="width: 50px;text-align: left">
                       {{predialysis.dialysis_count?predialysis.dialysis_count:''}}
                     </div>
                     次/周
                   </div>
                   <div class="inline_block" style="margin-left: 30px;">
                     透析机编号：
-                    <div class="under_line" style="width: 100px;">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:''}}</div>
+                    <div class="under_line" style="width: 100px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
                     型号
-                    <div class="under_line" style="width: 100px;">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
+                    <div class="under_line" style="width: 100px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -85,7 +85,7 @@
                     <check-box text="消化道出血" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('消化道出血')>-1?true:false"></check-box>
                     <check-box text="女性经期" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('女性经期')>-1?true:false"></check-box>
                     其他：
-                    <div class="under_line" style="width: 100px;">
+                    <div class="under_line" style="width: 100px;text-align: left">
                         <span v-if="predialysis.is_hemorrhage==1">
                           {{predialysis.hemorrhage_other}}
                         </span>
@@ -105,7 +105,7 @@
                   </div>
                   <div class="inline_block">
                     其它：
-                    <div class="under_line" style="width: 300px;">{{predialysis.internal_fistula_other}}
+                    <div class="under_line" style="width: 300px;text-align: left">{{predialysis.internal_fistula_other}}
                     </div>
                   </div>
                 </div>
@@ -133,8 +133,8 @@
                     <check-box text="股静脉" :checked="predialysis.venous_catheterization_part == 3?true:false"></check-box>
                     <div class="inline_block">
                       其它：
-                      <div class="under_line" style="width: 50px;">
-                          <span v-if="predialysis.venous_catheterization_part == -1">{{predialysis.venous_catheterization_part_other}}</span>
+                      <div class="under_line" style="width: 50px;text-align: left">
+                          <span>{{predialysis.venous_catheterization_part_other}}</span>
                       </div>
                     </div>
                   </div>
@@ -162,7 +162,7 @@
                     <check-box text="重症酸中毒" :checked="predialysis.emergency_treatment == 3?true:false"></check-box>
                     <div class="inline_block">
                       其它：
-                      <div class="under_line" style="width: 100px;">
+                      <div class="under_line" style="width: 100px;text-align: left">
                         <span v-if="predialysis.emergency_treatment == -1">{{predialysis.emergency_treatment_other}}</span>
                       </div>
                     </div>
@@ -181,7 +181,7 @@
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     跌倒风险评估：&nbsp;评分：
-                    <div class="under_line" style="width: 50px;"> {{receiverTreatmentAccess.score}}</div>分
+                    <div class="under_line" style="width: 50px;text-align: left"> {{receiverTreatmentAccess.score}}</div>分
                     &emsp;风险程度：
                     <check-box text="无" :checked="receiverTreatmentAccess.danger_level == 1?true:false"></check-box>
                     <check-box text="低风险" :checked="receiverTreatmentAccess.danger_level == 2?true:false"></check-box>
@@ -296,7 +296,7 @@
           </div>
           <div class="inline_block" style="margin-left:25px;">
             姓名：
-            <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
           </div>
           <div class="inline_block" style="margin-left: 25px;">
             性别：
@@ -306,12 +306,12 @@
           </div>
           <div class="inline_block" style="margin-left: 25px;">
             年龄：
-            <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
             岁
           </div>
           <div class="inline_block" style="margin-left: 25px;">
             住院号：
-            <div class="under_line" style="width: 100px;">
+            <div class="under_line" style="width: 100px;text-align: left">
               {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
             </div>
           </div>
@@ -373,7 +373,7 @@
                     <check-box text="完成" :checked="afterdialysis.dialysis_process==1?true:false"></check-box>
                     <check-box text="提前" :checked="afterdialysis.dialysis_process==2?true:false"></check-box>
                     <div class="inline_block">
-                      <div class="under_line" style="width: 30px;">
+                      <div class="under_line" style="width: 30px;text-align: left">
                         <span v-if="afterdialysis.dialysis_process==2">{{afterdialysis.in_advance_minute}}</span>
                       </div>
                       min
@@ -389,7 +389,7 @@
                     <div class="inline_block">
                     &emsp; 其他原因：
                     <div class="inline_block">
-                      <div class="under_line" style="width: 150px;">
+                      <div class="under_line" style="width: 150px;text-align: left">
                         <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
                       </div>
                     </div>
@@ -399,7 +399,7 @@
                   <div class="inline_block">
                     内瘘管拔针后压迫止血时间：
                     <div class="inline_block">
-                      <div class="under_line" style="width: 30px;">
+                      <div class="under_line" style="width: 30px;text-align: left">
                         <span v-if="afterdialysis.hemostasis_minute">{{afterdialysis.hemostasis_minute}}</span>
                       </div>
                       min
@@ -471,27 +471,44 @@
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block" >
                       责任护士：
-                      <div class="under_line" style="width: 100px;">
+                      <div class="under_line" style="width: 100px;text-align: left">
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                       </div>
                     </div>
-                    <div class="inline_block" >
-                      &emsp;核对人：
-                      <div class="under_line" style="width: 100px;">
-                        <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
-                        <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
-                      </div>
+                  <div class="inline_block" >
+                    穿刺者：
+                    <div class="under_line" style="width: 100px;text-align: left">
+                      <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
+                      <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                     </div>
-                    <div class="inline_block">
-                      &emsp;核对时间：
-                      <div class="under_line" style="width: 200px;">
-                        {{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时{i}分')}}
-                      </div>
+                  </div>
+
+
+                  <div class="inline_block" >
+                    &emsp;核对人：
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.modifier">
+                      <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.creater">
+                      <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
+                    </div>
+                  </div>
+                  <div class="inline_block">
+                    &emsp;核对时间：
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.first_check_time > check.check_time">
+                      {{getTime(check.check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                     </div>
+
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.check_time > check.first_check_time">
+                      {{getTime(check.first_check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
+                    </div>
+                  </div>
                     <div class="inline_block" >
                       &emsp;收针者：
-                      <div class="under_line" style="width: 100px;">
+                      <div class="under_line" style="width: 100px;text-align: left">
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
                       </div>
@@ -516,19 +533,19 @@
                 <div class="row" style="padding: 2px 0; line-height:19px;">
                   <div class="inline_block" >
                     血透室护士签名：
-                    <div class="under_line" style="width: 100px;">
+                    <div class="under_line" style="width: 100px;text-align: left">
                       <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                       <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                     </div>
                   </div>
                   <div class="inline_block" >
                     &emsp;病区护士签名：
-                    <div class="under_line" style="width: 100px;">
+                    <div class="under_line" style="width: 100px;text-align: left">
                     </div>
                   </div>
                   <div class="inline_block">
                     &emsp;时间：
-                    <div class="under_line" style="width: 200px;" v-if="dialysisOrder != null">
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="dialysisOrder != null">
                       {{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                     </div>
                   </div>
@@ -545,6 +562,7 @@
             </tr>
           </tbody>
         </table>
+<<<<<<< HEAD
         <div v-if="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9)" class="print-yema3" >2</div>
         <div v-else class="print-yema2">1</div>
       </div>
@@ -557,6 +575,39 @@
           科室：
           <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
           <check-box text="住院" :checked="patientInfo_source_2"></check-box>
+=======
+        <div v-if="this.monitors.length > 8" :class="this.monitors.length > 8 ? 'margin-bottom-900':'margin-bottom-300'" style="text-align:center;margin-top:10px;">2</div>
+        <div v-else class="margin-bottom-300" style="text-align:center;margin-top:10px;">1</div>
+
+        <div class="order-yy-name">{{orgname}}</div>
+        <div class="order_title"> 血液净化科医嘱及执行单 </div>
+        <div class="row" style="margin-top: 15px;">
+          <div class="inline_block" >
+            科室：
+            <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
+            <check-box text="住院" :checked="patientInfo_source_2"></check-box>
+          </div>
+          <div class="inline_block" style="margin-left:25px;">
+            姓名：
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
+          </div>
+          <div class="inline_block" style="margin-left: 25px;">
+            性别：
+            <check-box text="男" :checked="patientInfo_gender_1"></check-box>
+            <check-box text="女" :checked="patientInfo_gender_2"></check-box>
+          </div>
+          <div class="inline_block" style="margin-left: 25px">
+            年龄：
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
+            岁
+          </div>
+          <div class="inline_block" style="margin-left:25px;">
+            住院号：
+            <div class="under_line" style="width: 120px;text-align: left">
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+            </div>
+          </div>
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
         </div>
         <div class="inline_block" style="margin-left:25px;">
           姓名：
@@ -594,12 +645,16 @@
                   <!--诊断：-->
                   <!--<div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>-->
                 <!--</div>-->
+<<<<<<< HEAD
               <!--</div>-->
               <div class="row" style="padding: 2px 0;line-height:24px;">
                 <div class="inline_block" >
                   诊断：
                   <div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>
                 </div>
+=======
+                <div class="row" style="padding: 2px 0;line-height:24px;">
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
 
                 <div class="inline_block" style="margin-left: -10px" >
                   &emsp;治疗方式：
@@ -610,6 +665,7 @@
                   <check-box text="HD+HP" :checked="prescription.mode_id==3?true:false"></check-box>
                 </div>
 
+<<<<<<< HEAD
                 <!--<div class="inline_block"  v-if="patientInfo.diagnose.length <= 10">-->
                   <!--&emsp;治疗方式：-->
                   <!--<check-box text="HD" :checked="prescription.mode_id==1?true:false"></check-box>-->
@@ -632,6 +688,32 @@
                   h
                   <div class="under_line" style="width: 30px;">
                     {{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}
+=======
+                  <!--<div class="inline_block"  v-if="patientInfo.diagnose.length <= 10">-->
+                    <!--&emsp;治疗方式：-->
+                    <!--<check-box text="HD" :checked="prescription.mode_id==1?true:false"></check-box>-->
+                    <!--<check-box text="HDF" :checked="prescription.mode_id==2?true:false"></check-box>-->
+                    <!--<check-box text="HF" :checked="prescription.mode_id==5?true:false"></check-box>-->
+                    <!--<check-box text="HP" :checked="prescription.mode_id==4?true:false"></check-box>-->
+                    <!--<check-box text="HD+HP" :checked="prescription.mode_id==3?true:false"></check-box>-->
+                  <!--</div>-->
+                  <div class="inline_block" style="margin-left:20px;">
+                    其它：
+                    <div class="under_line" style="width: 100px;text-align: left">
+                      <span v-if="prescription.mode_id>5">{{prescription.mode}}</span>
+                    </div>
+                  </div>
+                  <div class="inline_block" style="margin-left:20px;">
+                    治疗时间：
+                    <div class="under_line" style="width: 30px;text-align: left">
+                      {{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}
+                    </div>
+                    h
+                    <div class="under_line" style="width: 30px;text-align: left">
+                      {{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}
+                    </div>
+                    min
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
                   </div>
                   min
                 </div>
@@ -663,6 +745,7 @@
                   <div class="under_line" style="width: 100px;">
                     <div class="under-line" v-if="prescription&&prescription.body_fluid_other.length > 0">&nbsp;{{prescription.body_fluid_other}}</div>
                   </div>
+<<<<<<< HEAD
                 </div> -->
                 <div class="inline_block" style="margin-left:20px;">
                   透析前使用特殊药物：
@@ -695,9 +778,37 @@
                   <div class="under_line" style="width: 70px;">
                     <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
                     <span v-else>{{'/'}}</span>
+=======
+                  <div class="inline_block">
+                    其它：
+                    <div class="under_line" style="width: 100px;text-align: left">
+                      <span v-if="prescription.special_medicine == -1">{{prescription.special_medicine_other}}</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="row" style="padding: 2px 0;line-height:24px;">
+                  <div class="inline_block">
+                    透析液(mmol/L)： &emsp;Ca<sup>2+</sup>：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                        <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
+                      <span v-else>{{'/'}}</span>
+
+                    </div>
+                    mmol/L &emsp;Na<sup>+</sup>：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
+                      <span v-else>{{'/'}}</span>
+
+                    </div>
+                    mmol/L &emsp;K<sup>+</sup>：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
+                      <span v-else>{{'/'}}</span>
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
 
 
                   </div>
+<<<<<<< HEAD
                   mmol/L
                 </div>
                 <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
@@ -711,6 +822,28 @@
                   &emsp;置换液前稀释 总量：
                   <div class="under_line" style="width: 100px;">
                     {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+=======
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
+                    &emsp;置换液后/前稀释 总量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                    </div>
+                    L
+                  </div>
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 1">
+                    &emsp;置换液前稀释 总量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                    </div>
+                    L
+                  </div>
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 2">
+                    &emsp;置换液后稀释 总量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                    </div>
+                    L
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
                   </div>
                   L
                 </div>
@@ -719,6 +852,7 @@
                   <div class="under_line" style="width: 100px;">
                     {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
                   </div>
+<<<<<<< HEAD
                   L
                 </div>
               </div>
@@ -740,9 +874,25 @@
                   &emsp;透析液流量：
                   <div class="under_line" style="width: 100px;">
                     {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
+=======
+                  <div class="inline_block">
+                    &emsp;血流量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{prescription.blood_flow_volume?prescription.blood_flow_volume:'/'}}
+                    </div>
+                    ml/min
+                  </div>
+                  <div class="inline_block">
+                    &emsp;透析液流量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
+                    </div>
+                    ml/min
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
                   </div>
                   ml/min
                 </div>
+<<<<<<< HEAD
               </div>
               <div class="row" style="padding: 2px 0;line-height:24px;">
                 <div class="inline_block">
@@ -770,6 +920,38 @@
                   透后体重：
                   <div class="under_line" style="width: 100px;">
                     {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
+=======
+                <div class="row" style="padding: 2px 0;line-height:24px;">
+                  <div class="inline_block">
+                    透前体重：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{predialysis.weight_before?predialysis.weight_before:'/'}}
+                    </div>
+                    kg
+                  </div>
+                  <div class="inline_block">
+                    &emsp;设定超滤量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{getFloat(prescription.target_ultrafiltration)?getFloat(prescription.target_ultrafiltration):'/'}}
+
+                    </div>
+                    L
+                  </div>
+                  <div class="inline_block">
+                    &emsp;实际超滤量：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{getFloat(prescription.ultrafiltration)?getFloat(prescription.ultrafiltration):'/'}}
+                    </div>
+                    L
+
+                  </div>
+                  <div class="inline_block">
+                    透后体重：
+                    <div class="under_line" style="width: 70px;text-align: left">
+                      {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
+                    </div>
+                    kg
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
                   </div>
                   kg
                 </div>
@@ -852,7 +1034,7 @@
             </div>
             <div class="inline_block" style="margin-left:25px;">
               姓名：
-              <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
+              <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
             </div>
             <div class="inline_block" style="margin-left: 25px;">
               性别：
@@ -861,12 +1043,12 @@
             </div>
             <div class="inline_block" style="margin-left: 25px;">
               年龄：
-              <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
+              <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
               岁
             </div>
             <div class="inline_block" style="margin-left:25px;">
               住院号：
-              <div class="under_line" style="width: 120px;">
+              <div class="under_line" style="width: 120px;text-align: left">
                 {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
               </div>
             </div>

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -263,7 +263,7 @@
           }
         }
       },clickRow:function(row) {
-        this.$refs.multipleTable.toggleRowSelection(row)
+        // this.$refs.multipleTable.toggleRowSelection(row)
 
       }, tableRows({ row, rowIndex }) {
         // 把每一行的索引放进row

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -246,7 +246,8 @@
         }
 
       }, clickRow: function(row) {
-        this.$refs.multipleTable.toggleRowSelection(row)
+        // this.$refs.multipleTable.toggleRowSelection(row)
+
       }, newGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -414,6 +414,12 @@
               }
               total = total + array[i].price * array[i].return_count
             }
+
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加退库商品')
+              return
+            }
+
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
@@ -424,7 +430,7 @@
               } else {
                 this.$notify({
                   title: '成功',
-                  message: '退货成功',
+                  message: '退库成功',
                   type: 'success',
                   duration: 2000
                 })

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -471,6 +471,12 @@
               }
               total = total + array[i].price * array[i].return_count
             }
+
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加退货商品')
+              return
+            }
+
             const params = {
               'salesReturn': this.recordInfo.recordData
             }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -590,6 +590,11 @@
               }
             }
 
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加入库商品')
+              return
+            }
+
             const params = {
               'stockIn': this.recordInfo.recordData
             }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -504,6 +504,12 @@
               }
               total = total + array[i].price * array[i].return_count
             }
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加出库商品')
+              return
+            }
+
+
             const params = {
               'stockOut': this.recordInfo.recordData
             }
@@ -514,7 +520,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message.success('退货成功')
+                this.$message.success('出库成功')
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }