Startsida Utforska Hjälp
Registrera dig Logga in
zhangbj
/
xt_vue
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 38 Pull-förfrågningar 0 Släpp 0 Wiki Activity
Bläddra i källkod

代码有冲突

张保健 5 år sedan
förälder
caa962be54 0a1104b25e
incheckning
995e734aaa
12 ändrade filer med 1345 tillägg och 652 borttagningar
Delad Vy Visa Diff Statistik
  1. 4 0
      config/dev.env.js
  2. 62 63
      src/api/dialysis_record.js
  3. 1007 546
      src/xt_pages/dialysis/batch_print/batch_print_order_other.vue
  4. 15 1
      src/xt_pages/dialysis/details/dialog/computer_dialog.vue
  5. 10 1
      src/xt_pages/dialysis/details/dialysisComputer.vue
  6. 219 37
      src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue
  7. 1 1
      src/xt_pages/stock/Dialog/salesReturnDialog.vue
  8. 2 1
      src/xt_pages/stock/Dialog/stockInDialog.vue
  9. 7 1
      src/xt_pages/stock/cancelStockOrderAdd.vue
  10. 6 0
      src/xt_pages/stock/salesReturnOrderAdd.vue
  11. 5 0
      src/xt_pages/stock/stockInOrderAdd.vue
  12. 7 1
      src/xt_pages/stock/stockOutOrderAdd.vue

+ 4 - 0
config/dev.env.js Visa fil 

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

+ 62 - 63
src/api/dialysis_record.js Visa fil 

@@ -1,82 +1,81 @@
1 1 
 import request from '@/utils/request'
2 2
3 
-export function getDialysisRecordInitData(){
4 
-    return request({
5 
-        url:'/api/dialysis/initdata',
6 
-        method:'get',
7 
-    })
3 
+export function getDialysisRecordInitData() {
4 
+  return request({
5 
+    url: '/api/dialysis/initdata',
6 
+    method: 'get'
7 
+  })
8 8 
 }
9 9
10 
-export function getDialysisSchedules(ymd){
11 
-    var params = {
12 
-        date: ymd,
13 
-    }
14 
-    return request({
15 
-        url:'/api/dialysis/schedules',
16 
-        method:'get',
17 
-        params: params,
18 
-    })
10 
+export function getDialysisSchedules(ymd) {
11 
+  var params = {
12 
+    date: ymd
13 
+  }
14 
+  return request({
15 
+    url: '/api/dialysis/schedules',
16 
+    method: 'get',
17 
+    params: params
18 
+  })
19 19 
 }
20 20
21 
-export function getDialysisScheduleDetail(patient_id, ymd){
22 
-    var params = {
23 
-        patient_id: patient_id,
24 
-        date: ymd,
25 
-    }
26 
-    return request({
27 
-        url:'/api/dislysis/schedule',
28 
-        method:'get',
29 
-        params: params,
30 
-    })
21 
+export function getDialysisScheduleDetail(patient_id, ymd) {
22 
+  var params = {
23 
+    patient_id: patient_id,
24 
+    date: ymd
25 
+  }
26 
+  return request({
27 
+    url: '/api/dislysis/schedule',
28 
+    method: 'get',
29 
+    params: params
30 
+  })
31 31 
 }
32 32
33 
-export function editMonitor(patient_id, schedule_date, data){
34 
-    var params = {
35 
-        patient_id: patient_id,
36 
-        schedule_date: schedule_date,
37 
-    }
38 
-    return request({
39 
-        url:'/api/dislysis/monitor/edit',
40 
-        method:'post',
41 
-        params: params,
42 
-        data: data,
43 
-    })
33 
+export function editMonitor(patient_id, schedule_date, data) {
34 
+  var params = {
35 
+    patient_id: patient_id,
36 
+    schedule_date: schedule_date
37 
+  }
38 
+  return request({
39 
+    url: '/api/dislysis/monitor/edit',
40 
+    method: 'post',
41 
+    params: params,
42 
+    data: data
43 
+  })
44 44 
 }
45 45
46 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id) {
47 
-    var params = {
48 
-        patient_id: patient_id,
49 
-        date: schedule_date,
50 
-        nurse: nurse_id,
51 
-        bed: bed_id,
52 
-    }
53 
-    return request({
54 
-        url:'/api/dialysis/start_record',
55 
-        method:'post',
56 
-        params: params,
57 
-    })
46 
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, puncture_nurse_id) {
47 
+  var params = {
48 
+    patient_id: patient_id,
49 
+    date: schedule_date,
50 
+    nurse: nurse_id,
51 
+    bed: bed_id,
52 
+    puncture_nurse: puncture_nurse_id
53 
+  }
54 
+  return request({
55 
+    url: '/api/dialysis/start_record',
56 
+    method: 'post',
57 
+    params: params
58 
+  })
58 59 
 }
59 60
60 
-export function finishDialysis(patient_id, schedule_date, nurse_id){
61 
-    var params = {
62 
-        patient_id: patient_id,
63 
-        date: schedule_date,
64 
-        nurse: nurse_id,
65 
-    }
66 
-    return request({
67 
-        url:'/api/dialysis/finish',
68 
-        method:'post',
69 
-        params: params,
70 
-    })
61 
+export function finishDialysis(patient_id, schedule_date, nurse_id) {
62 
+  var params = {
63 
+    patient_id: patient_id,
64 
+    date: schedule_date,
65 
+    nurse: nurse_id
66 
+  }
67 
+  return request({
68 
+    url: '/api/dialysis/finish',
69 
+    method: 'post',
70 
+    params: params
71 
+  })
71 72 
 }
72 73
73 
-
74 
-
75 74 
 export function postDelMonitorInfo(params) {
76 75 
   return request({
77 
-    url:'/api/dialysis/monitor/del',
78 
-    method:'post',
79 
-    params:params,
76 
+    url: '/api/dialysis/monitor/del',
77 
+    method: 'post',
78 
+    params: params
80 79 
   })
81 80 
 }
82 81

Filskillnaden har hållits tillbaka eftersom den är för stor
+ 1007 - 546
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue


+ 15 - 1
src/xt_pages/dialysis/details/dialog/computer_dialog.vue Visa fil 

@@ -12,6 +12,11 @@
12 12 
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
13 13 
           </el-select>
14 14 
         </el-form-item>
15 
+        <el-form-item label="穿刺护士">
16 
+          <el-select v-model="form.puncture_nurse_id" placeholder="" :disabled="dialysis_order.id != 0">
17 
+            <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
18 
+          </el-select>
19 
+        </el-form-item>
15 20 
         <el-form-item label="上机时间 :" style="width:300px">
16 21 
           <el-date-picker
17 22 
             :disabled="dialysis_order.id != 0"
 
@@ -52,6 +57,7 @@
52 57 
           bed_id: '',
53 58 
           nurse_id: '',
54 59 
           start_time:'',
60 
+          puncture_nurse_id:'',
55 61 
         }
56 62 
       }
57 63 
     },
 
@@ -77,6 +83,12 @@
77 83
78 84 
       this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
79 85 
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
86 
+      this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
87 
+
88 
+      if(this.form.puncture_nurse_id == 0){
89 
+        this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
90 
+      }
91 
+
80 92
81 93 
       var nowDate = new Date()
82 94 
       var nowYear = nowDate.getFullYear()
 
@@ -106,6 +118,8 @@
106 118 
         console.log(this.dialysis_order)
107 119 
         this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
108 120 
         this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
121 
+        this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
122 
+
109 123 
         this.form.start_time = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_time
110 124
111 125 
       }
 
@@ -137,7 +151,7 @@
137 151 
       },
138 152 
       submit: function() {
139 153 
         this.loading = true
140 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id).then(rs => {
154 
+        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 => {
141 155 
           this.loading = false
142 156 
           var resp = rs.data
143 157 
           if (resp.state == 1) {

+ 10 - 1
src/xt_pages/dialysis/details/dialysisComputer.vue Visa fil 

@@ -11,6 +11,10 @@
11 11 
           <label>上机护士 : </label>
12 12 
           <span class="content">{{ nurse }}</span>
13 13 
         </li>
14 
+        <li>
15 
+          <label>穿刺护士 : </label>
16 
+          <span class="content">{{ puncture_nurse }}</span>
17 
+        </li>
14 18 
         <li>
15 19 
           <label>状态 : </label>
16 20 
           <span class="content">{{ stage }}</span>
 
@@ -71,7 +75,12 @@
71 75 
       return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时{i}分");
72 76
73 77
74 
-    },
78 
+    },puncture_nurse:function() {
79 
+      if (this.record.id == 0) {
80 
+        return "-"
81 
+      }
82 
+      return this.admin_map[this.record.puncture_nurse] == null ? "" : this.admin_map[this.record.puncture_nurse].name
83 
+    }
75 84 
   },
76 85 
   methods: {
77 86

+ 219 - 37
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Visa fil 

@@ -12,7 +12,7 @@
12 12 
         </div>
13 13 
         <div class="inline_block" style="margin-left:25px;">
14 14 
           姓名：
15 
-          <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
15 
+          <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
16 16 
         </div>
17 17 
         <div class="inline_block" style="margin-left: 25px;">
18 18 
           性别：
 
@@ -22,12 +22,12 @@
22 22 
         </div>
23 23 
         <div class="inline_block" style="margin-left: 25px;">
24 24 
           年龄：
25 
-          <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
25 
+          <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
26 26 
           岁
27 27 
         </div>
28 28 
         <div class="inline_block" style="margin-left: 25px;">
29 29 
           住院号：
30 
-          <div class="under_line" style="width: 100px;">
30 
+          <div class="under_line" style="width: 100px;text-align: left">
31 31 
             {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
32 32 
           </div>
33 33 
         </div>
 
@@ -56,16 +56,16 @@
56 56 
                   </div>
57 57 
                   <div class="inline_block" style="margin-left: 30px;">
58 58 
                     透析频次：
59 
-                    <div class="under_line" style="width: 50px;">
59 
+                    <div class="under_line" style="width: 50px;text-align: left">
60 60 
                       {{predialysis.dialysis_count?predialysis.dialysis_count:''}}
61 61 
                     </div>
62 62 
                     次/周
63 63 
                   </div>
64 64 
                   <div class="inline_block" style="margin-left: 30px;">
65 65 
                     透析机编号：
66 
-                    <div class="under_line" style="width: 100px;">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:''}}</div>
66 
+                    <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>
67 67 
                     型号
68 
-                    <div class="under_line" style="width: 100px;">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
68 
+                    <div class="under_line" style="width: 100px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
69 69 
                   </div>
70 70 
                 </div>
71 71 
                 <div class="row" style="padding: 2px 0;line-height:19px;">
 
@@ -85,7 +85,7 @@
85 85 
                     <check-box text="消化道出血" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('消化道出血')>-1?true:false"></check-box>
86 86 
                     <check-box text="女性经期" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('女性经期')>-1?true:false"></check-box>
87 87 
                     其他：
88 
-                    <div class="under_line" style="width: 100px;">
88 
+                    <div class="under_line" style="width: 100px;text-align: left">
89 89 
                         <span v-if="predialysis.is_hemorrhage==1">
90 90 
                           {{predialysis.hemorrhage_other}}
91 91 
                         </span>
 
@@ -105,7 +105,7 @@
105 105 
                   </div>
106 106 
                   <div class="inline_block">
107 107 
                     其它：
108 
-                    <div class="under_line" style="width: 300px;">{{predialysis.internal_fistula_other}}
108 
+                    <div class="under_line" style="width: 300px;text-align: left">{{predialysis.internal_fistula_other}}
109 109 
                     </div>
110 110 
                   </div>
111 111 
                 </div>
 
@@ -133,8 +133,8 @@
133 133 
                     <check-box text="股静脉" :checked="predialysis.venous_catheterization_part == 3?true:false"></check-box>
134 134 
                     <div class="inline_block">
135 135 
                       其它：
136 
-                      <div class="under_line" style="width: 50px;">
137 
-                          <span v-if="predialysis.venous_catheterization_part == -1">{{predialysis.venous_catheterization_part_other}}</span>
136 
+                      <div class="under_line" style="width: 50px;text-align: left">
137 
+                          <span>{{predialysis.venous_catheterization_part_other}}</span>
138 138 
                       </div>
139 139 
                     </div>
140 140 
                   </div>
 
@@ -162,7 +162,7 @@
162 162 
                     <check-box text="重症酸中毒" :checked="predialysis.emergency_treatment == 3?true:false"></check-box>
163 163 
                     <div class="inline_block">
164 164 
                       其它：
165 
-                      <div class="under_line" style="width: 100px;">
165 
+                      <div class="under_line" style="width: 100px;text-align: left">
166 166 
                         <span v-if="predialysis.emergency_treatment == -1">{{predialysis.emergency_treatment_other}}</span>
167 167 
                       </div>
168 168 
                     </div>
 
@@ -181,7 +181,7 @@
181 181 
                 <div class="row" style="padding: 2px 0;line-height:19px;">
182 182 
                   <div class="inline_block">
183 183 
                     跌倒风险评估：&nbsp;评分：
184 
-                    <div class="under_line" style="width: 50px;"> {{receiverTreatmentAccess.score}}</div>分
184 
+                    <div class="under_line" style="width: 50px;text-align: left"> {{receiverTreatmentAccess.score}}</div>分
185 185 
                     &emsp;风险程度：
186 186 
                     <check-box text="无" :checked="receiverTreatmentAccess.danger_level == 1?true:false"></check-box>
187 187 
                     <check-box text="低风险" :checked="receiverTreatmentAccess.danger_level == 2?true:false"></check-box>
 
@@ -296,7 +296,7 @@
296 296 
           </div>
297 297 
           <div class="inline_block" style="margin-left:25px;">
298 298 
             姓名：
299 
-            <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
299 
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
300 300 
           </div>
301 301 
           <div class="inline_block" style="margin-left: 25px;">
302 302 
             性别：
 
@@ -306,12 +306,12 @@
306 306 
           </div>
307 307 
           <div class="inline_block" style="margin-left: 25px;">
308 308 
             年龄：
309 
-            <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
309 
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
310 310 
             岁
311 311 
           </div>
312 312 
           <div class="inline_block" style="margin-left: 25px;">
313 313 
             住院号：
314 
-            <div class="under_line" style="width: 100px;">
314 
+            <div class="under_line" style="width: 100px;text-align: left">
315 315 
               {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
316 316 
             </div>
317 317 
           </div>
 
@@ -373,7 +373,7 @@
373 373 
                     <check-box text="完成" :checked="afterdialysis.dialysis_process==1?true:false"></check-box>
374 374 
                     <check-box text="提前" :checked="afterdialysis.dialysis_process==2?true:false"></check-box>
375 375 
                     <div class="inline_block">
376 
-                      <div class="under_line" style="width: 30px;">
376 
+                      <div class="under_line" style="width: 30px;text-align: left">
377 377 
                         <span v-if="afterdialysis.dialysis_process==2">{{afterdialysis.in_advance_minute}}</span>
378 378 
                       </div>
379 379 
                       min
 
@@ -389,7 +389,7 @@
389 389 
                     <div class="inline_block">
390 390 
                     &emsp; 其他原因：
391 391 
                     <div class="inline_block">
392 
-                      <div class="under_line" style="width: 150px;">
392 
+                      <div class="under_line" style="width: 150px;text-align: left">
393 393 
                         <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
394 394 
                       </div>
395 395 
                     </div>
 
@@ -399,7 +399,7 @@
399 399 
                   <div class="inline_block">
400 400 
                     内瘘管拔针后压迫止血时间：
401 401 
                     <div class="inline_block">
402 
-                      <div class="under_line" style="width: 30px;">
402 
+                      <div class="under_line" style="width: 30px;text-align: left">
403 403 
                         <span v-if="afterdialysis.hemostasis_minute">{{afterdialysis.hemostasis_minute}}</span>
404 404 
                       </div>
405 405 
                       min
 
@@ -471,27 +471,44 @@
471 471 
                 <div class="row" style="padding: 2px 0;line-height:19px;">
472 472 
                     <div class="inline_block" >
473 473 
                       责任护士：
474 
-                      <div class="under_line" style="width: 100px;">
474 
+                      <div class="under_line" style="width: 100px;text-align: left">
475 475 
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
476 476 
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
477 477 
                       </div>
478 478 
                     </div>
479 
-                    <div class="inline_block" >
480 
-                      &emsp;核对人：
481 
-                      <div class="under_line" style="width: 100px;">
482 
-                        <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
483 
-                        <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
484 
-                      </div>
479 
+                  <div class="inline_block" >
480 
+                    穿刺者：
481 
+                    <div class="under_line" style="width: 100px;text-align: left">
482 
+                      <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
483 
+                      <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
485 484 
                     </div>
486 
-                    <div class="inline_block">
487 
-                      &emsp;核对时间：
488 
-                      <div class="under_line" style="width: 200px;">
489 
-                        {{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时{i}分')}}
490 
-                      </div>
485 
+                  </div>
486 
+
487 
+
488 
+                  <div class="inline_block" >
489 
+                    &emsp;核对人：
490 
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.modifier">
491 
+                      <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
492 
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
493 
+                    </div>
494 
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.creater">
495 
+                      <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
496 
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
497 
+                    </div>
498 
+                  </div>
499 
+                  <div class="inline_block">
500 
+                    &emsp;核对时间：
501 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.first_check_time > check.check_time">
502 
+                      {{getTime(check.check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
491 503 
                     </div>
504 
+
505 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.check_time > check.first_check_time">
506 
+                      {{getTime(check.first_check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
507 
+                    </div>
508 
+                  </div>
492 509 
                     <div class="inline_block" >
493 510 
                       &emsp;收针者：
494 
-                      <div class="under_line" style="width: 100px;">
511 
+                      <div class="under_line" style="width: 100px;text-align: left">
495 512 
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
496 513 
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
497 514 
                       </div>
 
@@ -516,19 +533,19 @@
516 533 
                 <div class="row" style="padding: 2px 0; line-height:19px;">
517 534 
                   <div class="inline_block" >
518 535 
                     血透室护士签名：
519 
-                    <div class="under_line" style="width: 100px;">
536 
+                    <div class="under_line" style="width: 100px;text-align: left">
520 537 
                       <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
521 538 
                       <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
522 539 
                     </div>
523 540 
                   </div>
524 541 
                   <div class="inline_block" >
525 542 
                     &emsp;病区护士签名：
526 
-                    <div class="under_line" style="width: 100px;">
543 
+                    <div class="under_line" style="width: 100px;text-align: left">
527 544 
                     </div>
528 545 
                   </div>
529 546 
                   <div class="inline_block">
530 547 
                     &emsp;时间：
531 
-                    <div class="under_line" style="width: 200px;" v-if="dialysisOrder != null">
548 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="dialysisOrder != null">
532 549 
                       {{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时{i}分')}}
533 550 
                     </div>
534 551 
                   </div>
 
@@ -545,6 +562,7 @@
545 562 
             </tr>
546 563 
           </tbody>
547 564 
         </table>
565 
+<<<<<<< HEAD
548 566 
         <div v-if="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9)" class="print-yema3" >2</div>
549 567 
         <div v-else class="print-yema2">1</div>
550 568 
       </div>
 
@@ -557,6 +575,39 @@
557 575 
           科室：
558 576 
           <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
559 577 
           <check-box text="住院" :checked="patientInfo_source_2"></check-box>
578 
+=======
579 
+        <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>
580 
+        <div v-else class="margin-bottom-300" style="text-align:center;margin-top:10px;">1</div>
581 
+
582 
+        <div class="order-yy-name">{{orgname}}</div>
583 
+        <div class="order_title"> 血液净化科医嘱及执行单 </div>
584 
+        <div class="row" style="margin-top: 15px;">
585 
+          <div class="inline_block" >
586 
+            科室：
587 
+            <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
588 
+            <check-box text="住院" :checked="patientInfo_source_2"></check-box>
589 
+          </div>
590 
+          <div class="inline_block" style="margin-left:25px;">
591 
+            姓名：
592 
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
593 
+          </div>
594 
+          <div class="inline_block" style="margin-left: 25px;">
595 
+            性别：
596 
+            <check-box text="男" :checked="patientInfo_gender_1"></check-box>
597 
+            <check-box text="女" :checked="patientInfo_gender_2"></check-box>
598 
+          </div>
599 
+          <div class="inline_block" style="margin-left: 25px">
600 
+            年龄：
601 
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
602 
+            岁
603 
+          </div>
604 
+          <div class="inline_block" style="margin-left:25px;">
605 
+            住院号：
606 
+            <div class="under_line" style="width: 120px;text-align: left">
607 
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
608 
+            </div>
609 
+          </div>
610 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
560 611 
         </div>
561 612 
         <div class="inline_block" style="margin-left:25px;">
562 613 
           姓名：
 
@@ -594,12 +645,16 @@
594 645 
                   <!--诊断：-->
595 646 
                   <!--<div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>-->
596 647 
                 <!--</div>-->
648 
+<<<<<<< HEAD
597 649 
               <!--</div>-->
598 650 
               <div class="row" style="padding: 2px 0;line-height:24px;">
599 651 
                 <div class="inline_block" >
600 652 
                   诊断：
601 653 
                   <div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>
602 654 
                 </div>
655 
+=======
656 
+                <div class="row" style="padding: 2px 0;line-height:24px;">
657 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
603 658
604 659 
                 <div class="inline_block" style="margin-left: -10px" >
605 660 
                   &emsp;治疗方式：
 
@@ -610,6 +665,7 @@
610 665 
                   <check-box text="HD+HP" :checked="prescription.mode_id==3?true:false"></check-box>
611 666 
                 </div>
612 667
668 
+<<<<<<< HEAD
613 669 
                 <!--<div class="inline_block"  v-if="patientInfo.diagnose.length <= 10">-->
614 670 
                   <!--&emsp;治疗方式：-->
615 671 
                   <!--<check-box text="HD" :checked="prescription.mode_id==1?true:false"></check-box>-->
 
@@ -632,6 +688,32 @@
632 688 
                   h
633 689 
                   <div class="under_line" style="width: 30px;">
634 690 
                     {{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}
691 
+=======
692 
+                  <!--<div class="inline_block"  v-if="patientInfo.diagnose.length <= 10">-->
693 
+                    <!--&emsp;治疗方式：-->
694 
+                    <!--<check-box text="HD" :checked="prescription.mode_id==1?true:false"></check-box>-->
695 
+                    <!--<check-box text="HDF" :checked="prescription.mode_id==2?true:false"></check-box>-->
696 
+                    <!--<check-box text="HF" :checked="prescription.mode_id==5?true:false"></check-box>-->
697 
+                    <!--<check-box text="HP" :checked="prescription.mode_id==4?true:false"></check-box>-->
698 
+                    <!--<check-box text="HD+HP" :checked="prescription.mode_id==3?true:false"></check-box>-->
699 
+                  <!--</div>-->
700 
+                  <div class="inline_block" style="margin-left:20px;">
701 
+                    其它：
702 
+                    <div class="under_line" style="width: 100px;text-align: left">
703 
+                      <span v-if="prescription.mode_id>5">{{prescription.mode}}</span>
704 
+                    </div>
705 
+                  </div>
706 
+                  <div class="inline_block" style="margin-left:20px;">
707 
+                    治疗时间：
708 
+                    <div class="under_line" style="width: 30px;text-align: left">
709 
+                      {{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}
710 
+                    </div>
711 
+                    h
712 
+                    <div class="under_line" style="width: 30px;text-align: left">
713 
+                      {{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}
714 
+                    </div>
715 
+                    min
716 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
635 717 
                   </div>
636 718 
                   min
637 719 
                 </div>
 
@@ -663,6 +745,7 @@
663 745 
                   <div class="under_line" style="width: 100px;">
664 746 
                     <div class="under-line" v-if="prescription&&prescription.body_fluid_other.length > 0">&nbsp;{{prescription.body_fluid_other}}</div>
665 747 
                   </div>
748 
+<<<<<<< HEAD
666 749 
                 </div> -->
667 750 
                 <div class="inline_block" style="margin-left:20px;">
668 751 
                   透析前使用特殊药物：
 
@@ -695,9 +778,37 @@
695 778 
                   <div class="under_line" style="width: 70px;">
696 779 
                     <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
697 780 
                     <span v-else>{{'/'}}</span>
781 
+=======
782 
+                  <div class="inline_block">
783 
+                    其它：
784 
+                    <div class="under_line" style="width: 100px;text-align: left">
785 
+                      <span v-if="prescription.special_medicine == -1">{{prescription.special_medicine_other}}</span>
786 
+                    </div>
787 
+                  </div>
788 
+                </div>
789 
+                <div class="row" style="padding: 2px 0;line-height:24px;">
790 
+                  <div class="inline_block">
791 
+                    透析液(mmol/L)： &emsp;Ca<sup>2+</sup>：
792 
+                    <div class="under_line" style="width: 70px;text-align: left">
793 
+                        <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
794 
+                      <span v-else>{{'/'}}</span>
795 
+
796 
+                    </div>
797 
+                    mmol/L &emsp;Na<sup>+</sup>：
798 
+                    <div class="under_line" style="width: 70px;text-align: left">
799 
+                      <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
800 
+                      <span v-else>{{'/'}}</span>
801 
+
802 
+                    </div>
803 
+                    mmol/L &emsp;K<sup>+</sup>：
804 
+                    <div class="under_line" style="width: 70px;text-align: left">
805 
+                      <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
806 
+                      <span v-else>{{'/'}}</span>
807 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
698 808
699 809
700 810 
                   </div>
811 
+<<<<<<< HEAD
701 812 
                   mmol/L
702 813 
                 </div>
703 814 
                 <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
 
@@ -711,6 +822,28 @@
711 822 
                   &emsp;置换液前稀释 总量：
712 823 
                   <div class="under_line" style="width: 100px;">
713 824 
                     {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
825 
+=======
826 
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
827 
+                    &emsp;置换液后/前稀释 总量：
828 
+                    <div class="under_line" style="width: 70px;text-align: left">
829 
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
830 
+                    </div>
831 
+                    L
832 
+                  </div>
833 
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 1">
834 
+                    &emsp;置换液前稀释 总量：
835 
+                    <div class="under_line" style="width: 70px;text-align: left">
836 
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
837 
+                    </div>
838 
+                    L
839 
+                  </div>
840 
+                  <div class="inline_block" v-if="prescription.displace_liqui_part == 2">
841 
+                    &emsp;置换液后稀释 总量：
842 
+                    <div class="under_line" style="width: 70px;text-align: left">
843 
+                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
844 
+                    </div>
845 
+                    L
846 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
714 847 
                   </div>
715 848 
                   L
716 849 
                 </div>
 
@@ -719,6 +852,7 @@
719 852 
                   <div class="under_line" style="width: 100px;">
720 853 
                     {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
721 854 
                   </div>
855 
+<<<<<<< HEAD
722 856 
                   L
723 857 
                 </div>
724 858 
               </div>
 
@@ -740,9 +874,25 @@
740 874 
                   &emsp;透析液流量：
741 875 
                   <div class="under_line" style="width: 100px;">
742 876 
                     {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
877 
+=======
878 
+                  <div class="inline_block">
879 
+                    &emsp;血流量：
880 
+                    <div class="under_line" style="width: 70px;text-align: left">
881 
+                      {{prescription.blood_flow_volume?prescription.blood_flow_volume:'/'}}
882 
+                    </div>
883 
+                    ml/min
884 
+                  </div>
885 
+                  <div class="inline_block">
886 
+                    &emsp;透析液流量：
887 
+                    <div class="under_line" style="width: 70px;text-align: left">
888 
+                      {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
889 
+                    </div>
890 
+                    ml/min
891 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
743 892 
                   </div>
744 893 
                   ml/min
745 894 
                 </div>
895 
+<<<<<<< HEAD
746 896 
               </div>
747 897 
               <div class="row" style="padding: 2px 0;line-height:24px;">
748 898 
                 <div class="inline_block">
 
@@ -770,6 +920,38 @@
770 920 
                   透后体重：
771 921 
                   <div class="under_line" style="width: 100px;">
772 922 
                     {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
923 
+=======
924 
+                <div class="row" style="padding: 2px 0;line-height:24px;">
925 
+                  <div class="inline_block">
926 
+                    透前体重：
927 
+                    <div class="under_line" style="width: 70px;text-align: left">
928 
+                      {{predialysis.weight_before?predialysis.weight_before:'/'}}
929 
+                    </div>
930 
+                    kg
931 
+                  </div>
932 
+                  <div class="inline_block">
933 
+                    &emsp;设定超滤量：
934 
+                    <div class="under_line" style="width: 70px;text-align: left">
935 
+                      {{getFloat(prescription.target_ultrafiltration)?getFloat(prescription.target_ultrafiltration):'/'}}
936 
+
937 
+                    </div>
938 
+                    L
939 
+                  </div>
940 
+                  <div class="inline_block">
941 
+                    &emsp;实际超滤量：
942 
+                    <div class="under_line" style="width: 70px;text-align: left">
943 
+                      {{getFloat(prescription.ultrafiltration)?getFloat(prescription.ultrafiltration):'/'}}
944 
+                    </div>
945 
+                    L
946 
+
947 
+                  </div>
948 
+                  <div class="inline_block">
949 
+                    透后体重：
950 
+                    <div class="under_line" style="width: 70px;text-align: left">
951 
+                      {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
952 
+                    </div>
953 
+                    kg
954 
+>>>>>>> 0a1104b25eb473d9c754af818c503b9a715bd2b1
773 955 
                   </div>
774 956 
                   kg
775 957 
                 </div>
 
@@ -852,7 +1034,7 @@
852 1034 
             </div>
853 1035 
             <div class="inline_block" style="margin-left:25px;">
854 1036 
               姓名：
855 
-              <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
1037 
+              <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
856 1038 
             </div>
857 1039 
             <div class="inline_block" style="margin-left: 25px;">
858 1040 
               性别：
 
@@ -861,12 +1043,12 @@
861 1043 
             </div>
862 1044 
             <div class="inline_block" style="margin-left: 25px;">
863 1045 
               年龄：
864 
-              <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
1046 
+              <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
865 1047 
               岁
866 1048 
             </div>
867 1049 
             <div class="inline_block" style="margin-left:25px;">
868 1050 
               住院号：
869 
-              <div class="under_line" style="width: 120px;">
1051 
+              <div class="under_line" style="width: 120px;text-align: left">
870 1052 
                 {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
871 1053 
               </div>
872 1054 
             </div>

+ 1 - 1
src/xt_pages/stock/Dialog/salesReturnDialog.vue Visa fil 

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

+ 2 - 1
src/xt_pages/stock/Dialog/stockInDialog.vue Visa fil 

@@ -246,7 +246,8 @@
246 246 
         }
247 247
248 248 
       }, clickRow: function(row) {
249 
-        this.$refs.multipleTable.toggleRowSelection(row)
249 
+        // this.$refs.multipleTable.toggleRowSelection(row)
250 
+
250 251 
       }, newGroupObject: function() {
251 252 
         return Object.assign(
252 253 
           {},

+ 7 - 1
src/xt_pages/stock/cancelStockOrderAdd.vue Visa fil 

@@ -414,6 +414,12 @@
414 414 
               }
415 415 
               total = total + array[i].price * array[i].return_count
416 416 
             }
417 
+
418 
+            if(this.recordInfo.recordData.length <= 0){
419 
+              this.$message.success('请添加退库商品')
420 
+              return
421 
+            }
422 
+
417 423 
             const params = {
418 424 
               'cancelStock': this.recordInfo.recordData
419 425 
             }
 
@@ -424,7 +430,7 @@
424 430 
               } else {
425 431 
                 this.$notify({
426 432 
                   title: '成功',
427 
-                  message: '退货成功',
433 
+                  message: '退库成功',
428 434 
                   type: 'success',
429 435 
                   duration: 2000
430 436 
                 })

+ 6 - 0
src/xt_pages/stock/salesReturnOrderAdd.vue Visa fil 

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

+ 5 - 0
src/xt_pages/stock/stockInOrderAdd.vue Visa fil 

@@ -590,6 +590,11 @@
590 590 
               }
591 591 
             }
592 592
593 
+            if(this.recordInfo.recordData.length <= 0){
594 
+              this.$message.success('请添加入库商品')
595 
+              return
596 
+            }
597 
+
593 598 
             const params = {
594 599 
               'stockIn': this.recordInfo.recordData
595 600 
             }

+ 7 - 1
src/xt_pages/stock/stockOutOrderAdd.vue Visa fil 

@@ -504,6 +504,12 @@
504 504 
               }
505 505 
               total = total + array[i].price * array[i].return_count
506 506 
             }
507 
+            if(this.recordInfo.recordData.length <= 0){
508 
+              this.$message.success('请添加出库商品')
509 
+              return
510 
+            }
511 
+
512 
+
507 513 
             const params = {
508 514 
               'stockOut': this.recordInfo.recordData
509 515 
             }
 
@@ -514,7 +520,7 @@
514 520 
                 this.$message.error(response.data.msg)
515 521 
                 return false
516 522 
               } else {
517 
-                this.$message.success('退货成功')
523 
+                this.$message.success('出库成功')
518 524 
                 this.recordInfo.recordData = []
519 525 
                 this.$router.back(-1)
520 526 
               }