Browse Source

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

28169 8 months ago
parent
commit
297d94d9d9

+ 4 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue View File

595
                 <div
595
                 <div
596
                   class="under_line"
596
                   class="under_line"
597
                   style="width: 100px; text-align: center"
597
                   style="width: 100px; text-align: center"
598
-                >
599
-                  <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(record.prescription.creater) == ''">
598
+                > 
599
+                  <span style="display: inline-block;height: 30px;"></span>
600
+                  <span v-if="setAdminUserES(record.prescription.creater) == ''">
600
                     {{ getAdminUser(record.prescription.creater)}}
601
                     {{ getAdminUser(record.prescription.creater)}}
601
                   </span>
602
                   </span>
602
                   <span style="display: inline-block;" v-else>
603
                   <span style="display: inline-block;" v-else>
1180
             <div style="width: 100%;">
1181
             <div style="width: 100%;">
1181
               <div style="margin-bottom: 10px;">
1182
               <div style="margin-bottom: 10px;">
1182
                 宣教知识:
1183
                 宣教知识:
1183
-                <span class="under_line" style="white-space: normal;width: 80%;">
1184
+                <span style="white-space: normal;border-bottom: 1px solid black;">
1184
                   {{ record.summer && record.summer.mission ? record.summer.mission : ''}}
1185
                   {{ record.summer && record.summer.mission ? record.summer.mission : ''}}
1185
                 </span>
1186
                 </span>
1186
               </div>
1187
               </div>

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue View File

361
                 class="under_line"
361
                 class="under_line"
362
                 style="width: 100px; text-align: center"
362
                 style="width: 100px; text-align: center"
363
               >
363
               >
364
-                <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(prescription.creater) == ''">
364
+                <span style="height: 30px;display: inline-block;"></span>
365
+                <span style="" v-if="setAdminUserES(prescription.creater) == ''">
365
                   {{ getAdminUser(prescription.creater)}}
366
                   {{ getAdminUser(prescription.creater)}}
366
                 </span>
367
                 </span>
367
                 <span style="display: inline-block;" v-else>
368
                 <span style="display: inline-block;" v-else>
804
           <div style="padding: 5px;">
805
           <div style="padding: 5px;">
805
             <div style="margin-bottom: 10px;">
806
             <div style="margin-bottom: 10px;">
806
               宣教知识:
807
               宣教知识:
807
-              <span class="under_line"style="white-space: normal;width: 80%;">
808
+              <span style="white-space: normal;border-bottom: 1px solid black;">
808
                 {{ summary.mission ? summary.mission : '/' }}
809
                 {{ summary.mission ? summary.mission : '/' }}
809
               </span>
810
               </span>
810
             </div>
811
             </div>

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

542
             }
542
             }
543
           } else {
543
           } else {
544
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
544
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
545
-              console.log(123)
546
-              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)
545
+              console.log('123',scope.row.drug.dose)
546
+              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
547
             } else {
547
             } else {
548
               console.log(1234)
548
               console.log(1234)
549
-              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)
549
+              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)// 
550
             }
550
             }
551
           }
551
           }
552
           if (scope.row.prescribing_number == 0) {
552
           if (scope.row.prescribing_number == 0) {