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

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -595,8 +595,9 @@
                 <div
                   class="under_line"
                   style="width: 100px; text-align: center"
-                >
-                  <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(record.prescription.creater) == ''">
+                > 
+                  <span style="display: inline-block;height: 30px;"></span>
+                  <span v-if="setAdminUserES(record.prescription.creater) == ''">
                     {{ getAdminUser(record.prescription.creater)}}
                   </span>
                   <span style="display: inline-block;" v-else>
@@ -1180,7 +1181,7 @@
             <div style="width: 100%;">
               <div style="margin-bottom: 10px;">
                 宣教知识：
-                <span class="under_line" style="white-space: normal;width: 80%;">
+                <span style="white-space: normal;border-bottom: 1px solid black;">
                   {{ record.summer && record.summer.mission ? record.summer.mission : ''}}
                 </span>
               </div>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -361,7 +361,8 @@
                 class="under_line"
                 style="width: 100px; text-align: center"
               >
-                <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(prescription.creater) == ''">
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style="" v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater)}}
                 </span>
                 <span style="display: inline-block;" v-else>
@@ -804,7 +805,7 @@
           <div style="padding: 5px;">
             <div style="margin-bottom: 10px;">
               宣教知识：
-              <span class="under_line"style="white-space: normal;width: 80%;">
+              <span style="white-space: normal;border-bottom: 1px solid black;">
                 {{ summary.mission ? summary.mission : '/' }}
               </span>
             </div>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -542,11 +542,11 @@
             }
           } else {
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-              console.log(123)
-              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+              console.log('123',scope.row.drug.dose)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) ) //  / scope.row.drug.dose
             } else {
               console.log(1234)
-              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)// 
             }
           }
           if (scope.row.prescribing_number == 0) {