Accueil Explorateur Aide
S'inscrire Connexion
zhangbj
/
xt_vue
Suivre 1
Voter 0
Bifurcation 0
Code Tickets 38 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

修改华侨医院

csx il y a 5 ans
Parent
7c0367f50f
révision
ed95305b15
14 fichiers modifiés avec 1150 ajouts et 861 suppressions
Vue séparée Afficher les stats Diff
  1. 1 1
      config/dev.env.js
  2. 1 1
      config/sit.env.js
  3. 62 63
      src/api/dialysis_record.js
  4. 942 714
      src/xt_pages/dialysis/batch_print/batch_print_order_other.vue
  5. 15 1
      src/xt_pages/dialysis/details/dialog/computer_dialog.vue
  6. 10 1
      src/xt_pages/dialysis/details/dialysisComputer.vue
  7. 78 63
      src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue
  8. 1 1
      src/xt_pages/stock/Dialog/salesReturnDialog.vue
  9. 2 1
      src/xt_pages/stock/Dialog/stockInDialog.vue
  10. 7 1
      src/xt_pages/stock/cancelStockOrderAdd.vue
  11. 6 0
      src/xt_pages/stock/salesReturnOrderAdd.vue
  12. 5 0
      src/xt_pages/stock/stockInOrderAdd.vue
  13. 7 1
      src/xt_pages/stock/stockOutOrderAdd.vue
  14. 13 13
      src/xt_permission.js

+ 1 - 1
config/dev.env.js Voir le fichier 

@@ -6,7 +6,7 @@
6 6 
 module.exports = {
7 7 
   NODE_ENV: '"development"',
8 8 
   ENV_CONFIG: '"dev"',
9 
-  BASE_API: '"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
9 
+  BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
10 10
11 11 
   SSO_HOST: '"http://testsso.sgjyun.com"',
12 12 
   SRCM_HOST: '"http://test1.sgjyun.com"',

+ 1 - 1
config/sit.env.js Voir le fichier 

@@ -1,7 +1,7 @@
1 1 
 module.exports = {
2 2 
   NODE_ENV: '"production"',
3 3 
   ENV_CONFIG: '"sit"',
4 
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
4 
+  BASE_API: '"https://api.xt.test.sgjyun.com"',
5 5
6 6 
   SSO_HOST: '"http://testsso.sgjyun.com"',
7 7 
   SRCM_HOST: '"http://test1.sgjyun.com"',

+ 62 - 63
src/api/dialysis_record.js Voir le fichier 

@@ -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

Fichier diff supprimé car celui-ci est trop grand
+ 942 - 714
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue


+ 15 - 1
src/xt_pages/dialysis/details/dialog/computer_dialog.vue Voir le fichier 

@@ -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 Voir le fichier 

@@ -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

+ 78 - 63
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Voir le fichier 

@@ -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>
 
@@ -295,7 +295,7 @@
295 295 
           </div>
296 296 
           <div class="inline_block" style="margin-left:25px;">
297 297 
             姓名：
298 
-            <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
298 
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
299 299 
           </div>
300 300 
           <div class="inline_block" style="margin-left: 25px;">
301 301 
             性别：
 
@@ -305,12 +305,12 @@
305 305 
           </div>
306 306 
           <div class="inline_block" style="margin-left: 25px;">
307 307 
             年龄：
308 
-            <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
308 
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
309 309 
             岁
310 310 
           </div>
311 311 
           <div class="inline_block" style="margin-left: 25px;">
312 312 
             住院号：
313 
-            <div class="under_line" style="width: 100px;">
313 
+            <div class="under_line" style="width: 100px;text-align: left">
314 314 
               {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
315 315 
             </div>
316 316 
           </div>
 
@@ -372,7 +372,7 @@
372 372 
                     <check-box text="完成" :checked="afterdialysis.dialysis_process==1?true:false"></check-box>
373 373 
                     <check-box text="提前" :checked="afterdialysis.dialysis_process==2?true:false"></check-box>
374 374 
                     <div class="inline_block">
375 
-                      <div class="under_line" style="width: 30px;">
375 
+                      <div class="under_line" style="width: 30px;text-align: left">
376 376 
                         <span v-if="afterdialysis.dialysis_process==2">{{afterdialysis.in_advance_minute}}</span>
377 377 
                       </div>
378 378 
                       min
 
@@ -388,7 +388,7 @@
388 388 
                     <div class="inline_block">
389 389 
                     &emsp; 其他原因：
390 390 
                     <div class="inline_block">
391 
-                      <div class="under_line" style="width: 150px;">
391 
+                      <div class="under_line" style="width: 150px;text-align: left">
392 392 
                         <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
393 393 
                       </div>
394 394 
                     </div>
 
@@ -398,7 +398,7 @@
398 398 
                   <div class="inline_block">
399 399 
                     内瘘管拔针后压迫止血时间：
400 400 
                     <div class="inline_block">
401 
-                      <div class="under_line" style="width: 30px;">
401 
+                      <div class="under_line" style="width: 30px;text-align: left">
402 402 
                         <span v-if="afterdialysis.hemostasis_minute">{{afterdialysis.hemostasis_minute}}</span>
403 403 
                       </div>
404 404 
                       min
 
@@ -470,27 +470,44 @@
470 470 
                 <div class="row" style="padding: 2px 0;line-height:19px;">
471 471 
                     <div class="inline_block" >
472 472 
                       责任护士：
473 
-                      <div class="under_line" style="width: 100px;">
473 
+                      <div class="under_line" style="width: 100px;text-align: left">
474 474 
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
475 475 
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
476 476 
                       </div>
477 477 
                     </div>
478 
-                    <div class="inline_block" >
479 
-                      &emsp;核对人：
480 
-                      <div class="under_line" style="width: 100px;">
481 
-                        <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
482 
-                        <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
483 
-                      </div>
478 
+                  <div class="inline_block" >
479 
+                    穿刺者：
480 
+                    <div class="under_line" style="width: 100px;text-align: left">
481 
+                      <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
482 
+                      <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
484 483 
                     </div>
485 
-                    <div class="inline_block">
486 
-                      &emsp;核对时间：
487 
-                      <div class="under_line" style="width: 200px;">
488 
-                        {{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时{i}分')}}
489 
-                      </div>
484 
+                  </div>
485 
+
486 
+
487 
+                  <div class="inline_block" >
488 
+                    &emsp;核对人：
489 
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.modifier">
490 
+                      <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
491 
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
492 
+                    </div>
493 
+                    <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.creater">
494 
+                      <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
495 
+                      <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
496 
+                    </div>
497 
+                  </div>
498 
+                  <div class="inline_block">
499 
+                    &emsp;核对时间：
500 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.first_check_time > check.check_time">
501 
+                      {{getTime(check.check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
490 502 
                     </div>
503 
+
504 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="check.check_time > check.first_check_time">
505 
+                      {{getTime(check.first_check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
506 
+                    </div>
507 
+                  </div>
491 508 
                     <div class="inline_block" >
492 509 
                       &emsp;收针者：
493 
-                      <div class="under_line" style="width: 100px;">
510 
+                      <div class="under_line" style="width: 100px;text-align: left">
494 511 
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
495 512 
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
496 513 
                       </div>
 
@@ -515,19 +532,19 @@
515 532 
                 <div class="row" style="padding: 2px 0; line-height:19px;">
516 533 
                   <div class="inline_block" >
517 534 
                     血透室护士签名：
518 
-                    <div class="under_line" style="width: 100px;">
535 
+                    <div class="under_line" style="width: 100px;text-align: left">
519 536 
                       <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
520 537 
                       <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
521 538 
                     </div>
522 539 
                   </div>
523 540 
                   <div class="inline_block" >
524 541 
                     &emsp;病区护士签名：
525 
-                    <div class="under_line" style="width: 100px;">
542 
+                    <div class="under_line" style="width: 100px;text-align: left">
526 543 
                     </div>
527 544 
                   </div>
528 545 
                   <div class="inline_block">
529 546 
                     &emsp;时间：
530 
-                    <div class="under_line" style="width: 200px;" v-if="dialysisOrder != null">
547 
+                    <div class="under_line" style="width: 200px;text-align: left" v-if="dialysisOrder != null">
531 548 
                       {{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时{i}分')}}
532 549 
                     </div>
533 550 
                   </div>
 
@@ -557,21 +574,21 @@
557 574 
           </div>
558 575 
           <div class="inline_block" style="margin-left:25px;">
559 576 
             姓名：
560 
-            <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
577 
+            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
561 578 
           </div>
562 579 
           <div class="inline_block" style="margin-left: 25px;">
563 580 
             性别：
564 581 
             <check-box text="男" :checked="patientInfo_gender_1"></check-box>
565 582 
             <check-box text="女" :checked="patientInfo_gender_2"></check-box>
566 583 
           </div>
567 
-          <div class="inline_block" style="margin-left: 25px;">
584 
+          <div class="inline_block" style="margin-left: 25px">
568 585 
             年龄：
569 
-            <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
586 
+            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
570 587 
             岁
571 588 
           </div>
572 589 
           <div class="inline_block" style="margin-left:25px;">
573 590 
             住院号：
574 
-            <div class="under_line" style="width: 120px;">
591 
+            <div class="under_line" style="width: 120px;text-align: left">
575 592 
               {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
576 593 
             </div>
577 594 
           </div>
 
@@ -593,10 +610,6 @@
593 610 
                   <!--</div>-->
594 611 
                 <!--</div>-->
595 612 
                 <div class="row" style="padding: 2px 0;line-height:24px;">
596 
-                  <div class="inline_block" >
597 
-                    诊断：
598 
-                    <div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>
599 
-                  </div>
600 613
601 614 
                   <div class="inline_block" style="margin-left: -10px" >
602 615 
                     &emsp;治疗方式：
 
@@ -617,17 +630,17 @@
617 630 
                   <!--</div>-->
618 631 
                   <div class="inline_block" style="margin-left:20px;">
619 632 
                     其它：
620 
-                    <div class="under_line" style="width: 100px;">
633 
+                    <div class="under_line" style="width: 100px;text-align: left">
621 634 
                       <span v-if="prescription.mode_id>5">{{prescription.mode}}</span>
622 635 
                     </div>
623 636 
                   </div>
624 637 
                   <div class="inline_block" style="margin-left:20px;">
625 638 
                     治疗时间：
626 
-                    <div class="under_line" style="width: 30px;">
639 
+                    <div class="under_line" style="width: 30px;text-align: left">
627 640 
                       {{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}
628 641 
                     </div>
629 642 
                     h
630 
-                    <div class="under_line" style="width: 30px;">
643 
+                    <div class="under_line" style="width: 30px;text-align: left">
631 644 
                       {{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}
632 645 
                     </div>
633 646 
                     min
 
@@ -669,7 +682,7 @@
669 682 
                   </div>
670 683 
                   <div class="inline_block">
671 684 
                     其它：
672 
-                    <div class="under_line" style="width: 100px;">
685 
+                    <div class="under_line" style="width: 100px;text-align: left">
673 686 
                       <span v-if="prescription.special_medicine == -1">{{prescription.special_medicine_other}}</span>
674 687 
                     </div>
675 688 
                   </div>
 
@@ -677,19 +690,19 @@
677 690 
                 <div class="row" style="padding: 2px 0;line-height:24px;">
678 691 
                   <div class="inline_block">
679 692 
                     透析液(mmol/L)： &emsp;Ca<sup>2+</sup>：
680 
-                    <div class="under_line" style="width: 70px;">
693 
+                    <div class="under_line" style="width: 70px;text-align: left">
681 694 
                         <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
682 695 
                       <span v-else>{{'/'}}</span>
683 696
684 697 
                     </div>
685 698 
                     mmol/L &emsp;Na<sup>+</sup>：
686 
-                    <div class="under_line" style="width: 70px;">
699 
+                    <div class="under_line" style="width: 70px;text-align: left">
687 700 
                       <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
688 701 
                       <span v-else>{{'/'}}</span>
689 702
690 703 
                     </div>
691 704 
                     mmol/L &emsp;K<sup>+</sup>：
692 
-                    <div class="under_line" style="width: 70px;">
705 
+                    <div class="under_line" style="width: 70px;text-align: left">
693 706 
                       <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
694 707 
                       <span v-else>{{'/'}}</span>
695 708 
 
@@ -699,21 +712,21 @@
699 712 
                   </div>
700 713 
                   <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
701 714 
                     &emsp;置换液后/前稀释 总量：
702 
-                    <div class="under_line" style="width: 100px;">
715 
+                    <div class="under_line" style="width: 70px;text-align: left">
703 716 
                       {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
704 717 
                     </div>
705 718 
                     L
706 719 
                   </div>
707 720 
                   <div class="inline_block" v-if="prescription.displace_liqui_part == 1">
708 721 
                     &emsp;置换液前稀释 总量：
709 
-                    <div class="under_line" style="width: 100px;">
722 
+                    <div class="under_line" style="width: 70px;text-align: left">
710 723 
                       {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
711 724 
                     </div>
712 725 
                     L
713 726 
                   </div>
714 727 
                   <div class="inline_block" v-if="prescription.displace_liqui_part == 2">
715 728 
                     &emsp;置换液后稀释 总量：
716 
-                    <div class="under_line" style="width: 100px;">
729 
+                    <div class="under_line" style="width: 70px;text-align: left">
717 730 
                       {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
718 731 
                     </div>
719 732 
                     L
 
@@ -728,14 +741,14 @@
728 741 
                   </div>
729 742 
                   <div class="inline_block">
730 743 
                     &emsp;血流量：
731 
-                    <div class="under_line" style="width: 100px;">
744 
+                    <div class="under_line" style="width: 70px;text-align: left">
732 745 
                       {{prescription.blood_flow_volume?prescription.blood_flow_volume:'/'}}
733 746 
                     </div>
734 747 
                     ml/min
735 748 
                   </div>
736 749 
                   <div class="inline_block">
737 750 
                     &emsp;透析液流量：
738 
-                    <div class="under_line" style="width: 100px;">
751 
+                    <div class="under_line" style="width: 70px;text-align: left">
739 752 
                       {{prescription.dialysate_flow?prescription.dialysate_flow:'/'}}
740 753 
                     </div>
741 754 
                     ml/min
 
@@ -744,28 +757,30 @@
744 757 
                 <div class="row" style="padding: 2px 0;line-height:24px;">
745 758 
                   <div class="inline_block">
746 759 
                     透前体重：
747 
-                    <div class="under_line" style="width: 100px;">
760 
+                    <div class="under_line" style="width: 70px;text-align: left">
748 761 
                       {{predialysis.weight_before?predialysis.weight_before:'/'}}
749 762 
                     </div>
750 763 
                     kg
751 764 
                   </div>
752 765 
                   <div class="inline_block">
753 766 
                     &emsp;设定超滤量：
754 
-                    <div class="under_line" style="width: 100px;">
755 
-                      {{prescription.target_ultrafiltration?prescription.target_ultrafiltration:'/'}}
767 
+                    <div class="under_line" style="width: 70px;text-align: left">
768 
+                      {{getFloat(prescription.target_ultrafiltration)?getFloat(prescription.target_ultrafiltration):'/'}}
769 
+
756 770 
                     </div>
757 771 
                     L
758 772 
                   </div>
759 773 
                   <div class="inline_block">
760 774 
                     &emsp;实际超滤量：
761 
-                    <div class="under_line" style="width: 100px;">
762 
-                      {{prescription.ultrafiltration?prescription.ultrafiltration:'/'}}
775 
+                    <div class="under_line" style="width: 70px;text-align: left">
776 
+                      {{getFloat(prescription.ultrafiltration)?getFloat(prescription.ultrafiltration):'/'}}
763 777 
                     </div>
764 778 
                     L
779 
+
765 780 
                   </div>
766 781 
                   <div class="inline_block">
767 782 
                     透后体重：
768 
-                    <div class="under_line" style="width: 100px;">
783 
+                    <div class="under_line" style="width: 70px;text-align: left">
769 784 
                       {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
770 785 
                     </div>
771 786 
                     kg
 
@@ -847,7 +862,7 @@
847 862 
             </div>
848 863 
             <div class="inline_block" style="margin-left:25px;">
849 864 
               姓名：
850 
-              <div class="under_line" style="width: 120px;">{{patientInfo.name}}</div>
865 
+              <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
851 866 
             </div>
852 867 
             <div class="inline_block" style="margin-left: 25px;">
853 868 
               性别：
 
@@ -856,12 +871,12 @@
856 871 
             </div>
857 872 
             <div class="inline_block" style="margin-left: 25px;">
858 873 
               年龄：
859 
-              <div class="under_line" style="width: 70px;">{{getAge(patientInfo)}}</div>
874 
+              <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
860 875 
               岁
861 876 
             </div>
862 877 
             <div class="inline_block" style="margin-left:25px;">
863 878 
               住院号：
864 
-              <div class="under_line" style="width: 120px;">
879 
+              <div class="under_line" style="width: 120px;text-align: left">
865 880 
                 {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
866 881 
               </div>
867 882 
             </div>

+ 1 - 1
src/xt_pages/stock/Dialog/salesReturnDialog.vue Voir le fichier 

@@ -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 Voir le fichier 

@@ -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 Voir le fichier 

@@ -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 Voir le fichier 

@@ -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 Voir le fichier 

@@ -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 Voir le fichier 

@@ -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 
               }

+ 13 - 13
src/xt_permission.js Voir le fichier 

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
10 10
11 11 
 router.beforeEach((to, from, next) => {
12 12 
   // 线上注释
13 
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14 
-    store.dispatch('VerifyConfigList', []).then(() => {
15 
-      next()
16 
-    })
17 
-  }
18 
-  if (store.getters.permission_routers === undefined) {
19 
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
20 
-      next()
21 
-    })
22 
-  } else {
23 
-    next()
24 
-  }
25 
-  return
13 
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14 
+  //   store.dispatch('VerifyConfigList', []).then(() => {
15 
+  //     next()
16 
+  //   })
17 
+  // }
18 
+  // if (store.getters.permission_routers === undefined) {
19 
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
20 
+  //     next()
21 
+  //   })
22 
+  // } else {
23 
+  //   next()
24 
+  // }
25 
+  // return
26 26 
   // 线上注释
27 27
28 28 
   NProgress.start()