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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -328,8 +328,8 @@
                         <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>
+<!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
+<!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>-->
                         <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
                         <td width="">病情变化及处理</td>
                     </tr>
@@ -347,13 +347,13 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
-                        
+
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
-                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
-                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
+<!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
+<!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
                         <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
                         <td style="text-align:left;padding-left:10px;">
                             <div style="line-height:20px;text-align: left;display: inline-block;">
@@ -714,7 +714,7 @@ export default {
 
           this.records = this.records.concat(resp.data.schedules)
 
-          
+
 
           for (const recordIndex in this.records) {
             var dlegh = 0
@@ -751,7 +751,7 @@ export default {
               }
             })
             this.records[recordIndex].his_project = his_project
-            
+
             var delghThree = 0
             if (
               this.records[recordIndex].his_advices &&

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -304,8 +304,8 @@
                   <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
                   <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                   <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+<!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
+<!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>-->
                   <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
                   <td width="">病情变化及处理</td>
               </tr>
@@ -323,13 +323,13 @@
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
-                  
+
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
                   <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
-                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
-                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
+<!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
+<!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
                   <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
                   <td style="text-align:left;padding-left:10px;">
                       <div style="line-height:20px;text-align: left;display: inline-block;">
@@ -794,7 +794,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }
@@ -1280,7 +1280,7 @@ export default {
             }
           }
         }
-        
+
         console.log('this.projects',this.projects)
 
         // this.totollength = this.doctor_advices.length + this.monitors.length

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -432,7 +432,7 @@
       getAllChange(scope) {
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            // console.log(1)
+            console.log(1)
             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)
           } else {
             console.log(12)