Browse Source

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

csx 3 years ago
parent
commit
8454884d44

+ 7 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue View File

328
                         <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
328
                         <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
329
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
329
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
330
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
330
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
331
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>
332
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>
331
+<!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
332
+<!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>-->
333
                         <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
333
                         <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
334
                         <td width="">病情变化及处理</td>
334
                         <td width="">病情变化及处理</td>
335
                     </tr>
335
                     </tr>
347
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
347
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
348
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
348
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
349
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
349
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
350
-                        
350
+
351
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
351
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
352
                         <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
352
                         <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
353
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
353
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
354
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
354
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
355
-                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
356
-                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
355
+<!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
356
+<!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
357
                         <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
357
                         <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
358
                         <td style="text-align:left;padding-left:10px;">
358
                         <td style="text-align:left;padding-left:10px;">
359
                             <div style="line-height:20px;text-align: left;display: inline-block;">
359
                             <div style="line-height:20px;text-align: left;display: inline-block;">
714
 
714
 
715
           this.records = this.records.concat(resp.data.schedules)
715
           this.records = this.records.concat(resp.data.schedules)
716
 
716
 
717
-          
717
+
718
 
718
 
719
           for (const recordIndex in this.records) {
719
           for (const recordIndex in this.records) {
720
             var dlegh = 0
720
             var dlegh = 0
751
               }
751
               }
752
             })
752
             })
753
             this.records[recordIndex].his_project = his_project
753
             this.records[recordIndex].his_project = his_project
754
-            
754
+
755
             var delghThree = 0
755
             var delghThree = 0
756
             if (
756
             if (
757
               this.records[recordIndex].his_advices &&
757
               this.records[recordIndex].his_advices &&

+ 7 - 7
src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue View File

304
                   <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
304
                   <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
305
                   <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
305
                   <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
306
                   <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
306
                   <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
307
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
308
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
307
+<!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
308
+<!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>-->
309
                   <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
309
                   <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
310
                   <td width="">病情变化及处理</td>
310
                   <td width="">病情变化及处理</td>
311
               </tr>
311
               </tr>
323
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
323
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
324
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
324
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
325
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
325
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
326
-                  
326
+
327
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
327
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
328
                   <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
328
                   <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
329
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
329
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
330
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
330
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
331
-                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
332
-                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
331
+<!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
332
+<!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
333
                   <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
333
                   <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
334
                   <td style="text-align:left;padding-left:10px;">
334
                   <td style="text-align:left;padding-left:10px;">
335
                       <div style="line-height:20px;text-align: left;display: inline-block;">
335
                       <div style="line-height:20px;text-align: left;display: inline-block;">
794
             }
794
             }
795
         })
795
         })
796
         }
796
         }
797
-        
797
+
798
         if(num == 0){
798
         if(num == 0){
799
           this.$message.success('核对完成')
799
           this.$message.success('核对完成')
800
         }
800
         }
1280
             }
1280
             }
1281
           }
1281
           }
1282
         }
1282
         }
1283
-        
1283
+
1284
         console.log('this.projects',this.projects)
1284
         console.log('this.projects',this.projects)
1285
 
1285
 
1286
         // this.totollength = this.doctor_advices.length + this.monitors.length
1286
         // this.totollength = this.doctor_advices.length + this.monitors.length

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue View File

432
       getAllChange(scope) {
432
       getAllChange(scope) {
433
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
433
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
434
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
434
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
435
-            // console.log(1)
435
+            console.log(1)
436
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
436
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
437
           } else {
437
           } else {
438
             console.log(12)
438
             console.log(12)