Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/newActionBar/components/subDrugOrder.vue

@@ -28,6 +28,7 @@
                         v-model="order.advice_desc"
                         :fetch-suggestions="querySearch1"
                         placeholder="请输入内容"
+                        @select="handleSelect1"
                         @input="changeDrugDesc"
                         ></el-autocomplete>
                         <input
@@ -260,28 +261,15 @@ export default {
         },
         createFilter (queryString) {
             return (restaurant) => {
-                // return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+                //return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
                 return (restaurant.drug_name.indexOf(queryString) != -1)
             }
         },
         handleSelect (item) {
-            console.log("itemwowowowo",item)
             this.drug_id = 0
             this.way = 0
             this.current_drug_name = name
             this.order.advice_desc = ''
-             
-            var specai_name  = item.drug_specs[0].dose + item.drug_specs[0].dose_unit +"*" +item.drug_specs[0].min_number + item.drug_specs[0].min_unit +"/" + item.drug_specs[0].max_unit
-
-            this.order.advice_desc = specai_name
-            this.order.drug_spec_unit = item.drug_specs[0].min_unit
-            this.order.prescribing_number = item.drug_specs[0].prescribing_number
-            this.order.prescribing_number_unit = item.drug_specs[0].prescribing_number_unit
-            this.order.single_dose = item.drug_specs[0].single_dose
-            this.order.single_dose_unit =this.getUnits(item.drug_specs[0].drug_dose_unit) 
-            this.order.delivery_way  = item.drug_specs[0].delivery_way
-            this.order.execution_frequency = item.drug_specs[0].execution_frequency
-
             this.drugSpec = []
             for (let i = 0; i < this.all_drug.length; i++) {
                 if (this.all_drug[i].drug_name == item.drug_name) {
@@ -509,17 +497,6 @@ export default {
             this.drug_name_id = 0
             this.order.drug_id = 0;
         },
-
-        getUnits(id){
-            console.log("drug_spec_unit_options",this.drug_spec_unit_options)
-            var name = ""
-            for(let i=0;i<this.drug_spec_unit_options.length;i++){
-                if(id == this.drug_spec_unit_options[i].id){
-                name = this.drug_spec_unit_options[i].name
-                }
-            }
-            return name
-          },
     }
 }
 </script>

src/pages/main/template/DialysisPrintOrderSeventy.vue

@@ -27,13 +27,13 @@
                 <check-box  :checked="patientInfo_source_1 "></check-box>
             </div>
         </div>
-        <div class="inline_block" v-if="org_id!=10510">
+        <div class="inline_block" v-if="org_id!=10510" >
           病区：
-            <div class="under_line" style="width: 50px;text-align: center;">
+            <div class="under_line" style="width: 70px;text-align: left;">
                 {{'/'}}
             </div>
         </div>
-        <div class="inline_block" v-if="org_id!=10510">
+        <div class="inline_block" v-if="org_id!=10510" style="margin-left: 10px;">
           床号：
             <div class="under_line" style="width: 50px;text-align: center;">
               <span v-if="org_id!=9675 && org_id!=10447 && org_id!=10460"> {{'/'}}</span>
@@ -184,33 +184,33 @@
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style=" flex: 1">
                     穿刺方式：
                     <div
                       class="under_line"
-                      style="width: 100px;text-align: center"
-                      v-if="predialysis.puncture_way == 0"
+                      style="width: 100px; text-align: center"
+                      v-if="predialysis.puncture_way == ''"
                     >
-                      /
+                        /
                     </div>
                     <div
                       class="under_line"
-                      style="width: 100px;text-align: center"
-                      v-if="predialysis.puncture_way == 1"
+                      style="width: 60px; text-align: center"
+                      v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
                     >
                       绳梯
                     </div>
                     <div
                       class="under_line"
-                      style="width: 100px;text-align: center"
-                      v-if="predialysis.puncture_way == 2"
+                      style="width: 60px; text-align: center"
+                      v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
                     >
                       扣眼
                     </div>
                     <div
                       class="under_line"
-                      style="width: 100px;text-align: center"
-                      v-if="predialysis.puncture_way == 3"
+                      style="width: 60px; text-align: center"
+                      v-if="predialysis.puncture_way.indexOf('区域') > -1"
                     >
                       区域
                     </div>
@@ -444,7 +444,7 @@
                     kg
                   </div>
                   <div class="inline_block" style="flex:1;" >
-                    计划超滤量：
+                    目标超滤量：
                     <div class="under_line" style="width: 70px;text-align: center">
                       {{prescription.target_ultrafiltration?prescription.target_ultrafiltration:'/'}}
                     </div>
@@ -627,10 +627,10 @@
                       <td> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                       <td>{{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}</td>
                       <td> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
-                      <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
                       <td> {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{  monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                       </td>
+                      <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
                       <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
                       <td> {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }} </td>
                       <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>