Kaynağa Gözat

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

陈少旭 11 ay önce
ebeveyn
işleme
029fe8e8a4

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue Dosyayı Görüntüle

@@ -2920,20 +2920,20 @@
2920 2920
                           <template
2921 2921
                             v-if="
2922 2922
                               record.prescription &&
2923
-                              record.prescription.creater
2923
+                              record.prescription.prescription_doctor
2924 2924
                             "
2925 2925
                           >
2926 2926
                             <span
2927 2927
                               v-if="
2928 2928
                                 setAdminUserES(
2929 2929
                                   record.prescription,
2930
-                                  'creater'
2930
+                                  'prescription_doctor'
2931 2931
                                 ) == ''
2932 2932
                               "
2933 2933
                               >{{
2934 2934
                                 getAdminUser(
2935 2935
                                   record.prescription,
2936
-                                  "creater"
2936
+                                  "prescription_doctor"
2937 2937
                                 )
2938 2938
                               }}</span
2939 2939
                             >
@@ -2942,7 +2942,7 @@
2942 2942
                               :src="
2943 2943
                                 setAdminUserES(
2944 2944
                                   record.prescription,
2945
-                                  'creater'
2945
+                                  'prescription_doctor'
2946 2946
                                 )
2947 2947
                               "
2948 2948
                               alt=""

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Dosyayı Görüntüle

@@ -857,7 +857,7 @@
857 857
                             : "/"
858 858
                         }}
859 859
                          </span>
860
-                         {{dialysisOrder.dialysis_irrigation  }}
860
+                         {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
861 861
 
862 862
                       </div>
863 863
                     </div>
@@ -2088,7 +2088,7 @@
2088 2088
                       导管:
2089 2089
                       <div
2090 2090
                         class="under_line"
2091
-                        style="min-width: 120px; text-align: center"
2091
+                        style="width: 120px; text-align: center;white-space: normal"
2092 2092
                       >
2093 2093
                         {{
2094 2094
                           afterdialysis.catheter ? afterdialysis.catheter : "/"
@@ -2519,6 +2519,7 @@
2519 2519
                   </div>
2520 2520
                 </td>
2521 2521
               </tr>
2522
+              <!--  -->
2522 2523
               <tr v-if="(org_id ==10677 || org_id == 0) && dialysisOrder.quality_nurse_id>0">
2523 2524
                 <td colspan="7" >
2524 2525
                   <div

+ 2 - 2
src/xt_pages/hospitalStation/doctorDesk.vue Dosyayı Görüntüle

@@ -140,7 +140,7 @@
140 140
           </div>
141 141
 
142 142
       </div>
143
-
143
+      <!-- 电子处方打印弹窗 -->
144 144
       <el-dialog
145 145
               title="打印"
146 146
               :visible.sync="centerDialogVisible"
@@ -435,7 +435,7 @@ export default {
435 435
         })
436 436
       }else{
437 437
         const style =
438
-        '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
438
+        '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 24px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
439 439
         printJS({
440 440
           printable: 'printMain',
441 441
           type: 'html',

+ 1 - 1
src/xt_pages/outpatientCharges/allListTemplate/printOne.vue Dosyayı Görüntüle

@@ -7,7 +7,7 @@
7 7
         <div>透析号:{{ patient.dialysis_no }}</div>
8 8
         <div>性别:{{ patient.gender == 1 ? '男' : '女' }}</div>
9 9
         <div>年龄:{{ patient.age }} 岁</div>
10
-        <div v-if="$store.getters.xt_user.org_id  != 0">处方日期:{{ gettime(order.setl_time) }}
10
+        <div v-if="$store.getters.xt_user.org_id  == 10644">处方日期:{{ gettime(order.setl_time) }}
11 11
           <!-- {{ hospital.in_hosptial_time }} 至
12 12
           {{ hospital.out_hosptial_time }} -->
13 13
         </div>

+ 28 - 10
src/xt_pages/outpatientCharges/statementPrint.vue Dosyayı Görüntüle

@@ -20,7 +20,9 @@
20 20
           org_id == 10138 ||
21 21
           org_id == 9504 ||
22 22
           org_id == 10028 ||
23
-          org_id == 10278 || org_id == 10610 || org_id == 0
23
+          org_id == 10278 ||
24
+          org_id == 10610 ||
25
+          org_id==10537
24 26
         "
25 27
       >
26 28
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -28,10 +30,10 @@
28 30
           :info="info"
29 31
           :paramsObj="paramsObj"
30 32
           :balanceAccounts="balanceAccounts"
31
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 0"
33
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
32 34
         ></printThree>
33 35
         <printFour
34
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  "
36
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 || org_id == 0"
35 37
           :info="info"
36 38
           :paramsObj="paramsObj"
37 39
           :balanceAccounts="balanceAccounts"
@@ -47,7 +49,7 @@
47 49
       <!--      ></printFive>-->
48 50
 
49 51
       <printSeven
50
-        v-if="org_id == 10387"
52
+        v-if="org_id == 10387 "
51 53
         :info="info"
52 54
         :paramsObj="paramsObj"
53 55
         :balanceAccounts="balanceAccounts"
@@ -62,11 +64,13 @@
62 64
       <printthirteen :info="info" v-if="org_id == 10510"></printthirteen>
63 65
       <!-- 广水原生堂 -->
64 66
       <printfourteen :info="info" v-if="(org_id == 10088 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
67
+      <!-- 盱眙恒硕 -->
68
+      <printfivetheen :info="info" v-if="org_id == 10633 || org_id == 0"></printfivetheen>
65 69
       <printOne :info="info" v-if=" org_id != 9990 &&
66 70
             org_id != 10138 &&
67 71
             org_id != 9504 &&
68 72
             org_id != 10028 &&
69
-            org_id != 0 &&   org_id != 10610 &&
73
+            org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
70 74
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 0   && this.paramsObj.balance_accounts_type == 1">
71 75
       </printOne>
72 76
 
@@ -74,7 +78,7 @@
74 78
             org_id != 10138 &&
75 79
             org_id != 9504 &&
76 80
             org_id != 10028 &&
77
-            org_id != 10278 && org_id != 10610  && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
81
+            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
78 82
       </privateChargePrint>
79 83
 
80 84
     </div>
@@ -101,6 +105,7 @@ import printEleven from './statementTemplate/printeEleven'
101 105
 import printtwelve from './statementTemplate/printtwelve'
102 106
 import printthirteen from './statementTemplate/printthirteen'
103 107
 import printfourteen from './statementTemplate/printfourteen'
108
+import printfivetheen from './statementTemplate/printfivetheen'
104 109
 export default {
105 110
   name: 'dialysisPrintOrder',
106 111
   components: {
@@ -118,7 +123,8 @@ export default {
118 123
     printEleven,
119 124
     printtwelve,
120 125
     printthirteen,
121
-    printfourteen
126
+    printfourteen,
127
+    printfivetheen,
122 128
   },
123 129
   props: {
124 130
     paramsObj: Object
@@ -481,10 +487,10 @@ export default {
481 487
           })
482 488
 
483 489
         }else if (
484
-          this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0
490
+          this.$store.getters.xt_user.org_id == 10480
485 491
         ) {
486 492
           const style =
487
-            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
493
+            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable {border-collapse: collapse;} table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
488 494
           printJS({
489 495
             printable: 'statement-print',
490 496
             type: 'html',
@@ -501,9 +507,21 @@ export default {
501 507
             style: style,
502 508
             scanStyles: false
503 509
           })
510
+        }else if (
511
+          this.$store.getters.xt_user.org_id == 10633 || this.$store.getters.xt_user.org_id == 0
512
+        ) {
513
+          const style =
514
+            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable {border-collapse: collapse;} table tr td {padding: 2px;line-height: 30px;border: 1px solid black;}'
515
+          printJS({
516
+            printable: 'statement-print',
517
+            type: 'html',
518
+            style: style,
519
+            scanStyles: false
520
+          })
521
+
504 522
         } else {
505 523
           const style =
506
-            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
524
+            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable{border-collapse: collapse;} table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
507 525
           printJS({
508 526
             printable: 'statement-print',
509 527
             type: 'html',

+ 6 - 4
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue Dosyayı Görüntüle

@@ -5,6 +5,7 @@
5 5
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
6 6
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
7 7
         <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10610" src="https://kuyi.shengws.com/156.jpg" alt="">
8
+        <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10537" src="https://kuyi.shengws.com/xuwenshou.jpg" alt="">
8 9
 
9 10
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
10 11
           <div style="display:flex;">
@@ -153,13 +154,14 @@
153 154
           </div>
154 155
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
155 156
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
156
-        <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
157
-
157
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
158
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/xuwenwei.jpg" alt="">
158 159
       </div>
159 160
       <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
160 161
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
161 162
           <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
162 163
         <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10610" src="https://kuyi.shengws.com/156.jpg" alt="">
164
+        <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10537" src="https://kuyi.shengws.com/xuwenshou.jpg" alt="">
163 165
 
164 166
 
165 167
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
@@ -304,8 +306,8 @@
304 306
           </div>
305 307
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
306 308
           <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278"src="https://kuyi.shengws.com/bailinbeier.png" alt="">
307
-        <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
308
-
309
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/157.jpg" alt="">
310
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10610"src="https://kuyi.shengws.com/xuwenwei.jpg" alt="">
309 311
 
310 312
       </div>
311 313
   </div>

+ 14 - 2
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue Dosyayı Görüntüle

@@ -16,10 +16,16 @@
16 16
       />
17 17
       <img
18 18
         style="width: 100%; height: 80px"
19
-        v-if="org_id == 10610 || org_id == 0"
19
+        v-if="org_id == 10610"
20 20
         src="@/assets/img/penggang_top.jpg"
21 21
         alt=""
22 22
       />
23
+      <img
24
+        style="width: 100%; height: 80px"
25
+        v-if="org_id == 10537 || org_id == 0"
26
+        src="https://kuyi.shengws.com/xuwenshou.jpg"
27
+        alt=""
28
+      />
23 29
       <div class="printTitle" v-if="org_id ==10598||org_id==0">孝感源生堂血液透析中心</div>
24 30
       <div class="printTitle">检验申请单</div>
25 31
 
@@ -169,10 +175,16 @@
169 175
       />
170 176
       <img
171 177
         style="width: 100%"
172
-        v-if="org_id == 10610 || org_id == 0"
178
+        v-if="org_id == 10610"
173 179
         src="@/assets/img/penggang_bottom.jpg"
174 180
         alt=""
175 181
       />
182
+      <img
183
+        style="width: 100%"
184
+        v-if="org_id == 10537 || org_id == 0"
185
+        src="https://kuyi.shengws.com/xuwenwei.jpg"
186
+        alt=""
187
+      />
176 188
     </div>
177 189
   </div>
178 190
 </template>

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue Dosyayı Görüntüle

@@ -236,7 +236,7 @@
236 236
         </el-select>
237 237
       </el-form-item>
238 238
 
239
-      <el-form-item label="发病日期: " prop="name" style="width: 49%">
239
+      <el-form-item label="就诊日期: " prop="name" style="width: 49%">
240 240
         <el-date-picker
241 241
           style="width: 100%"
242 242
           v-model="start_time"

+ 13 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue Dosyayı Görüntüle

@@ -1,7 +1,12 @@
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
-
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>
5 10
             <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
6 11
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
7 12
                     <span>费别</span>
@@ -16,7 +21,7 @@
16 21
 
17 22
             <div class="printTitle">{{orgname}}</div>
18 23
             <div class="printTitle">处方、治疗单</div>
19
-<!-- class="infoTitle" -->
24
+            <!-- class="infoTitle" -->
20 25
             <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
21 26
                 <div style="width: 300px;">门诊编号:</div>
22 27
                 <div style="width: 300px;">电脑号:</div>
@@ -154,6 +159,12 @@
154 159
                     <td style="width:16px;"></td>
155 160
                 </tr>
156 161
             </table>
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>
157 168
         </div>
158 169
 
159 170
 

+ 1 - 1
src/xt_pages/stock/drugs/historyDrugInvetory.vue Dosyayı Görüntüle

@@ -96,7 +96,7 @@
96 96
             </el-table-column>
97 97
             <el-table-column label="入库数量"  align="center">
98 98
               <template slot-scope="scope">
99
-                {{scope.row.warehousing_count}}
99
+                {{scope.row.warehousing_count}}{{scope.row.max_unit}}
100 100
               </template>
101 101
             </el-table-column>
102 102
             <el-table-column label="有效期"  align="center">

+ 2 - 2
src/xt_pages/stock/drugs/newDrugInventory.vue Dosyayı Görüntüle

@@ -836,8 +836,8 @@ export default {
836 836
                 list[i].drug_name = list[i].XtBaseDrug.drug_name
837 837
                 list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
838 838
                 list[i].warehouseing_unit = list[i].max_unit
839
-                list[i].max_unit = list[i].XtBaseDrug.max_unit
840
-                list[i].min_unit = list[i].XtBaseDrug.min_unit
839
+                list[i].base_max_unit = list[i].XtBaseDrug.max_unit
840
+                list[i].base_min_unit = list[i].XtBaseDrug.min_unit
841 841
                 list[i].last_stock_max_number = ""
842 842
                 list[i].last_stock_min_number = ""
843 843
                 list[i].min_number = list[i].XtBaseDrug.min_number