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

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

张保健 3 лет назад
Родитель
Сommit
616499e956

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

1216
         this.$message.error('并发症未填')
1216
         this.$message.error('并发症未填')
1217
       }else if(this.summary.dialysis_summary == ""){
1217
       }else if(this.summary.dialysis_summary == ""){
1218
         this.$message.error('透析小结未填')
1218
         this.$message.error('透析小结未填')
1219
-      }else if(this.afterdialysis.patient_gose == ""){
1219
+      }else if(this.afterdialysis.patient_gose == 0){
1220
         this.$message.error('患者去向未填')
1220
         this.$message.error('患者去向未填')
1221
       }else if(this.afterdialysis.creater == 0){
1221
       }else if(this.afterdialysis.creater == 0){
1222
         this.$message.error('当班责任(核对)护士未填')
1222
         this.$message.error('当班责任(核对)护士未填')

+ 13 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Просмотреть файл

219
                   </div>
219
                   </div>
220
 
220
 
221
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
221
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
222
-                    <div class="inline_block" style="flex:1.4">
222
+                    <div class="inline_block">
223
                       血管通路:
223
                       血管通路:
224
-                      <div class="under_line" style="width: 200px;text-align: center;">
224
+                      <div class="under_line" style="width: 220px;text-align: center;">
225
                         <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
225
                         <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
226
                         {{predialysis.blood_access_part_id}}
226
                         {{predialysis.blood_access_part_id}}
227
                         {{ predialysis.blood_access_part_opera_name }}
227
                         {{ predialysis.blood_access_part_opera_name }}
228
                       </div>
228
                       </div>
229
                     </div>
229
                     </div>
230
-                    <div class="inline_block" style="margin-left:10px;flex:1;">
230
+                    <div class="inline_block" style="margin-left:10px;">
231
                       内瘘:
231
                       内瘘:
232
-                      <div class="under_line" style="width: 170px;text-align: center;white-space: normal;">
232
+                      <div class="under_line" style="width: 180px;text-align: center;white-space: normal;">
233
                         {{ predialysis.internal_fistula ? predialysis.internal_fistula : "/" }}
233
                         {{ predialysis.internal_fistula ? predialysis.internal_fistula : "/" }}
234
                       </div>
234
                       </div>
235
                     </div>
235
                     </div>
236
 
236
 
237
-                    <div class="inline_block" style="margin-left:10px;flex:1.8;">
237
+                    <div class="inline_block" style="margin-left:10px;flex:1.4;">
238
                       导管:
238
                       导管:
239
                       <div class="under_line" style="width: 150px;text-align: center">
239
                       <div class="under_line" style="width: 150px;text-align: center">
240
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
240
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
241
                       </div>
241
                       </div>
242
                     </div>
242
                     </div>
243
+                    <div class="inline_block" style="margin-left:10px;flex:1;" v-if="org_id == 10223">
244
+                      导管打折:
245
+                      <div class="under_line" style="width: 50px;text-align: center;white-space: normal;">
246
+                        <span v-if="predialysis.catheter_bend == 0">/</span>
247
+                        <span v-if="predialysis.catheter_bend == 1">有</span>
248
+                        <span v-if="predialysis.catheter_bend == 2">无</span>
249
+                      </div>
250
+                    </div>
243
                   </div>
251
                   </div>
244
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
252
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
245
                     <div class="inline_block" style="flex:1;">
253
                     <div class="inline_block" style="flex:1;">