Ver código fonte

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

陈少旭 10 meses atrás
pai
commit
ed8e655dcd
33 arquivos alterados com 5082 adições e 195 exclusões
  1. 2 1
      src/api/dialysis_record.js
  2. 84 0
      src/api/drug/drug.js
  3. 18 0
      src/api/patient.js
  4. BIN
      src/assets/img/xuwendizhi.jpg
  5. 3 1
      src/lang/zh.js
  6. 12 0
      src/router/modules/dialysis.js
  7. 30 0
      src/router/modules/selfPreparedMedicine.js
  8. 5 5
      src/xt_pages/data/components/consumables.vue
  9. 5 5
      src/xt_pages/data/components/drugs.vue
  10. 5 5
      src/xt_pages/data/components/editProject.vue
  11. 1 1
      src/xt_pages/dialysis/PatientBox.vue
  12. 95 49
      src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue
  13. 1427 0
      src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue
  14. 11 0
      src/xt_pages/dialysis/bloodPresssWatch.vue
  15. 48 4
      src/xt_pages/dialysis/details/dialog/computer_dialog.vue
  16. 4 0
      src/xt_pages/dialysis/details/dialysisComputer.vue
  17. 24 0
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  18. 1 2
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue
  19. 3061 0
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventyseven.vue
  20. 120 69
      src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue
  21. 2 2
      src/xt_pages/management/index.vue
  22. 3 2
      src/xt_pages/outpatientCharges/allListPrint.vue
  23. 1 4
      src/xt_pages/outpatientCharges/allListTemplate/printFour.vue
  24. 6 6
      src/xt_pages/outpatientCharges/components/prescriptionTable.vue
  25. 4 4
      src/xt_pages/outpatientDoctorStation/treatPrint.vue
  26. 1 1
      src/xt_pages/outpatientDoctorStation/treatTemplate/printFour.vue
  27. 2 13
      src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue
  28. 15 3
      src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue
  29. 6 5
      src/xt_pages/stock/query/purchaseNewStockQuery.vue
  30. 36 4
      src/xt_pages/stock/selfPreparedMedicine/index.vue
  31. 1 3
      src/xt_pages/stock/stockOutOrder.vue
  32. 14 3
      src/xt_pages/user/Informed/Informedconsent.vue
  33. 35 3
      src/xt_pages/user/Informed/components/heal_informed.vue

+ 2 - 1
src/api/dialysis_record.js Ver arquivo

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
47 47
   })
48 48
 }
49 49
 
50
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
50
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume,dialysis_strainer) {
51 51
   var params = {
52 52
     patient_id: patient_id,
53 53
     date: schedule_date,
@@ -74,6 +74,7 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
74 74
     order_remark: order_remark,
75 75
     catheter_operation:catheter_operation,
76 76
     blood_flow_volume:blood_flow_volume,
77
+    dialysis_strainer:dialysis_strainer,
77 78
   }
78 79
   console.log('params', params)
79 80
   return request({

+ 84 - 0
src/api/drug/drug.js Ver arquivo

@@ -1,4 +1,5 @@
1 1
 import request from '@/utils/request'
2
+import url from 'postcss-url'
2 3
 
3 4
 export function getCurrentPatient(params) {
4 5
   return request({
@@ -670,4 +671,87 @@ export function getCheckGoodBatchList(id,params){
670 671
     method:"get",
671 672
     params:params,
672 673
   })
674
+}
675
+
676
+
677
+export function getAllSelfDrugInfoList(params){
678
+
679
+  return request({
680
+    url:"/api/drug/getallselfdruginfolist",
681
+    method:"get",
682
+    params:params,
683
+  })
684
+}
685
+
686
+export function getallPatientList(params){
687
+
688
+  return request({
689
+    url:"/api/drug/getallpatientlist",
690
+    method:"Get",
691
+    params:params
692
+  })
693
+}
694
+
695
+export function postSearchSelfDrugList(keyword,params){
696
+
697
+  return request({
698
+    url:"/api/drug/postsearchselfdruglist?keyword="+keyword,
699
+    method:"get",
700
+    params:params
701
+  })
702
+}
703
+
704
+export function postSelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
705
+  
706
+  return request({
707
+    url:"/api/drug/postselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
708
+    method:"post",
709
+    data:data
710
+  })
711
+}
712
+
713
+export function getAllSelfDrugWarehouseInfoList(params){
714
+
715
+  return request({
716
+    url:"/api/drug/getallselfdrugwarehosueinfolist",
717
+    method:"get",
718
+    params:params
719
+  })
720
+}
721
+
722
+export function getSelfDrugWarehouseInfoById(id,params){
723
+
724
+  return request({
725
+    url:"/api/drug/getselfdrugwarehouseinfobyid?id="+id,
726
+    method:"Get",
727
+    params:params
728
+  })
729
+}
730
+
731
+export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
732
+ 
733
+  return request({
734
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
735
+    method:"post",
736
+    data:data,
737
+  })
738
+
739
+}
740
+
741
+export function deleteSelfWarehouseInfo(id,params){
742
+  
743
+  return request({
744
+    url:"/api/drug/deleteselfwarehouseinfo?id="+id,
745
+    method:"get",
746
+    params:params,
747
+  })
748
+}
749
+
750
+export function toCheckSelfWarehousingInfo(params){
751
+ 
752
+  return request({
753
+    url:"/api/drug/tocheckselfwarehouseinginfo",
754
+    method:"get",
755
+    params:params,
756
+  })
673 757
 }

+ 18 - 0
src/api/patient.js Ver arquivo

@@ -1102,4 +1102,22 @@ export function deleteSolution(id,params){
1102 1102
     method:"Get",
1103 1103
     params:params,
1104 1104
   })
1105
+}
1106
+
1107
+export function saveTreamtPlan(data){
1108
+
1109
+  return request({
1110
+    url:"/api/patient/savetreamentplan",
1111
+    method:"post",
1112
+    data:data,
1113
+  })
1114
+}
1115
+
1116
+export function getTreamentPlan(params){
1117
+
1118
+  return request({
1119
+    url:"/api/patient/gettreamentplan",
1120
+    method:"get",
1121
+    params:params
1122
+  })
1105 1123
 }

BIN
src/assets/img/xuwendizhi.jpg Ver arquivo


+ 3 - 1
src/lang/zh.js Ver arquivo

@@ -189,7 +189,9 @@ export default {
189 189
     selfPreparedMedicine: '自备药管理',
190 190
     wareHouseManage: '仓库管理',
191 191
     inventoryTransfer: '库存调拨',
192
-
192
+    selfPrepareWaresing:"自备药入库",
193
+    selfPrepareWaresingOut:"自备药出库",
194
+    selfPrepareWareOut:"自备药出库",
193 195
     // consumablesManagement: '耗材管理',
194 196
     warehouseReceipt: '出入库',
195 197
     warehouseReceiptOther: '出入库',

+ 12 - 0
src/router/modules/dialysis.js Ver arquivo

@@ -999,6 +999,18 @@ export default {
999 999
         noCache: true
1000 1000
       }
1001 1001
     },
1002
+    {//74
1003
+      path: '/dialysis/print/batch/seventyfour',
1004
+      component: () =>
1005
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventyfour'),
1006
+      hidden: true,
1007
+      is_menu: false,
1008
+      name: 'batch_print_order_seventyfour',
1009
+      meta: {
1010
+        title: '批量打印',
1011
+        noCache: true
1012
+      }
1013
+    },
1002 1014
     {//75
1003 1015
       path: '/dialysis/print/batch/seventyfive',
1004 1016
       component: () =>

+ 30 - 0
src/router/modules/selfPreparedMedicine.js Ver arquivo

@@ -12,6 +12,36 @@ export default {
12 12
     isChild: true
13 13
   },
14 14
   children: [
15
+    {
16
+      path: '/stock/selfwarehouse/info',
17
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseInfo'),
18
+      name: 'selfPrepareWaresing',
19
+      meta: { title: '自备药入库', noCache: true }
20
+
21
+    },
22
+    {
23
+      path: '/stock/selfwarehouse/info/add',
24
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo'),
25
+      name: 'selfPrepareWaresingAdd',
26
+      meta: { title: '自备药入库', noCache: true },
27
+      hidden: true,
28
+      is_menu: false,
29
+    },
30
+    {
31
+      path: '/stock/selfwarehouse/info/edit',
32
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo'),
33
+      name: 'selfPrepareWaresingEdit',
34
+      meta: { title: '自备药编辑入库', noCache: true },
35
+      hidden: true,
36
+      is_menu: false,
37
+    },
38
+    {
39
+      path: '/stock/selfwarehouse/out',
40
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseOut'),
41
+      name: 'selfPrepareWareOut',
42
+      meta: { title: '自备药出库', noCache: true }
43
+
44
+    },
15 45
     {
16 46
       path: '/stock/selfstockquery',
17 47
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

+ 5 - 5
src/xt_pages/data/components/consumables.vue Ver arquivo

@@ -773,11 +773,11 @@
773 773
 
774 774
             this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
775 775
 
776
-            //  if(response.data.data.goodInfo.is_show<=0){
777
-            //    this.goodInfo.goodInfoDialog.formValue.is_show = ''
778
-            //   }else{
779
-            //     this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
780
-            //   }
776
+             if(response.data.data.goodInfo.is_show<=0){
777
+               this.goodInfo.goodInfoDialog.formValue.is_show = ''
778
+              }else{
779
+                this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
780
+              }
781 781
 
782 782
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
783 783
 

+ 5 - 5
src/xt_pages/data/components/drugs.vue Ver arquivo

@@ -742,11 +742,11 @@
742 742
                 this.formValue.is_project = this.formValue.is_project.toString()
743 743
               }
744 744
 
745
-              // if(this.formValue.is_show<=0){
746
-              //     this.formValue.is_show = ''
747
-              // }else{
748
-              //   this.formValue.is_show = this.formValue.is_show.toString()
749
-              // }
745
+              if(this.formValue.is_show<=0){
746
+                  this.formValue.is_show = ''
747
+              }else{
748
+                this.formValue.is_show = this.formValue.is_show.toString()
749
+              }
750 750
 
751 751
 
752 752
               this.$refs.addDrugs.show(id, this.formValue)

+ 5 - 5
src/xt_pages/data/components/editProject.vue Ver arquivo

@@ -468,11 +468,11 @@ export default {
468 468
                 this.form.is_print = projecDetail.is_print
469 469
               }
470 470
 
471
-              // if(projecDetail.is_show == 0){
472
-              //   this.form.is_show = ""
473
-              // }else{
474
-              //   this.form.is_show = projecDetail.is_show.toString()
475
-              // }
471
+              if(projecDetail.is_show == 0){
472
+                this.form.is_show = ""
473
+              }else{
474
+                this.form.is_show = projecDetail.is_show.toString()
475
+              }
476 476
 
477 477
             }
478 478
          })

+ 1 - 1
src/xt_pages/dialysis/PatientBox.vue Ver arquivo

@@ -864,7 +864,7 @@ export default {
864 864
         @include display-flex;
865 865
         @include align-items-center;
866 866
         .iconfont {
867
-          margin: 0 5px 0 0;
867
+          margin: 0 0px 0 0;
868 868
           font-size: 18px;
869 869
         }
870 870
       }

+ 95 - 49
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue Ver arquivo

@@ -33,33 +33,33 @@
33 33
               血液透析记录单
34 34
             </div>
35 35
           </div>
36
-          <div class="row">
37
-            <div class="inline_block">
36
+          <div class="row" style="display: flex;">
37
+            <div class="inline_block" style="flex: 1;">
38 38
               姓名:
39 39
               <div class="under_line" style="width: 70px; text-align: center">
40 40
                 {{ record.patient.name }}
41 41
               </div>
42 42
             </div>
43
-            <div class="inline_block" style="margin:0 10px">
43
+            <div class="inline_block" style="flex: 1;">
44 44
               性别:
45 45
               <div class="under_line" style="width: 30px; text-align: center">
46 46
                 {{ record.patient.gender == 1 ? "男" : "女" }}
47 47
               </div>
48 48
             </div>
49
-            <div class="inline_block" style="">
49
+            <div class="inline_block" style="flex: 1;">
50 50
               年龄:
51 51
               <div class="under_line" style="width: 30px; text-align: center">
52 52
                 {{ getAge(record.patient) }}
53 53
               </div>
54 54
55 55
             </div>
56
-            <div class="inline_block" style="margin: 0 10px;">
56
+            <div class="inline_block" style="flex: 1;">
57 57
               病历号:
58 58
               <div class="under_line" style="width: 70px; text-align: center">
59 59
                 {{ record.patient.dialysis_no }}
60 60
               </div>
61 61
             </div>
62
-            <div class="inline_block" style="">
62
+            <div class="inline_block" style="flex: 1;">
63 63
               日期:
64 64
               <div class="under_line"
65 65
               style="width: 100px; text-align: center"
@@ -67,7 +67,7 @@
67 67
               {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
68 68
               </div>
69 69
             </div>
70
-            <div class="inline_block" style="margin-left: 10px">
70
+            <div class="inline_block" style="flex: 1;">
71 71
               次数:
72 72
               <div
73 73
                 class="under_line"
@@ -95,10 +95,10 @@
95 95
               </div>
96 96
             </div>
97 97
           </div>
98
-          <div class="row" style="text-align: center;border: 1px solid black;width: 99%;">
98
+          <div style="text-align: center;border: 1px solid black;width: 99%;padding: 5px 0;">
99 99
             透前情况
100 100
           </div>
101
-          <div class="row" style="border: 1px solid black;border-top: none;width: 99%;">
101
+          <div  style="border: 1px solid black;border-top: none;width: 99%;">
102 102
             <div class="row" style="display: flex;">
103 103
               <div class="inline_block" style="flex: 2;" >
104 104
                 血管通路:
@@ -144,7 +144,7 @@
144 144
                 </div>
145 145
               </div>
146 146
               <div class="inline_block" style="flex: 1;" >
147
-                透析器:
147
+                透析(滤)器:
148 148
                 <div class="under_line"
149 149
                   style=" width: 50%;
150 150
                     text-align: center;
@@ -152,6 +152,8 @@
152 152
                   "
153 153
                 >
154 154
                 {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}
155
+
156
+                <span v-if="record.dialysis_order.dialysis_strainer!=''"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
155 157
                 </div>
156 158
               </div>
157 159
               <div class="inline_block" style="flex: 1;" >
@@ -424,9 +426,11 @@
424 426
                     white-space: normal;
425 427
                   "
426 428
                 >
427
-                {{ record.dialysis_order && record.dialysis_order.dialysis_irrigation
428
-                  ? record.dialysis_order.dialysis_irrigation : "/"
429
-                }}
429
+                  <span v-if="record.dialysis_order !=null && record.dialysis_order.dialysis_irrigation != '0'">
430
+                    {{ record.dialysis_order.dialysis_irrigation ? record.dialysis_order.dialysis_irrigation : "/"}}
431
+                  </span>
432
+                  <span v-else-if="record.dialysis_order !=null && record.dialysis_order.dialysis_irrigation == '0'">/</span>
433
+                  <span v-else>/</span>
430 434
                 </div>
431 435
               </div>
432 436
               <div class="inline_block" style="flex: 1;" >
@@ -490,6 +494,19 @@
490 494
                 <span v-if="record.prescription.anticoagulant ==0"> </span>
491 495
                 <span v-else>{{ getweichi(record.prescription.anticoagulant) }}</span>
492 496
               </div>
497
+              <div class="inline_block" style="flex: 1">
498
+                透前体重:
499
+                <div
500
+                  class="under_line"
501
+                  style="width: 70px; text-align: center"
502
+                >
503
+                  {{record.assessment_before_dislysis.weight_before
504
+                    ? parseFloat(record.assessment_before_dislysis.weight_before -
505
+                      record.assessment_before_dislysis.additional_weight).toFixed(1): "/"
506
+                  }}
507
+                </div>
508
+                kg
509
+              </div>
493 510
             </div>
494 511
             <!--  -->
495 512
             <div class="row" style="display: flex;">
@@ -545,19 +562,7 @@
545 562
                 </div>
546 563
                 kg
547 564
               </div>
548
-              <div class="inline_block" style="flex: 1">
549
-                透前体重:
550
-                <div
551
-                  class="under_line"
552
-                  style="width: 70px; text-align: center"
553
-                >
554
-                  {{record.assessment_before_dislysis.weight_before
555
-                    ? parseFloat(record.assessment_before_dislysis.weight_before -
556
-                      record.assessment_before_dislysis.additional_weight).toFixed(1): "/"
557
-                  }}
558
-                </div>
559
-                kg
560
-              </div>
565
+              
561 566
             </div>
562 567
             <!-- 医嘱脱水量 -->
563 568
             <div class="row" style="display: flex;">
@@ -775,7 +780,7 @@
775 780
             </table>
776 781
           </div>
777 782
           <!-- 透析监测 -->
778
-          <div class="row" style="width: 99%;">
783
+          <div  style="width: 99%;">
779 784
             <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
780 785
               <tbody>
781 786
                 <tr style="line-height: 30px;">
@@ -822,10 +827,43 @@
822 827
                   <td width="50">{{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : "/"}}</td>
823 828
                   <td width="50">{{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: "/"}}</td>
824 829
                   <td width="50">{{monitor_record.conductivity ? monitor_record.conductivity : "/" }}</td>
825
-                  <td width="50">{{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}</td>
826
-                  <td width="50">{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0" }}</td>
830
+                  <td width="50">
831
+                    <span v-if="j == 0">
832
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '0' }}
833
+                    </span>
834
+                    <span v-else-if="j == (record.monitor_records.length-1)">
835
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
836
+                    </span>
837
+                    <span v-else>
838
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
839
+                    </span> 
840
+                    
841
+                  </td>
842
+                  <td width="50">
843
+                    <span v-if="j == 0">
844
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0" }}
845
+                    </span>
846
+                    <span v-else-if="j == (record.monitor_records.length-1)">
847
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "/" }}
848
+                    </span>
849
+                    <span v-else>
850
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "/" }}
851
+                    </span> 
852
+                    
853
+                  </td>
827 854
 
828
-                  <td width="65">{{ monitor_record.heparin ? monitor_record.heparin :'/' }}</td>
855
+                  <td width="65">
856
+                    <span v-if="j == 0">
857
+                      {{ monitor_record.heparin ? monitor_record.heparin :'0' }}
858
+                    </span>
859
+                    <span v-else-if="j == (record.monitor_records.length-1)">
860
+                      {{ monitor_record.heparin ? monitor_record.heparin :'/' }}
861
+                    </span>
862
+                    <span v-else>
863
+                      {{ monitor_record.heparin ? monitor_record.heparin :'/' }}
864
+                    </span> 
865
+                    
866
+                  </td>
829 867
                   <td width="200">
830 868
                     <template
831 869
                       v-if="
@@ -846,7 +884,7 @@
846 884
             </table>
847 885
           </div>
848 886
 
849
-          <div class="row" style="border: 1px solid black;border-bottom:none;width: 99%;">
887
+          <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
850 888
             <div class="row" style="display: flex;">
851 889
               <div class="inline_block" style="flex: 1">
852 890
                 穿刺护士:
@@ -913,11 +951,7 @@
913 951
               </div>
914 952
               <div class="inline_block" style="flex: 1">
915 953
                 核对人员:
916
-                <div
917
-                  class="under_line"
918
-                  style="width: 80px; text-align: center"
919
-                  v-if="!record.check"
920
-                ></div>
954
+               
921 955
                 <div
922 956
                   class="under_line"
923 957
                   style="width: 80px; text-align: center"
@@ -927,7 +961,7 @@
927 961
                   "
928 962
                 >
929 963
                   <span
930
-                    style="height: 30px; display: inline-block"
964
+                    style=" display: inline-block"
931 965
                     v-if="setAdminUserES(record.check, 'creater') == ''"
932 966
                   >
933 967
                     {{
@@ -955,7 +989,7 @@
955 989
                   "
956 990
                 >
957 991
                   <span
958
-                    style="height: 30px; display: inline-block"
992
+                    style=" display: inline-block"
959 993
                     v-if="setAdminUserES(record.check, 'creater') == ''"
960 994
                   >
961 995
                     {{
@@ -983,7 +1017,7 @@
983 1017
                   "
984 1018
                 >
985 1019
                   <span
986
-                    style="height: 30px; display: inline-block"
1020
+                    style=" display: inline-block"
987 1021
                     v-if="
988 1022
                       setAdminUserES(record.check, 'modifier') == ''
989 1023
                     "
@@ -1015,7 +1049,7 @@
1015 1049
                   "
1016 1050
                 >
1017 1051
                   <span
1018
-                    style="height: 30px; display: inline-block"
1052
+                    style=" display: inline-block"
1019 1053
                     v-if="setAdminUserES(record.check, 'creater') == ''"
1020 1054
                   >
1021 1055
                     {{
@@ -1063,7 +1097,10 @@
1063 1097
                 <div class="under_line"
1064 1098
                   style="width: 50%; text-align: center"
1065 1099
                 >
1066
-                  {{ record.assessment_after_dislysis.dialysis_during ? record.assessment_after_dislysis.dialysis_during : "/" }}
1100
+                  <span v-if="record.assessment_after_dislysis.is_eat !=''">
1101
+                    {{ record.assessment_after_dislysis.is_eat ==1 ? '有' : "无" }}
1102
+                  </span>
1103
+                  <span v-else>/</span>
1067 1104
                 </div>
1068 1105
               </div>
1069 1106
               <div class="inline_block" style="flex: 1">
@@ -1111,7 +1148,7 @@
1111 1148
               <div class="inline_block" style="flex: 1">
1112 1149
                 实际脱水量:
1113 1150
                 <div class="under_line"
1114
-                  style="width: 90px; text-align: center"
1151
+                  style="width: 40%; text-align: center"
1115 1152
                 >
1116 1153
                   {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : "/" }}
1117 1154
                 </div>ml
@@ -1127,12 +1164,21 @@
1127 1164
             </div>
1128 1165
           </div>
1129 1166
           <!-- 透析小结 -->
1130
-          <div class="row" style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;">
1131
-            <div style="height: 80px;">
1132
-              治疗小结:
1133
-              <span style="white-space: normal;">
1134
-                {{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : ""}}
1135
-              </span>
1167
+          <div  style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;padding:5px ;">
1168
+            <div style="height: 80px;width: 100%;">
1169
+              <div style="margin-bottom: 10px;">
1170
+                宣教知识:
1171
+                <span class="under_line" style="white-space: normal;width: 80%;">
1172
+                  {{ record.summer && record.summer.mission ? record.summer.mission : ''}}
1173
+                </span>
1174
+              </div>
1175
+              <div style="width: 100%;">
1176
+                治疗小结:
1177
+                <span class="under_line" style="white-space: normal;width: 80%;">
1178
+                  {{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : ""}}
1179
+                </span>
1180
+              </div>
1181
+             
1136 1182
             </div>
1137 1183
             <div style="height: 20px;text-align: right;padding-right:30%;">
1138 1184
               医生签名:
@@ -1774,7 +1820,7 @@ export default {
1774 1820
 .row {
1775 1821
   font-size: 14px;
1776 1822
   line-height: 20px;
1777
-  padding: 5px 0;
1823
+  padding: 5px;
1778 1824
 }
1779 1825
 
1780 1826
 .inline_block {

Diferenças do arquivo suprimidas por serem muito extensas
+ 1427 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue


+ 11 - 0
src/xt_pages/dialysis/bloodPresssWatch.vue Ver arquivo

@@ -464,6 +464,15 @@
464 464
           type="primary"
465 465
           >批量打印</el-button>
466 466
       </template>
467
+      <template v-if="this.template_id == 74">
468
+        <el-button
469
+          size="small"
470
+          icon="el-icon-printer"
471
+          :disabled="selecting_schs.length == 0"
472
+          @click="batchPrintAction"
473
+          type="primary"
474
+          >批量打印</el-button>
475
+      </template>
467 476
       <template v-if="this.template_id == 75">
468 477
         <el-button
469 478
           size="small"
@@ -2249,6 +2258,8 @@ export default {
2249 2258
         this.$router.push({ path: "/dialysis/print/batch/seventytwo" });
2250 2259
       }else if (this.template_id == 73) {
2251 2260
         this.$router.push({ path: "/dialysis/print/batch/seventythree" });
2261
+      }else if (this.template_id == 74) {
2262
+        this.$router.push({ path: '/dialysis/print/batch/seventyfour' });
2252 2263
       }else if (this.template_id == 75) {
2253 2264
         this.$router.push({ path: "/dialysis/print/batch/seventyfive" });
2254 2265
       }else if (this.template_id == 76) {

+ 48 - 4
src/xt_pages/dialysis/details/dialog/computer_dialog.vue Ver arquivo

@@ -244,6 +244,18 @@
244 244
           ></el-input>
245 245
         </el-form-item>
246 246
 
247
+        <el-form-item  label="血滤器:"
248
+            v-if="isShowFiled('血滤器')"
249
+            :prop="isName('血滤器')"
250
+            :rules="isCheckmust('血滤器')">
251
+            <el-input
252
+              v-model="form.dialysis_strainer"
253
+              style="width: 200px"
254
+              @focus="showInnerDialog('12')"
255
+            ></el-input>
256
+        </el-form-item>
257
+
258
+
247 259
         <el-form-item
248 260
           label="血管通路:"
249 261
           v-if="isShowFiled('血管通路')"
@@ -449,6 +461,7 @@ export default {
449 461
         catheter_operation:"",
450 462
         blood_flow_volume:"" ,
451 463
         schedual_type:0,
464
+        dialysis_strainer:"",
452 465
       },
453 466
       blood_access_option: [],
454 467
       schedules_type: [
@@ -471,13 +484,14 @@ export default {
471 484
       },
472 485
       dialyzers: [],
473 486
       irrigations: [],
487
+      dialysisStrainerList:[],
474 488
       summary:[],
475 489
       blood_access_option_name:"",
476 490
       value2:"",
477 491
       infoDialogVisible:false,
478 492
       selected_date:"",
479 493
       remark:"",
480
-     
494
+
481 495
     };
482 496
   },
483 497
   props: {
@@ -508,6 +522,7 @@ export default {
508 522
     lastOrder: {
509 523
       type: Object,
510 524
     },
525
+
511 526
   },
512 527
   mounted() {},
513 528
   created() {
@@ -541,6 +556,7 @@ export default {
541 556
     this.form.puncture_way = this.dialysis_order.puncture_way;
542 557
     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
543 558
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
559
+    this.form.dialysis_strainer = this.dialysis_order.dialysis_strainer;
544 560
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
545 561
     this.form.blood_drawing = this.dialysis_order.blood_drawing
546 562
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
@@ -647,6 +663,7 @@ export default {
647 663
       console.log("stockType", this.stockType);
648 664
       var arr = [];
649 665
       var arrTwo = [];
666
+      var arrThree = []
650 667
       for (let i = 0; i < this.stockType.length; i++) {
651 668
         if (this.stockType[i].stock_attribute == 2) {
652 669
           arr.push(this.stockType[i]);
@@ -654,9 +671,13 @@ export default {
654 671
         if (this.stockType[i].stock_attribute == 3) {
655 672
           arrTwo.push(this.stockType[i]);
656 673
         }
674
+        if(this.stockType[i].stock_attribute == 4){
675
+            arrThree.push(this.stockType[i])
676
+        }
657 677
       }
658 678
       var dialyzator = [];
659 679
       var irrigation = [];
680
+      var dialysis_strainer = []
660 681
       for (let i = 0; i < arr.length; i++) {
661 682
         for (let j = 0; j < arr[i].GoodInfo.length; j++) {
662 683
           dialyzator.push(arr[i].GoodInfo[j]);
@@ -670,6 +691,14 @@ export default {
670 691
         }
671 692
       }
672 693
       this.irrigations = irrigation;
694
+
695
+      for(let i=0;i<arrThree.length;i++){
696
+          for (let j = 0; j < arrThree[i].GoodInfo.length; j++) {
697
+            dialysis_strainer.push(arrThree[i].GoodInfo[j])
698
+          }
699
+        }
700
+
701
+        this.dialysisStrainerList = dialysis_strainer
673 702
     },
674 703
   },
675 704
   computed: {},
@@ -900,10 +929,10 @@ export default {
900 929
           }
901 930
 
902 931
 
903
-         
932
+
904 933
           console.log("质控护士", this.form.quality_nurse_id);
905 934
           console.log("this.form.nuclein_date", this.form.nuclein_date);
906
-
935
+          console.log("dialysis_strainer------------------",this.form.dialysis_strainer)
907 936
           startDialysis(
908 937
             this.patient_id,
909 938
             this.schedule_date
@@ -929,7 +958,8 @@ export default {
929 958
             this.form.blood_access_id,
930 959
             this.form.nuclein_date,
931 960
             this.form.catheter_operation,
932
-            this.form.blood_flow_volume
961
+            this.form.blood_flow_volume,
962
+            this.form.dialysis_strainer,
933 963
           ).then((rs) => {
934 964
             this.loading = false;
935 965
             var resp = rs.data;
@@ -983,6 +1013,7 @@ export default {
983 1013
       ParamsQuery["mode"] = "2";
984 1014
       ParamsQuery['catheter_operation'] = this.form.catheter_operation
985 1015
       ParamsQuery["blood_flow_volume"] = this.form.blood_flow_volume
1016
+      ParamsQuery["dialysis_strainer"] = this.form.dialysis_strainer
986 1017
       if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
987 1018
         ParamsQuery["mode"] = "3";
988 1019
       }
@@ -1084,6 +1115,16 @@ export default {
1084 1115
           this.InnerDialogProps.selected = this.form.puncture_needle;
1085 1116
           this.InnerDialogProps.isShowTextArea = false;
1086 1117
           break;
1118
+        case '12':
1119
+            for (let i = 0; i < this.dialysisStrainerList.length; i++) {
1120
+              this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
1121
+            }
1122
+            this.InnerDialogProps.values = this.dialysisStrainerList
1123
+            this.InnerDialogProps.titles = '血滤器'
1124
+            this.InnerDialogProps.type = 'dialysis_strainer'
1125
+            this.InnerDialogProps.selected = this.form.dialysis_strainer
1126
+            this.InnerDialogProps.isShowTextArea = false
1127
+        break
1087 1128
         case "13": // 穿刺方式
1088 1129
           this.InnerDialogProps.values = this.puncture_ways;
1089 1130
           this.InnerDialogProps.titles = "穿刺方式";
@@ -1109,6 +1150,9 @@ export default {
1109 1150
         case "irrigations":
1110 1151
           this.form.dialysis_irrigation = val.value.join(",");
1111 1152
           break;
1153
+        case 'dialysis_strainer':
1154
+          this.form.dialysis_strainer = val.value.join(",")
1155
+        break
1112 1156
       }
1113 1157
     },
1114 1158
     innerDialogCancle: function () {

+ 4 - 0
src/xt_pages/dialysis/details/dialysisComputer.vue Ver arquivo

@@ -58,6 +58,10 @@
58 58
         <li v-if="isShow('灌流器')">
59 59
           <label>灌流器 : </label>
60 60
           <span class="content">{{ record.dialysis_irrigation }}</span>
61
+        </li>
62
+        <li v-if="isShow('血滤器')">
63
+          <label>血滤器 : </label>
64
+          <span class="content">{{ record.dialysis_strainer }}</span>
61 65
         </li>
62 66
          <li v-if="isShow('血管通路')">
63 67
           <label>血管通路 : </label>

+ 24 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue Ver arquivo

@@ -952,6 +952,18 @@
952 952
         >
953 953
         </div>
954 954
       </template>
955
+      <template v-if="org_template_info.template_id == 77">
956
+        <div>
957
+          <el-button
958
+          :loading="loading"
959
+          size="small"
960
+          icon="el-icon-printer"
961
+          @click="printThisPage"
962
+          type="primary"
963
+          >打印</el-button
964
+        >
965
+        </div>
966
+      </template>
955 967
     </div>
956 968
     <div class="app-container" style="min-height: 0">
957 969
       <!--<div class="order-print-btn"-->
@@ -1460,6 +1472,9 @@
1460 1472
           <DialysisPrintOrderSeventysix v-bind:childResponse="childResponse"
1461 1473
           v-if="org_template_info.template_id == 76">
1462 1474
           </DialysisPrintOrderSeventysix>
1475
+          <DialysisPrintOrderSeventyseven v-bind:childResponse="childResponse"
1476
+          v-if="org_template_info.template_id == 77">
1477
+          </DialysisPrintOrderSeventyseven>
1463 1478
         </div>
1464 1479
       </el-container>
1465 1480
     </div>
@@ -1554,6 +1569,7 @@ import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventy
1554 1569
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
1555 1570
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
1556 1571
 import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
1572
+import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
1557 1573
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
1558 1574
 export default {
1559 1575
   name: "dialysisPrintOrder",
@@ -1634,6 +1650,7 @@ export default {
1634 1650
     DialysisPrintOrderSop,
1635 1651
     DialysisPrintOrderseventyfive,
1636 1652
     DialysisPrintOrderSeventysix,
1653
+    DialysisPrintOrderSeventyseven,
1637 1654
     DialysisPrintOrderZero,
1638 1655
     LabelBox,
1639 1656
     BreadCrumb,
@@ -2323,6 +2340,13 @@ export default {
2323 2340
           style: style2,
2324 2341
           scanStyles: false,
2325 2342
         });
2343
+      }else if (this.org_template_info.template_id == 77) {
2344
+        printJS({
2345
+          printable: "dialysis-print-box-1",
2346
+          type: "html",
2347
+          style: style2,
2348
+          scanStyles: false,
2349
+        });
2326 2350
       }
2327 2351
        else if (this.org_template_info.template_id == 199 ) {
2328 2352
         printJS({

+ 1 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue Ver arquivo

@@ -2310,8 +2310,7 @@
2310 2310
                         </span>
2311 2311
                         <img
2312 2312
                           :style="{'height':org_id==10597 ? '25px':'35px'}"
2313
-                          :src="
2314
-                            setAdminUserES(check == null ? 0 : check.modifier)
2313
+                          :src="setAdminUserES(check == null ? 0 : check.modifier)
2315 2314
                           "
2316 2315
                           alt=""
2317 2316
                           srcset=""

Diferenças do arquivo suprimidas por serem muito extensas
+ 3061 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSeventyseven.vue


+ 120 - 69
src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue Ver arquivo

@@ -27,33 +27,33 @@
27 27
             血液透析记录单
28 28
           </div>
29 29
         </div>
30
-        <div class="row">
31
-          <div class="inline_block">
30
+        <div class="row" style="display: flex;">
31
+          <div class="inline_block" style="flex: 1;">
32 32
             姓名:
33 33
             <div class="under_line" style="width: 50px; text-align: center">
34 34
               {{ patientInfo.name }}
35 35
             </div>
36 36
           </div>
37
-          <div class="inline_block" style="margin:0 10px">
37
+          <div class="inline_block" style="flex: 1;">
38 38
             性别:
39 39
             <div class="under_line" style="width: 30px; text-align: center">
40 40
               {{ patientInfo_gender_1 ? "男" : "女" }}
41 41
             </div>
42 42
           </div>
43
-          <div class="inline_block" style="">
43
+          <div class="inline_block" style="flex: 1;">
44 44
             年龄:
45 45
             <div class="under_line" style="width: 30px; text-align: center">
46 46
               {{ getAge(patientInfo) }}
47 47
             </div>
48 48
49 49
           </div>
50
-          <div class="inline_block" style="margin: 0 10px;">
50
+          <div class="inline_block" style="flex: 1;">
51 51
             病历号:
52 52
             <div class="under_line" style="width: 70px; text-align: center">
53 53
               {{ patientInfo.dialysis_no }}
54 54
             </div>
55 55
           </div>
56
-          <div class="inline_block" style="">
56
+          <div class="inline_block" style="flex: 1;">
57 57
             日期:
58 58
             <div class="under_line"
59 59
             style="width: 100px; text-align: center"
@@ -61,7 +61,7 @@
61 61
               {{ xtdate }}
62 62
             </div>
63 63
           </div>
64
-          <div class="inline_block" style="margin-left: 10px">
64
+          <div class="inline_block" style="flex: 1;">
65 65
             次数:
66 66
             <div
67 67
               class="under_line"
@@ -83,7 +83,7 @@
83 83
             <div class="under_line"
84 84
               style="
85 85
                 width: 640px;
86
-                text-align: left;
86
+                text-align: center;
87 87
                 word-wrap: break-word;
88 88
                 white-space: inherit;
89 89
               "
@@ -92,10 +92,10 @@
92 92
             </div>
93 93
           </div>
94 94
         </div>
95
-        <div class="row" style="text-align: center;border: 1px solid black;width: 99%">
95
+        <div style="text-align: center;border: 1px solid black;width: 99%;padding: 3px 0;font-size: 18px;">
96 96
           透前情况
97 97
         </div>
98
-        <div class="row" style="border: 1px solid black;border-top: none;width: 99%;">
98
+        <div style="border: 1px solid black;border-top: none;width: 99%;border-bottom: none;">
99 99
           <div class="row" style="display: flex;">
100 100
             <div class="inline_block" style="flex: 2;" >
101 101
               血管通路:
@@ -124,15 +124,21 @@
124 124
               }}
125 125
               </div>
126 126
             </div>
127
-            <div class="inline_block" style="flex: 1;" >
128
-              透析器:
127
+            <div class="inline_block" style="flex: 2;" >
128
+              透析(滤)器:
129 129
               <div class="under_line"
130
-                style=" width: 50%;
130
+                style=" width: 40%;
131 131
                   text-align: center;
132 132
                   white-space: normal;
133 133
                 "
134 134
               >
135
-                {{ dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
135
+                <span v-if="dialysisOrder !=null" >
136
+                  {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
137
+                </span>
138
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
139
+                   /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
140
+                </span>
141
+
136 142
               </div>
137 143
             </div>
138 144
             <div class="inline_block" style="flex: 1;" >
@@ -182,9 +188,11 @@
182 188
                   white-space: normal;
183 189
                 "
184 190
               >
185
-                {{
186
-                  dialysisOrder.dialysis_irrigation ? dialysisOrder.dialysis_irrigation : "/"
187
-                }}
191
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_irrigation != '0'">
192
+                  {{ dialysisOrder.dialysis_irrigation ? dialysisOrder.dialysis_irrigation : "/"}}
193
+                </span>
194
+                <span v-else-if="dialysisOrder !=null && dialysisOrder.dialysis_irrigation == '0'">/</span>
195
+                <span v-else>/</span>
188 196
               </div>
189 197
             </div>
190 198
             <div class="inline_block" style="flex: 1;" >
@@ -256,6 +264,16 @@
256 264
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
257 265
               <!-- <span v-else>mg/h</span> -->
258 266
             </div>
267
+            <div class="inline_block" style="flex: 1">
268
+              透前体重:
269
+              <div
270
+                class="under_line"
271
+                style="width: 70px; text-align: center"
272
+              >
273
+                {{predialysis.weight_before ? predialysis.weight_before : ""}}
274
+              </div>
275
+              kg
276
+            </div>
259 277
           </div>
260 278
           <!--  -->
261 279
           <div class="row" style="display: flex;">
@@ -308,25 +326,17 @@
308 326
               </div>
309 327
               kg
310 328
             </div>
311
-            <div class="inline_block" style="flex: 1">
312
-              透前体重:
313
-              <div
314
-                class="under_line"
315
-                style="width: 70px; text-align: center"
316
-              >
317
-                {{predialysis.weight_before ? predialysis.weight_before : ""}}
318
-              </div>
319
-              kg
320
-            </div>
329
+
321 330
           </div>
322 331
           <!-- 医嘱脱水量 -->
323
-          <div class="row" style="display: flex;">
332
+          <div class="row" style="display: flex;vertical-align: text-bottom;">
324 333
             <div class="inline_block" style="flex: 1;" >
325 334
               医嘱脱水量:
326 335
               <div class="under_line"
327 336
                 style=" width: 100px;
328
-                  text-align: center; white-space: normal;
337
+                  text-align: center;
329 338
                 ">
339
+                <span style="height: 30px;display: inline-block;"></span>
330 340
                 {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/"}}
331 341
               </div>L
332 342
             </div>
@@ -336,18 +346,18 @@
336 346
                 class="under_line"
337 347
                 style="width: 80px; text-align: center"
338 348
               >
349
+                <span style="height: 30px;display: inline-block;"></span>
339 350
                 {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0"}} h
340 351
                 {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}min
341 352
               </div>
342 353
             </div>
343
-
344 354
             <div class="inline_block" style="flex: 1">
345 355
               医生签名:
346 356
               <div
347 357
                 class="under_line"
348 358
                 style="width: 100px; text-align: center"
349 359
               >
350
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
360
+                <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(prescription.creater) == ''">
351 361
                   {{ getAdminUser(prescription.creater)}}
352 362
                 </span>
353 363
                 <span style="display: inline-block;" v-else>
@@ -358,7 +368,7 @@
358 368
             </div>
359 369
           </div>
360 370
           <!-- 特殊医嘱 -->
361
-          <div class="row" >
371
+          <div class="row" style="padding-bottom: 10px;">
362 372
             <div class="inline_block" style="width: 100%;">
363 373
               特殊医嘱:
364 374
               <div class="under_line"
@@ -383,7 +393,7 @@
383 393
         </div> -->
384 394
         <!-- 医嘱 -->
385 395
         <div style="width: 99%;">
386
-          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
396
+          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;border-bottom: none;">
387 397
             <tbody>
388 398
               <tr style="line-height: 30px;">
389 399
                 <td
@@ -392,8 +402,8 @@
392 402
                     letter-spacing: 5px;
393 403
                     text-align: center;
394 404
                     font-weight: 520;
395
-                    font-size: 16px;
396
-                    padding: 0px 8px;
405
+                    font-size: 18px;
406
+                    padding: 3px 8px;
397 407
                     line-height: 30px;
398 408
                   "
399 409
                 >
@@ -417,17 +427,13 @@
417 427
                 v-for="(advice, advice_index) in doctor_advices"
418 428
                 :key="advice_index"
419 429
               >
420
-                <td height="32px">
430
+                <td style="line-height:35px">
421 431
                   <span v-if="advice.start_time">
422 432
                     {{ getTime(advice.start_time, "{h}:{i}") }}
423 433
                   </span>
424
-
425 434
                 </td>
426
-                <td
427
-                  height="32px"
428
-                  colspan="2"
429
-                  class="advice-name"
430
-                  style="padding-left: 7px"
435
+                <td style="padding-left: 5px;line-height:35px"
436
+                  colspan="2" class="advice-name"
431 437
                 >
432 438
 
433 439
                   <span v-if="advice.parent_id > 0"></span>
@@ -437,7 +443,7 @@
437 443
                     }}{{ advice.drug_spec_unit }})</span
438 444
                   >
439 445
                   <span v-if="advice.prescribing_number"
440
-                    >&nbsp;&nbsp; {{ advice.prescribing_number
446
+                    >&nbsp; {{ advice.prescribing_number
441 447
                     }}{{ advice.prescribing_number_unit }}</span
442 448
                   >
443 449
                   <span v-if="advice.single_dose != 0">
@@ -458,7 +464,7 @@
458 464
                     >({{ advice.remark }})</span
459 465
                   >
460 466
                 </td>
461
-                <td height="32px">
467
+                <td style="line-height:35px">
462 468
                   <span
463 469
                     v-if="setAdminUserES(advice.advice_doctor) == ''"
464 470
                     >{{ getAdminUser(advice.advice_doctor) }}</span
@@ -471,12 +477,12 @@
471 477
                     v-else
472 478
                   />
473 479
                 </td>
474
-                <td height="32px">
480
+                <td style="line-height:35px">
475 481
                   <span v-if="advice.execution_time">{{
476 482
                     getTime(advice.execution_time, "{h}:{i}")
477 483
                   }}</span>
478 484
                 </td>
479
-                <td height="32px">
485
+                <td style="line-height:35px">
480 486
                   <span
481 487
                     v-if="setAdminUserES(advice.execution_staff) == ''"
482 488
                     >{{ getAdminUser(advice.execution_staff) }}</span
@@ -490,7 +496,7 @@
490 496
                   />
491 497
                 </td>
492 498
 
493
-                <td height="32px">
499
+                <td style="line-height:35px">
494 500
                   <span
495 501
                     v-if="setAdminUserES(advice.checker) == ''"
496 502
                     >{{ getAdminUser(advice.checker) }}</span
@@ -508,18 +514,18 @@
508 514
           </table>
509 515
         </div>
510 516
         <!-- 透析监测 -->
511
-        <div class="row" style="width: 99%;">
517
+        <div style="width: 99%;">
512 518
           <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
513 519
             <tbody>
514
-              <tr style="line-height: 30px; padding: 8px 5px">
520
+              <tr style="line-height: 30px;">
515 521
                 <td
516 522
                   colspan="13"
517 523
                   style="
518 524
                     letter-spacing: 5px;
519 525
                     text-align: center;
520 526
                     font-weight: 520;
521
-                    font-size: 16px;
522
-                    padding: 0px 8px;
527
+                    font-size: 18px;
528
+                    padding: 3px 8px;
523 529
                     line-height: 30px;
524 530
                   "
525 531
                 >
@@ -553,12 +559,44 @@
553 559
                 <td width="50">{{monitor.arterial_pressure ? monitor.arterial_pressure: "/"}}</td>
554 560
                 <td width="50">{{monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
555 561
                 <td width="50">{{monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/"}}</td>
556
-                <td width="50">{{monitor.blood_flow_volume? monitor.blood_flow_volume: "/"}}</td>
562
+                <td width="50">{{monitor.blood_flow_volume ? monitor.blood_flow_volume: "/"}}</td>
557 563
                 <td width="50">{{ monitor.conductivity ? monitor.conductivity : "/" }}</td>
558
-                <td width="50">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
559
-                <td width="50">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0" }}</td>
564
+                <td width="50">
565
+                  <span v-if="monindex == 0">
566
+                    {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0" }}
567
+                  </span>
568
+                  <span v-else-if="monindex == ( monitors.length-1)">
569
+                    {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}
570
+                  </span>
571
+                  <span v-else>
572
+                    {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}
573
+                  </span>
574
+
575
+                </td>
576
+                <td width="50">
577
+                  <span v-if="monindex == 0">
578
+                    {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0" }}
579
+                  </span>
580
+                  <span v-else-if="monindex == ( monitors.length-1)">
581
+                    {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume: "/" }}
582
+                  </span>
583
+                  <span v-else>
584
+                    {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume: "/" }}
585
+                  </span>
586
+                </td>
560 587
                 <!-- 剩余肝素 -->
561
-                <td width="65">{{ monitor.heparin ? monitor.heparin :'/' }}</td>
588
+                <td width="65">
589
+                  <span v-if="monindex == 0">
590
+                    {{ monitor.heparin ? monitor.heparin :'0' }}
591
+                  </span>
592
+                  <span v-else-if="monindex == ( monitors.length-1)">
593
+                    {{ monitor.heparin ? monitor.heparin: "/" }}
594
+                  </span>
595
+                  <span v-else>
596
+                    {{ monitor.heparin ? monitor.heparin: "/" }}
597
+                  </span>
598
+                  <!-- {{ monitor.heparin != '' ? monitor.heparin :'/' }}-->
599
+                </td>
562 600
                 <td width="200">
563 601
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">
564 602
                     【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
@@ -571,7 +609,7 @@
571 609
           </table>
572 610
         </div>
573 611
 
574
-        <div class="row" style="border: 1px solid black;border-bottom:none;width: 99%;">
612
+        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
575 613
           <div class="row" style="display: flex;">
576 614
             <div class="inline_block" style="flex: 1">
577 615
               穿刺护士:
@@ -596,7 +634,7 @@
596 634
                   }}</span
597 635
                 >
598 636
                 <img
599
-                  style="height: 35px"
637
+                  style="height: 30px"
600 638
                   :src="
601 639
                     setAdminUserES(
602 640
                       dialysisOrder == null
@@ -633,7 +671,7 @@
633 671
                   }}</span
634 672
                 >
635 673
                 <img
636
-                  style="height: 35px"
674
+                  style="height: 30px"
637 675
                   :src="
638 676
                     setAdminUserES(
639 677
                       dialysisOrder == null
@@ -655,7 +693,7 @@
655 693
                 <span style="height: 30px; display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
656 694
                   {{ getAdminUser(check == null ? 0 : check.modifier) ? getAdminUser(check == null ? 0 : check.modifier) : "" }}
657 695
                 </span>
658
-                <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:35px" v-else />
696
+                <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:30px" v-else />
659 697
               </div>
660 698
             </div>
661 699
           </div>
@@ -683,7 +721,11 @@
683 721
               <div class="under_line"
684 722
                 style="width: 50%; text-align: center"
685 723
               >
686
-                {{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : "/" }}
724
+
725
+                <span v-if="afterdialysis.is_eat !=''">
726
+                  {{ afterdialysis.is_eat ==1 ? '有' : "无" }}
727
+                </span>
728
+                <span v-else>/</span>
687 729
               </div>
688 730
             </div>
689 731
             <div class="inline_block" style="flex: 1">
@@ -696,8 +738,8 @@
696 738
               </div>
697 739
             </div>
698 740
           </div>
699
-        
700
-          <div class="row" style="display: flex;">
741
+
742
+          <div class="row" style="display: flex;padding-bottom: 10px;">
701 743
             <div class="inline_block" style="flex: 1">
702 744
               透后体重:
703 745
               <div class="under_line"
@@ -747,12 +789,20 @@
747 789
           </div>
748 790
         </div>
749 791
         <!-- 透析小结 -->
750
-        <div class="row" style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;">
751
-          <div style="height: 80px;">
752
-            治疗小结:
753
-            <span style="white-space: normal;">
754
-              {{ summary.dialysis_summary ? summary.dialysis_summary : "/"}}
755
-            </span>
792
+        <div style="width: 99%;border: 1px solid black;height: 100px;white-space: normal;">
793
+          <div style="height: 60px;padding: 5px;">
794
+            <div style="margin-bottom: 10px;">
795
+              宣教知识:
796
+              <span class="under_line"style="white-space: normal;width: 80%;">
797
+                {{ summary.mission ? summary.mission : '/' }}
798
+              </span>
799
+            </div>
800
+            <div>
801
+              治疗小结:
802
+              <span style="white-space: normal;">
803
+                {{ summary.dialysis_summary ? summary.dialysis_summary : "/"}}
804
+              </span>
805
+            </div>
756 806
           </div>
757 807
           <div style="height: 20px;text-align: right;padding-right:30%;">
758 808
             医生签名:
@@ -1718,6 +1768,7 @@ export default {
1718 1768
         this.tableAdvice = response.data.data.advices;
1719 1769
         // console.log("医嘱数据2222222222", this.advices);
1720 1770
         this.monitors = response.data.data.monitors;
1771
+        console.log('医嘱监测',this.monitors.length-1);
1721 1772
         this.summary = response.data.data.summary;
1722 1773
         this.org_template_info = response.data.data.org_template_info;
1723 1774
 
@@ -2284,7 +2335,7 @@ export default {
2284 2335
 .row {
2285 2336
   font-size: 14px;
2286 2337
   line-height: 20px;
2287
-  padding: 5px 0;
2338
+  padding: 5px;
2288 2339
 }
2289 2340
 
2290 2341
 .inline_block {

+ 2 - 2
src/xt_pages/management/index.vue Ver arquivo

@@ -31,14 +31,14 @@
31 31
           >搜索</el-button
32 32
         >
33 33
 
34
-        <!-- <el-button
34
+        <el-button
35 35
           class="filter-item"
36 36
           type="primary"
37 37
           icon="el-icon-search"
38 38
           size="small"
39 39
           @click="Auto()"
40 40
           >脚本</el-button
41
-        > -->
41
+        >
42 42
       </div>
43 43
 
44 44
       <div class="cell clearfix">

+ 3 - 2
src/xt_pages/outpatientCharges/allListPrint.vue Ver arquivo

@@ -226,7 +226,6 @@
226 226
 
227 227
               chrgitm_lvs = [...advice,...good,...project]
228 228
               
229
-              console.log('yyyyyyyyyyyy',chrgitm_lvs);
230 229
               for(let i in this.list){
231 230
                 for(let j in chrgitm_lvs){
232 231
                   if(this.list[i].is_total ==2){
@@ -330,12 +329,14 @@
330 329
                if( details[a].project.type == 2){
331 330
                  obj['name'] = details[a].project.project.project_name
332 331
                  obj['spec'] = ''
332
+                  // obj['spec'] = details[a].project.project.project_name
333 333
                  obj['unit'] = details[a].project.project.unit
334 334
 
335 335
 
336 336
                }else if(details[a].project.type == 3){
337 337
                  obj['name'] = details[a].project.good_info.good_name
338
-                 obj['spec'] = ''
338
+                //  obj['spec'] = ''
339
+                 obj['spec'] = details[a].project.good_info.specification_name
339 340
                  obj['unit'] = details[a].project.good_info.packing_unit
340 341
 
341 342
                }

+ 1 - 4
src/xt_pages/outpatientCharges/allListTemplate/printFour.vue Ver arquivo

@@ -117,7 +117,7 @@ export default {
117 117
 
118 118
     },
119 119
     getPage() {
120
-     
120
+      console.log('bbbbbbbbb',this.list);
121 121
       if (this.list.length <= 27) {
122 122
         this.page = 1
123 123
         this.pageArr.push(this.list.length)
@@ -156,9 +156,6 @@ export default {
156 156
   },
157 157
   created(){
158 158
     this.org_id = this.$store.getters.xt_user.org_id
159
-    console.log('hospital',this.hospital);
160
-    console.log('order',this.order);
161
-    console.log('kkkkkk',this.list);
162 159
   },
163 160
   watch: {
164 161
     list: {

+ 6 - 6
src/xt_pages/outpatientCharges/components/prescriptionTable.vue Ver arquivo

@@ -34,6 +34,12 @@
34 34
           }}</span></template
35 35
         >
36 36
       </el-table-column>
37
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
38
+        <template slot-scope="scope">
39
+          <div>{{ scope.row.spec }}</div>
40
+        </template>
41
+      </el-table-column>
42
+      
37 43
       <el-table-column align="center" prop="name" width="80" label="单次用量">
38 44
         <template slot-scope="scope">
39 45
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
@@ -80,12 +86,6 @@
80 86
         </template>
81 87
       </el-table-column>
82 88
 
83
-      <el-table-column align="center" prop="name" width="80" label="规格/型号">
84
-        <template slot-scope="scope">
85
-          <div>{{ scope.row.spec }}</div>
86
-        </template>
87
-      </el-table-column>
88
-
89 89
       <el-table-column align="center" prop="name" width="60" label="金额">
90 90
         <template slot-scope="scope">
91 91
           <div>{{ scope.row.det_item_fee_sumamt }}</div>

+ 4 - 4
src/xt_pages/outpatientDoctorStation/treatPrint.vue Ver arquivo

@@ -16,11 +16,11 @@
16 16
         <!-- 此下条为本地开发下页面 -->
17 17
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
18 18
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
19
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610 &&org_id != 10598 &&org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
19
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610 &&org_id != 10598 &&org_id != 10537 &&org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
20 20
         <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
21
-        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
22
-        <printFour v-if="org_id == 10598 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
23
-      
21
+        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 10537 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
22
+        <printFour v-if="org_id == 10598 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
23
+
24 24
       </div>
25 25
   </div>
26 26
 </template>

+ 1 - 1
src/xt_pages/outpatientDoctorStation/treatTemplate/printFour.vue Ver arquivo

@@ -38,7 +38,7 @@
38 38
                 <div style="width:100%;">诊断:{{getDiagnosis(item.info.diagnosis)}}</div>
39 39
             </div>
40 40
 
41
-            <div class="prescriptionBox" style="min-height: 380px;">
41
+            <div class="prescriptionBox" style="min-height: 450px;">
42 42
                 <table style="width:100%;text-align:center;line-height:25px;">
43 43
                     <tr>
44 44
                         <td>序号</td>

+ 2 - 13
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue Ver arquivo

@@ -1,12 +1,7 @@
1 1
 <template>
2 2
     <div id='prescriptionPrint'>
3 3
         <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
4
-            <span v-if="org_id == 10537 || org_id ==0">
5
-              <img
6
-                src="	https://kuyi.shengws.com/xuwenshou.jpg"
7
-                style="width: 100%"
8
-                alt=""/>
9
-            </span>
4
+           
10 5
             <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
11 6
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
12 7
                     <span>费别</span>
@@ -125,7 +120,6 @@
125 120
                     :src="setAdminUserES(item.creator,item.doctor)"
126 121
                     alt=""
127 122
                     srcset=""
128
-
129 123
                   />
130 124
                 </div>
131 125
                 <div style="width: 300px;">签章:</div>
@@ -159,12 +153,7 @@
159 153
                   </tr>
160 154
               </table>
161 155
             </div>
162
-            <span v-if="org_id == 10537 || org_id ==0">
163
-            <img
164
-              src="https://kuyi.shengws.com/xuwenwei.jpg"
165
-              style="width: 100%"
166
-              alt=""
167
-            /></span>
156
+            
168 157
         </div>
169 158
 
170 159
 

+ 15 - 3
src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue Ver arquivo

@@ -19,12 +19,18 @@
19 19
           style="width: 100%"
20 20
           alt=""
21 21
       /></span>
22
-      <span v-if="org_id == 10610 ||org_id ==0">
22
+      <span v-if="org_id == 10610 ">
23 23
         <img
24 24
           src="@/assets/img/penggang_top.jpg"
25 25
           style="width: 100%"
26 26
           alt=""
27 27
       /></span>
28
+      <span v-if="org_id == 10537 ||org_id ==0">
29
+        <img
30
+          src="	https://kuyi.shengws.com/xuwenshou.jpg"
31
+          style="width: 100%"
32
+          alt=""/>
33
+      </span>
28 34
       <div class="printTitle">
29 35
         治疗单
30 36
         <span
@@ -196,7 +202,7 @@
196 202
             v-else
197 203
           />
198 204
         </div>
199
-        <!-- <div>药品金额:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}</div> -->
205
+        
200 206
       </div>
201 207
       <div style="display: flex">
202 208
         <div style="display: flex">核对护士:</div>
@@ -218,12 +224,18 @@
218 224
           style="width: 100%"
219 225
           alt=""
220 226
       /></span>
221
-      <span v-if="org_id == 10610 ||org_id ==0">
227
+      <span v-if="org_id == 10610 ">
222 228
         <img
223 229
           src="@/assets/img/penggang_bottom.jpg"
224 230
           style="width: 100%"
225 231
           alt=""
226 232
       /></span>
233
+      <span v-if="org_id == 10537 ||org_id ==0">
234
+      <img
235
+        src="@/assets/img/xuwendizhi.jpg"
236
+        style="width: 100%"
237
+        alt=""
238
+      /></span>
227 239
       <div style="page-break-after: always"></div>
228 240
     </div>
229 241
 

+ 6 - 5
src/xt_pages/stock/query/purchaseNewStockQuery.vue Ver arquivo

@@ -268,7 +268,8 @@ export default {
268 268
               if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
269 269
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
270 270
               }else{
271
-               
271
+                console.log("HHAHHAHA",list[i].id)
272
+                console.log("耗材id",list[i].specification_name)
272 273
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
273 274
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
274 275
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )
@@ -278,7 +279,7 @@ export default {
278 279
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
279 280
                 }else{
280 281
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
281
-                  console.log("剩余库存---------------",list[i].stockIn)
282
+                  // console.log("剩余库存---------------",list[i].stockIn)
282 283
                   if(list[i].stockIn <0){
283 284
                     list[i].stockIn =0
284 285
                   }
@@ -300,9 +301,9 @@ export default {
300 301
               if(this.org_id == 10265){
301 302
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
302 303
               }else{
303
-                console.log("期初",list[i].stockIn)
304
-                console.log("增加",list[i].stockAdd)
305
-                console.log("出库",list[i].outStock)
304
+                // console.log("期初",list[i].stockIn)
305
+                // console.log("增加",list[i].stockAdd)
306
+                // console.log("出库",list[i].outStock)
306 307
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
307 308
                   list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
308 309
                 }else{

+ 36 - 4
src/xt_pages/stock/selfPreparedMedicine/index.vue Ver arquivo

@@ -2,14 +2,14 @@
2 2
     <div class="main-contain">
3 3
         <div class="position">
4 4
             <bread-crumb :crumbs="crumbs"></bread-crumb>
5
-            <el-button
5
+            <!-- <el-button
6 6
                 size="small"
7 7
                 @click="setting"
8 8
                 class="filter-item"
9 9
                 style="float:right;"
10 10
                 type="primary"
11 11
                 >设置
12
-            </el-button>
12
+            </el-button> -->
13 13
         </div>
14 14
 
15 15
         <div class="app-container">
@@ -60,14 +60,46 @@
60 60
                     <div style="display:flex;justify-content: space-between;align-items: center;">
61 61
                         <div class="tablesTitle">自备药列表</div>
62 62
                         <div>
63
-                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
63
+                            <!-- <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button> -->
64 64
                             <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
65 65
                             <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
66 66
                         </div>
67 67
                     </div>
68 68
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
69 69
                         <el-table-column align="center" prop="dialysis_no" label="药品名称" width="120">
70
-                            <template slot-scope="scope">{{scope.row.drug_name}}</template>
70
+                            <template slot-scope="scope">
71
+                              <el-form-item style="padding-top: 20px">
72
+                                  <el-autocomplete
73
+                                    class="checkSearch"
74
+                                    popper-class="my-autocomplete"
75
+                                    v-model="scope.row.drug_name"
76
+                                    :fetch-suggestions="querySearchAsync"
77
+                                    :trigger-on-focus="true"
78
+                                    placeholder="请输入药品名称"
79
+                                    @select="handleSelect"
80
+                                    @input="changeDrugName(scope.$index)"
81
+                                    style="width: 160px"
82
+                                  >
83
+                                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
84
+                                    <template slot-scope="{ item }">
85
+                                      <div class="name">
86
+                                        {{
87
+                                          item.drug_name +
88
+                                          item.dose +
89
+                                          item.dose_unit +
90
+                                          "*" +
91
+                                          item.min_number +
92
+                                          item.min_unit +
93
+                                          "/" +
94
+                                          item.max_unit +
95
+                                          "  " +
96
+                                          item.manufacturer
97
+                                        }}
98
+                                      </div>
99
+                                    </template>
100
+                                  </el-autocomplete>
101
+                                </el-form-item>
102
+                            </template>
71 103
                         </el-table-column>
72 104
                         <el-table-column align="center" prop="name" label="规格名称">
73 105
                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>

+ 1 - 3
src/xt_pages/stock/stockOutOrder.vue Ver arquivo

@@ -2526,8 +2526,7 @@ export default {
2526 2526
       }
2527 2527
      }
2528 2528
      if(count > 0){
2529
-      console.log("good_id",good_id)
2530
-      console.log("数量我哦哦我",count)
2529
+     
2531 2530
       return count
2532 2531
      }else{
2533 2532
       return 0 
@@ -2536,7 +2535,6 @@ export default {
2536 2535
      
2537 2536
     },
2538 2537
     getRow(row){
2539
-      console.log("row233323232",row)
2540 2538
       var name = ""
2541 2539
       if(this.stockFlowList!=null && this.stockFlowList.length > 0){
2542 2540
         for(let i=0;i<this.stockFlowList.length;i++){

+ 14 - 3
src/xt_pages/user/Informed/Informedconsent.vue Ver arquivo

@@ -124,7 +124,7 @@
124 124
                   <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity" @getPatientMeDicalList="getPatientMeDicalList"></Medicalhistory>
125 125
                 </div>
126 126
                 <div v-if="show14">
127
-                  <heal_informed :patient_id ="this.patientID" ></heal_informed>
127
+                  <heal_informed :patient_id ="this.patientID" ref="childSeventy" ::patientTreamentPlan="patientTreamentPlan" @getTreamentPlan="getTreamentPlan"></heal_informed>
128 128
                 </div>
129 129
                 <div v-if="show15">
130 130
                   <criticalpatient_informed :patient_id ="this.patientID" ref="childFivety" :patientCritaicalInformedPrint="patientCritaicalInformedPrint" @getPatientCriticalList="getPatientCriticalList"></criticalpatient_informed>
@@ -160,7 +160,7 @@ import Medicalhistory from './components/Medicalhistory'
160 160
 import heal_informed from './components/heal_informed'
161 161
 import criticalpatient_informed from './components/criticalpatient_informed'
162 162
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
163
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList } from '@/api/patient'
163
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
164 164
 export default {
165 165
 
166 166
   components: {
@@ -226,7 +226,8 @@ export default {
226 226
       dialyzerInformedPrint:{},
227 227
       therapyinformePrint:{},
228 228
       patientCritaicalInformedPrint:{},
229
-      patientCritaicalInformedOnePrint:{}
229
+      patientCritaicalInformedOnePrint:{},
230
+      patientTreamentPlan:{}
230 231
     }
231 232
 
232 233
   },
@@ -390,6 +391,15 @@ export default {
390 391
         }
391 392
       })
392 393
     },
394
+    getTreamentPlan(){
395
+      getTreamentPlan().then(response=>{
396
+        if(response.data.state ==1){
397
+          var list = response.data.data.treamentPlan
398
+          this.patientTreamentPlan = list  
399
+          this.$refs.childSeventy.show(list)
400
+        }
401
+      })
402
+    },
393 403
    
394 404
     rowClick(row, column, event){
395 405
      console.log('1111',row);
@@ -660,6 +670,7 @@ export default {
660 670
           this.show14=true,
661 671
           this.show15=false,
662 672
           this.show16=false
673
+          this.getTreamentPlan()
663 674
         }
664 675
         if(row.value==15){
665 676
      

+ 35 - 3
src/xt_pages/user/Informed/components/heal_informed.vue Ver arquivo

@@ -81,7 +81,7 @@
81 81
         </div>
82 82
         <span slot="footer" class="dialog-footer">
83 83
           <el-button @click="dialogVisible = false">取 消</el-button>
84
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
84
+          <el-button type="primary" @click="saveTreamtPlan">确 定</el-button>
85 85
         </span>
86 86
       </el-dialog>
87 87
 
@@ -91,7 +91,7 @@
91 91
 <script>
92 92
 import print from "print-js";
93 93
 import Editor from '@/components/Editor'
94
-import { getPatientDetailInformedconsent  } from '@/api/patient'
94
+import { getPatientDetailInformedconsent,saveTreamtPlan  } from '@/api/patient'
95 95
 import { jsGetAge, uParseTime } from "@/utils/tools";
96 96
 const content=`<p style='padding-left: 2em;margin-top: 10px;margin-bottom: 4px'>
97 97
   <span class="abs-index"></span>患者透析过程中出现低血压95/76mmHg,诉有头晕,予以最低超滤量,并回0.9%氯化钠200m1,原来超滤量减少200ml,建议患者控制透析间期体重增加不超5%,患者本人表示不同意医生处理方案,认为超滤量不能改,而且不能回水,那样会导致积水,经解释沟通后,患者家属仍坚持低血压时不予改超滤量,不同意回水处理,并表示后果自负,今由于患者本人多次不同意医生的处理方案,多次拒绝医生一切处理方案,医生也已将透析中反复低血压可能导致的后果如:导致内痿血流不足,内痿栓塞,内痿朋塌,严重低血压导致休克死亡等后果充分告知其家属,患者家属表示知情,后果自负,签字为证
@@ -117,7 +117,10 @@ export default{
117 117
   props: {
118 118
     patient_id: {
119 119
         type: Number,
120
-      }
120
+      },
121
+    patientTreamentPlan:{
122
+       type:Object,
123
+    }
121 124
   },
122 125
   components:{
123 126
     Editor
@@ -174,9 +177,38 @@ export default{
174 177
       },
175 178
       bianji(){
176 179
         this.dialogVisible=true
180
+      },
181
+      show(val){    
182
+       if(val!=null){
183
+        console.log("valw233223",val)
184
+         if(val.content!=""){
185
+           this.content = ""
186
+           this.content = val.content
187
+         }
188
+         
189
+       }
190
+     },
191
+      saveTreamtPlan(){
192
+        var params = {
193
+          content:this.$refs.editor.content
194
+         }
195
+        saveTreamtPlan(params).then(response=>{
196
+            if(response.data.state ==1){
197
+              var list = response.data.data.list
198
+              this.$emit('fMethod',list);
199
+              this.dialogVisible = false
200
+              this.$emit("getTreamentPlan","");
201
+            }
202
+        })
177 203
       }
178 204
   },
179 205
   created(){
206
+    console.log("hahhahahahahahwo",this.patientTreamentPlan)
207
+    if(this.patientTreamentPlan!=null && this.patientTreamentPlan.id >0){
208
+      
209
+      this.content = ""
210
+      this.content = this.patientTreamentPlan.content
211
+    }
180 212
     this.getlist()
181 213
   }
182 214
 }