yq1 9 kuukautta sitten
vanhempi
commit
55bb94107e
1 muutettua tiedostoa jossa 21 lisäystä ja 14 poistoa
  1. 21 14
      src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

+ 21 - 14
src/xt_pages/outpatientDoctorStation/template/prinSeven.vue Näytä tiedosto

@@ -99,10 +99,10 @@
99 99
                 </div>
100 100
               </template>
101 101
               <div style="position: relative;">
102
-                <div v-if="item.arr.length>0">
103
-                  <div v-for="(ite,indexs) in item.arr" :key="indexs">
102
+                <!-- <div v-if="item.arr.length>0"> -->
103
+                  <!-- <div v-for="(ite,indexs) in item.arr" :key="indexs"> -->
104 104
                     <template>
105
-                      <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (ite[0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
105
+                      <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (item.arr[0][0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
106 106
                         <span style="font-weight: bold" >
107 107
                           {{ index + 1 + "."}}
108 108
                         </span>
@@ -111,7 +111,7 @@
111 111
                           {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
112 112
                           {{it.drug.max_unit}}
113 113
                         </span>&nbsp;
114
-                        <div >
114
+                        <div v-for="(ite,indexs) in item.arr" :key="indexs">
115 115
                           <!-- v-for="(ite,indexs) in item.arr" :key="indexs" -->
116 116
                           <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
117 117
                             <div>
@@ -130,7 +130,7 @@
130 130
                         <div style="margin-left: 70px" >
131 131
                           <template>
132 132
                               用法:
133
-                              <div style="display: inline-block;" >
133
+                              <div style="display: inline-block;" v-for="(ite,indexs) in item.arr" :key="indexs">
134 134
                                 <template>
135 135
                                   <span style="margin-right: 0;" v-if="(item.arr.length>0 && ite[0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
136 136
                                 </template>
@@ -146,8 +146,8 @@
146 146
                         </div>
147 147
                       </div>
148 148
                     </template>
149
-                  </div>
150
-                </div>
149
+                  <!-- </div> -->
150
+                <!-- </div> -->
151 151
 
152 152
                 <div v-if="item.arr.length==0">
153 153
                   <!--   
@@ -195,7 +195,7 @@
195 195
                 <div v-if="item.arr.length>0">
196 196
                   <div v-for="(ite,indexs) in item.arr" :key="indexs">
197 197
                     <template>
198
-                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&ite[0].groupno!=it.groupno) || item.arr.length==0">
198
+                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&ite[0].groupno!=it.groupno) ">
199 199
                           &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
200 200
                         </div>
201 201
 
@@ -575,14 +575,21 @@ export default{
575 575
               }
576 576
             }
577 577
           }
578
-
578
+          
579
+        //   this.advicePrint[i]['advices'][0]['arr'] = arr
579 580
          this.advicePrint[i]["arr"]    = arr
580
-        //  for(let y=0;y<this.advicePrint[i].arr.length;y++){
581
-        //   console.log('6666666',this.advicePrint[i].arr[y]);
582
-        //  }
583
-
584
-
581
+        //  console.log('55555',this.advicePrint);
582
+          console.log('ttttt',arr);
583
+          for(let x in arr){
584
+            for(let j in this.advicePrint[i].advices){
585
+              
586
+              if(arr[x][0].groupno==this.advicePrint[i].advices[j].groupno){
587
+                this.advicePrint[i]['advices'][j]['arr'] = arr
588
+              }
589
+            }
590
+          }
585 591
         }
592
+        
586 593
           console.log('4444444',this.advicePrint);
587 594
         //  console.log('55555555',this.arr);
588 595