Просмотр исходного кода

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

XMLWAN 4 лет назад
Родитель
Сommit
523102dbba

+ 4 - 4
src/xt_pages/dialysis/details/DialysisPrescription.vue Просмотреть файл

@@ -15,8 +15,8 @@
15 15
           <span class="content">{{
16 16
             replacement_total != "0" ? replacement_total : ""
17 17
           }}</span>
18
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
19
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
18
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
19
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
20 20
 
21 21
         </li>
22 22
 
@@ -81,8 +81,8 @@
81 81
           <span class="content">{{
82 82
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
83 83
           }}</span>
84
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
85
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
84
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
85
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
86 86
         </li>
87 87
         <li v-if="isShow('葡萄糖')">
88 88
           <label>葡萄糖 : </label>

+ 2 - 2
src/xt_pages/dialysis/details/assessmentAfter.vue Просмотреть файл

@@ -17,8 +17,8 @@
17 17
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
18 18
             actual_ultrafiltration
19 19
           }}</span>
20
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26) " >ml</span>
21
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26" >L</span>
20
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28) " >ml</span>
21
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28" >L</span>
22 22
         </li>
23 23
         <li v-if="isShow('导管')">
24 24
           <label>导管 : </label>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Просмотреть файл

@@ -28,7 +28,7 @@
28 28
           <el-col :span="8" v-if="isShow('实际超滤量')">
29 29
             <el-form-item
30 30
               label="实际超滤量(ml): "
31
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26"  >
31
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28"  >
32 32
               <el-input v-model="form.actual_ultrafiltration"></el-input>
33 33
             </el-form-item>
34 34
             <el-form-item label="实际超滤量(L): " v-else>

+ 4 - 4
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Просмотреть файл

@@ -87,7 +87,7 @@
87 87
           </el-col>
88 88
 
89 89
           <el-col :span="8"
90
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26)">
90
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28)">
91 91
             <el-form-item label="目标超滤量(ml):">
92 92
               <el-input
93 93
                 type="number"
@@ -97,7 +97,7 @@
97 97
           </el-col>
98 98
 
99 99
           <el-col :span="8"
100
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26">
100
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28">
101 101
             <el-form-item label="目标超滤量(L):">
102 102
               <el-input
103 103
                 type="number"
@@ -223,7 +223,7 @@
223 223
 
224 224
 
225 225
 
226
-          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)"
226
+          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28)"
227 227
                   v-show="zhiShow">
228 228
             <el-form-item label="置换量(ml):">
229 229
               <el-input
@@ -232,7 +232,7 @@
232 232
               ></el-input>
233 233
             </el-form-item>
234 234
           </el-col>
235
-          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20"
235
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28"
236 236
                   v-show="zhiShow">
237 237
             <el-form-item label="置换量(L):">
238 238
               <el-input

+ 53 - 60
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue Просмотреть файл

@@ -1,8 +1,8 @@
1 1
 <template>
2 2
   <div id="dialysis-print-box">
3 3
     <div class="dialysis-print-order">
4
-      <div class="order-yy-name">{{ orgname }}</div>
5
-      <div class="order-title">血液净化治疗记录单</div>
4
+      <!-- <div class="order-yy-name">{{ orgname }}</div> -->
5
+      <div class="order-title">{{ orgname }}&nbsp;&nbsp;血液净化治疗记录单</div>
6 6
       <table class="table-box" style="margin-top: 10px;">
7 7
         <tbody>
8 8
         <tr>
@@ -342,7 +342,7 @@
342 342
               <tbody>
343 343
               <tr>
344 344
                 <td width="70">血管通路:</td>
345
-                <td width="580">
345
+                <td width="600">
346 346
                   <div>
347 347
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
348 348
                     &nbsp;
@@ -380,10 +380,10 @@
380 380
                 <td width="70">穿刺针:</td>
381 381
                 <td width="180">
382 382
                   <div>
383
-                    <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('15G') > -1 ? true : false" showValue="15G"></label-box>
384
-                    &nbsp;
385 383
                     <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : false" showValue="16G"></label-box>
386 384
                     &nbsp;
385
+                    <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
386
+                    &nbsp;
387 387
                     <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
388 388
                     &nbsp;
389 389
                   </div>
@@ -619,15 +619,11 @@
619 619
                 <td width="120">
620 620
                   ( 1.5mmol/L )
621 621
                 </td>
622
+                <td width="10">钾</td>
622 623
                 <td width="50">
623
-                  <label-box :isChecked="prescription.dialysate_formulation_name == '钾' ? true : false" showValue="钾"></label-box>
624
-                </td>
625
-                <td width="10">(</td>
626
-                <td width="50">
627
-                  <div class="under-line">&nbsp;<span v-if="prescription.dialysate_formulation_name == '钾'">{{ prescription.kalium ? prescription.kalium : "" }}</span></div>
624
+                  <div class="under-line">&nbsp;{{ prescription.kalium ? prescription.kalium : "" }}</div>
628 625
                 </td>
629 626
                 <td width="10">mmol/L</td>
630
-                <td width="10">)</td>
631 627
                 <td></td>
632 628
 
633 629
                 <!-- <td width="50">
@@ -1091,7 +1087,7 @@
1091 1087
                   <td width="20">ml</td>
1092 1088
                   <td width="30">V端</td>
1093 1089
                   <td width="30">
1094
-                    <div class="under-line">{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
1090
+                    <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
1095 1091
                   </td>
1096 1092
                   <td width="20">ml</td>
1097 1093
                   <td></td>
@@ -1167,33 +1163,8 @@
1167 1163
                       <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度')> -1  ? true : false" showValue="+ + +"></label-box>
1168 1164
                     </div>
1169 1165
                   </td>
1170
-                  <!--<td width="80"></td>-->
1171
-                  <!--<td width="60">管路:</td>-->
1172
-                  <!--<td width="220">-->
1173
-                  <!--<div style="display:flex;justify-content:space-between;">-->
1174
-                  <!--<label-box showValue="无" :isChecked="-->
1175
-                  <!--afterdialysis.channel == 1 ? true : false-->
1176
-                  <!--"></label-box>-->
1177
-                  <!--<label-box showValue="+" :isChecked="-->
1178
-                  <!--afterdialysis.channel == 2 ? true : false-->
1179
-                  <!--"></label-box>-->
1180
-                  <!--<label-box showValue="+ +" :isChecked="-->
1181
-                  <!--afterdialysis.channel == 3  ? true : false-->
1182
-                  <!--"></label-box>-->
1183
-                  <!--<label-box showValue="+ + +" :isChecked="-->
1184
-                  <!--afterdialysis.channel == 4 ? true : false-->
1185
-                  <!--"></label-box>-->
1186
-                  <!--</div>-->
1187
-                  <!--</td>-->
1188
-                  <td></td>
1189
-                </tr>
1190
-                </tbody>
1191
-              </table>
1192
-
1193
-              <table class="table-box">
1194
-                <tbody>
1195
-                  <tr>
1196
-                    <td width="70">静脉管道:</td>
1166
+                  <td width="20"></td>
1167
+                  <td width="70">静脉管道:</td>
1197 1168
                     <td width="220">
1198 1169
                       <div style="display:flex;justify-content:space-between;">
1199 1170
                         <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>
@@ -1202,7 +1173,7 @@
1202 1173
                         <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>
1203 1174
                       </div>
1204 1175
                     </td>
1205
-                    <td width="80"></td>
1176
+                    <td width="20"></td>
1206 1177
                     <td width="70">动脉管道:</td>
1207 1178
                     <td width="220">
1208 1179
                       <div style="display:flex;justify-content:space-between;">
@@ -1212,10 +1183,11 @@
1212 1183
                         <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>
1213 1184
                       </div>
1214 1185
                     </td>
1215
-                    <td></td>
1216
-                  </tr>
1186
+                  <td></td>
1187
+                </tr>
1217 1188
                 </tbody>
1218 1189
               </table>
1190
+
1219 1191
               <table class="table-box">
1220 1192
                 <tbody>
1221 1193
                 <tr>
@@ -1248,15 +1220,7 @@
1248 1220
                     </div>
1249 1221
                   </td>
1250 1222
                   <td width="35">min</td>
1251
-                  <td></td>
1252
-                </tr>
1253
-                </tbody>
1254
-              </table>
1255
-
1256
-              <table class="table-box">
1257
-                <tbody>
1258
-                  <tr>
1259
-                    <td width="40">去向:</td>
1223
+                  <td width="40">去向:</td>
1260 1224
                     <td width="160">
1261 1225
                       <div style="display:flex;justify-content:space-between;">
1262 1226
                         <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
@@ -1267,10 +1231,12 @@
1267 1231
                     <td>
1268 1232
                       <div class="under-line">&nbsp;</div>
1269 1233
                     </td>
1270
-                  </tr>
1234
+                </tr>
1271 1235
                 </tbody>
1272 1236
               </table>
1273 1237
 
1238
+              
1239
+
1274 1240
               <!-- <table class="table-box">
1275 1241
                 <tbody>
1276 1242
                   <tr>
@@ -1868,18 +1834,34 @@ export default {
1868 1834
         }
1869 1835
       },
1870 1836
       getNumber() {
1871
-        if (this.dialysisOrder != null) {
1837
+      if (this.dialysisOrder != null) {
1838
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
1872 1839
           return (
1873
-            //   this.patientInfo.DialysisSchedule.device_zone.name +
1840
+            this.patientInfo.DialysisSchedule.device_zone.name +
1874 1841
             this.dialysisOrder.DeviceNumber.number
1875
-          )
1842
+          );
1876 1843
         } else {
1877 1844
           return (
1878
-            //   this.patientInfo.DialysisSchedule.device_zone.name +
1845
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
1846
+            this.dialysisOrder.DeviceNumber.number
1847
+          );
1848
+        }
1849
+        
1850
+      } else {
1851
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
1852
+          return (
1853
+            this.patientInfo.DialysisSchedule.device_zone.name +
1879 1854
             this.patientInfo.DialysisSchedule.device_number.number
1880
-          )
1855
+          );
1856
+        }else{
1857
+          return (
1858
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
1859
+            this.patientInfo.DialysisSchedule.device_number.number
1860
+          );
1881 1861
         }
1882
-      },
1862
+        
1863
+      }
1864
+    },
1883 1865
 
1884 1866
       getXuserName(id) {
1885 1867
         if (id <= 0) {
@@ -2075,8 +2057,8 @@ export default {
2075 2057
             if (this.org_template_info.org_id == 9535) {
2076 2058
               this.isShowZero = true
2077 2059
             }
2078
-            if (this.monitors.length < 8) {
2079
-              var nl = 8 - this.monitors.length
2060
+            if (this.monitors.length < 12) {
2061
+              var nl = 12 - this.monitors.length
2080 2062
               for (let index = 0; index < nl; index++) {
2081 2063
                 this.monitors.push([])
2082 2064
               }
@@ -2157,6 +2139,7 @@ export default {
2157 2139
               this.doctor_advices.push(obj3)
2158 2140
               this.doctor_advices.push(obj3)
2159 2141
               this.doctor_advices.push(obj3)
2142
+              this.doctor_advices.push(obj3)
2160 2143
             }
2161 2144
             if (this.doctor_advices.length === 1) {
2162 2145
               var obj = { advice_name: '', start_time: '' }
@@ -2167,6 +2150,7 @@ export default {
2167 2150
               this.doctor_advices.push(obj2)
2168 2151
               this.doctor_advices.push(obj2)
2169 2152
               this.doctor_advices.push(obj2)
2153
+              this.doctor_advices.push(obj2)
2170 2154
             }
2171 2155
             if (this.doctor_advices.length === 2) {
2172 2156
               var obj = { advice_name: '', start_time: '' }
@@ -2175,6 +2159,7 @@ export default {
2175 2159
               this.doctor_advices.push(obj1)
2176 2160
               this.doctor_advices.push(obj1)
2177 2161
               this.doctor_advices.push(obj1)
2162
+              this.doctor_advices.push(obj1)
2178 2163
             }
2179 2164
             if (this.doctor_advices.length === 3) {
2180 2165
               // eslint-disable-next-line no-redeclare
@@ -2182,17 +2167,25 @@ export default {
2182 2167
               this.doctor_advices.push(obj)
2183 2168
               this.doctor_advices.push(obj)
2184 2169
               this.doctor_advices.push(obj)
2170
+              this.doctor_advices.push(obj)
2185 2171
             }
2186 2172
             if (this.doctor_advices.length === 4) {
2187 2173
               // eslint-disable-next-line no-redeclare
2188 2174
               var obj = { advice_name: '', start_time: '' }
2189 2175
               this.doctor_advices.push(obj)
2190 2176
               this.doctor_advices.push(obj)
2177
+              this.doctor_advices.push(obj)
2191 2178
             }
2192 2179
             if (this.doctor_advices.length === 5) {
2193 2180
               // eslint-disable-next-line no-redeclare
2194 2181
               var obj = { advice_name: '', start_time: '' }
2195 2182
               this.doctor_advices.push(obj)
2183
+              this.doctor_advices.push(obj)
2184
+            }
2185
+            if (this.doctor_advices.length === 6) {
2186
+              // eslint-disable-next-line no-redeclare
2187
+              var obj = { advice_name: '', start_time: '' }
2188
+              this.doctor_advices.push(obj)
2196 2189
             }
2197 2190
 
2198 2191
             if (this.doctor_advices.length > 0) {