Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
elizebath
/
elizebeth
forkattu lähteestä csx/Vue_New
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

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

28169 1 vuosi sitten
vanhempi
3f0bac98f0 2ce6a8f327
commit
df26fdfae3
5 muutettua tiedostoa jossa 116 lisäystä ja 99 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 4 7
      src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue
  2. 3 3
      src/xt_pages/outpatientDoctorStation/print.vue
  3. 25 2
      src/xt_pages/outpatientDoctorStation/template/printFour.vue
  4. 84 84
      src/xt_pages/workforce/scheduleTablePrintFive.vue
  5. 0 3
      src/xt_pages/workforce/scheduleTablePrintTwo.vue

+ 4 - 7
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Näytä tiedosto 

@@ -759,6 +759,8 @@ export default {
759 759 
                   }
760 760 
                 }
761 761 
               }
762 
+              that.$forceUpdate();
763 
+
762 764
763 765
764 766 
             }
 
@@ -792,10 +794,6 @@ export default {
792 794
793 795 
             } else {
794 796 
               that.zuobiao_drug = response.data.data.drug
795 
-              console.log('坐标～～坐标')
796 
-              console.log(that.zuobiao_drug)
797 
-              console.log(response.data.data.drug)
798 
-              console.log('坐标～～坐标')
799 797
800 798 
               // that.zuobiao_project  = response.data.data.project
801 799 
               //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
 
@@ -809,9 +807,8 @@ export default {
809 807
810 808 
                 }
811 809 
               }
812 
-              console.log('坐标～～坐标')
813 
-              console.log(that.drugs)
814 
-              console.log('坐标～～坐标')
810 
+              that.$forceUpdate();
811 
+
815 812
816 813 
             }
817 814 
           }

+ 3 - 3
src/xt_pages/outpatientDoctorStation/print.vue Näytä tiedosto 

@@ -3,7 +3,7 @@
3 3 
     <div class="dialysisPage" style="padding-top: 40px">
4 4 
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 ">
5 5
6 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 0" v-bind:childResponse="childResponse"
6 
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 0" v-bind:childResponse="childResponse"
7 7 
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
8 8 
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
9 9 
         :prescription_id="prescription_id"></printOne>
 
@@ -15,7 +15,7 @@
15 15 
           :prescription_id="prescription_id"
16 16 
         ></print-ten-one>
17 17
18 
-        <prinSeven v-if="org_id == 10375 || org_id == 0"
18 
+        <prinSeven v-if="org_id == 10375"
19 19 
           v-bind:childResponse="childResponse"
20 20 
           :advicePrint="advicePrint"
21 21 
           :ids="ids"
 
@@ -28,7 +28,7 @@
28 28 
         </prinSeven>
29 29
30 30 
         <printFour
31 
-          v-if="org_id == 10088 || org_id == 10510"
31 
+          v-if="org_id == 10088 || org_id == 10510 || org_id == 10598 || org_id == 0"
32 32 
           v-bind:childResponse="childResponse"
33 33 
           :advicePrint="advicePrint"
34 34 
           :ids="ids"

+ 25 - 2
src/xt_pages/outpatientDoctorStation/template/printFour.vue Näytä tiedosto 

@@ -52,7 +52,7 @@
52 52
53 53 
           </div>
54 54 
           <div class="doctorBox">
55 
-            <p>
55 
+            <p v-if="org_id!=10598 && org_id!=0 ">
56 56 
             医师：
57 57 
             <span
58 58 
                 style="width: 100px; display: inline-block"
 
@@ -73,6 +73,28 @@
73 73 
                 srcset=""
74 74 
                 v-else
75 75 
               />
76 
+            </p>
77 
+            <p v-if="org_id==10598 || org_id==0">
78 
+            医师：
79 
+            <!-- <span
80 
+                style="width: 100px; display: inline-block"
81 
+                v-if="item.creator == ''"
82 
+              >
83 
+                {{ item.doctor ? item.doctor : "" }}
84 
+              </span> -->
85 
+              <!-- <span
86 
+                style="width: 100px; display: inline-block"
87 
+                v-else-if="doc_name != ''"
88 
+              >
89 
+                {{ doc_name }}
90 
+              </span> v-else -->
91 
+              <img
92 
+                style="height: 30px"
93 
+                :src="setAdminUserES(item.creator,item.doctor)"
94 
+                alt=""
95 
+                srcset=""
96 
+
97 
+              />
76 98 
             </p>
77 99 
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
78 100 
           </div>
 
@@ -130,6 +152,7 @@ export default {
130 152 
         operatorMaps: {},
131 153 
         operators: [],
132 154 
         doctorList_1: [],
155 
+        org_id:''
133 156 
       }
134 157 
     },
135 158 
    methods:{
 
@@ -330,7 +353,7 @@ export default {
330 353 
       this.getHisPatientDetail()
331 354 
       var xtuser = this.$store.getters.xt_user;
332 355 
       this.orgname = xtuser.org.org_name;
333 
-
356 
+      this.org_id = this.$store.getters.xt_user.org.id
334 357 
    },
335 358 
    watch:{
336 359 
      ids:function(val){

+ 84 - 84
src/xt_pages/workforce/scheduleTablePrintFive.vue Näytä tiedosto 

@@ -74,56 +74,56 @@
74 74 
                     <span v-if="item.Mon_M.patient_id">
75 75 
                       <span>{{ item.Mon_M.patient }} </span>
76 76 
                       <span >{{ item.Mon_M.mode_name }}</span>
77 
-                      <!-- <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
78 
-                      </span> -->
77 
+                      <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
78 
+                      </span>
79 79 
                     </span>
80 80 
                   </td>
81 81 
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
82 82 
                     <span v-if="item.Tue_M.patient_id">
83 83 
                         <span>{{ item.Tue_M.patient }} </span>
84 84 
                         <span >{{ item.Tue_M.mode_name }}</span>
85 
-                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
86 
-                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span> -->
85 
+                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>-->
86 
+                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span>
87 87 
                     </span>
88 88 
                   </td>
89 89 
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
90 90 
                       <span v-if="item.Wed_M.patient_id">
91 91 
                         <span>{{ item.Wed_M.patient }} </span>
92 92 
                           <span >{{ item.Wed_M.mode_name }}</span>
93 
-                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
94 
-                          <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span> -->
93 
+                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>-->
94 
+                          <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span>
95 95 
                       </span>
96 96 
                   </td>
97 97 
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
98 98 
                       <span v-if="item.Thurs_M.patient_id">
99 99 
                         <span>{{ item.Thurs_M.patient }} </span>
100 100 
                           <span >{{ item.Thurs_M.mode_name }}</span>
101 
-                          <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
102 
-                          <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span> -->
101 
+                          <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>-->
102 
+                          <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span>
103 103 
                       </span>
104 104 
                   </td>
105 105 
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
106 106 
                       <span v-if="item.Fri_M.patient_id">
107 107 
                         <span>{{ item.Fri_M.patient }} </span>
108 108 
                           <span >{{ item.Fri_M.mode_name }}</span>
109 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
110 
-                          <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}} </span> -->
109 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>-->
110 
+                          <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}} </span>
111 111 
                       </span>
112 112 
                   </td>
113 113 
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
114 114 
                       <span v-if="item.Sat_M.patient_id">
115 115 
                         <span>{{ item.Sat_M.patient }} </span>
116 116 
                           <span >{{ item.Sat_M.mode_name }}</span>
117 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
118 
-                          <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span> -->
117 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> -->
118 
+                          <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span>
119 119 
                       </span>
120 120 
                   </td>
121 121 
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
122 122 
                       <span v-if="item.Sun_M.patient_id">
123 123 
                         <span>{{ item.Sun_M.patient }} </span>
124 124 
                           <span >{{ item.Sun_M.mode_name }}</span>
125 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
126 
-                          <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span> -->
125 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span> -->
126 
+                          <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span>
127 127 
                       </span>
128 128 
                   </td>
129 129 
                 </template>
 
@@ -133,57 +133,57 @@
133 133 
                     <span v-if="item.Mon_A.patient_id">
134 134 
                       <span>{{ item.Mon_A.patient }} </span>
135 135 
                       <span >{{ item.Mon_A.mode_name }}</span>
136 
-                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
136 
+                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>-->
137 137 
                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
138 
-                      </span> -->
138 
+                      </span>
139 139 
                     </span>
140 140 
                   </td>
141 141 
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
142 142 
                       <span v-if="item.Tue_A.patient_id">
143 143 
                         <span>{{ item.Tue_A.patient }} </span>
144 144 
                         <span >{{ item.Tue_A.mode_name }}</span>
145 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
146 
-                          <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span> -->
145 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>-->
146 
+                          <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span>
147 147 
                       </span>
148 148 
                   </td>
149 149 
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
150 150 
                       <span v-if="item.Wed_A.patient_id">
151 151 
                         <span>{{ item.Wed_A.patient }} </span>
152 152 
                           <span >{{ item.Wed_A.mode_name }}</span>
153 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
154 
-                          <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}} </span> -->
153 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>-->
154 
+                          <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}} </span>
155 155 
                       </span>
156 156 
                   </td>
157 157 
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
158 158 
                       <span v-if="item.Thurs_A.patient_id">
159 159 
                         <span>{{ item.Thurs_A.patient }} </span>
160 160 
                           <span >{{ item.Thurs_A.mode_name }}</span>
161 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
162 
-                          <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span> -->
161 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> -->
162 
+                          <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span>
163 163 
                       </span>
164 164 
                   </td>
165 165 
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
166 166 
                       <span v-if="item.Fri_A.patient_id">
167 167 
                         <span>{{ item.Fri_A.patient }} </span>
168 168 
                           <span >{{ item.Fri_A.mode_name }}</span>
169 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
170 
-                          <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}</span> -->
169 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> -->
170 
+                          <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}</span>
171 171 
                       </span>
172 172 
                   </td>
173 173 
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
174 174 
                       <span v-if="item.Sat_A.patient_id">
175 175 
                         <span>{{ item.Sat_A.patient }} </span><br/>
176 176 
                           <span >{{ item.Sat_A.mode_name }}</span><br/>
177 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
178 
-                          <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span> -->
177 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>  -->
178 
+                          <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span>
179 179 
                       </span>
180 180 
                   </td>
181 181 
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
182 182 
                       <span v-if="item.Sun_A.patient_id">
183 183 
                         <span>{{ item.Sun_A.patient }} </span><br/>
184 184 
                           <span >{{ item.Sun_A.mode_name }}</span><br/>
185 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
186 
-                          <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span> -->
185 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>-->
186 
+                          <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span>
187 187 
                       </span>
188 188 
                   </td>
189 189 
                 </template>
 
@@ -193,57 +193,57 @@
193 193 
                     <span v-if="item.Mon_N.patient_id">
194 194 
                       <span>{{ item.Mon_N.patient }} </span>
195 195 
                       <span >{{ item.Mon_N.mode_name }}</span>
196 
-                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
196 
+                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>-->
197 197 
                       <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
198 
-                      </span> -->
198 
+                      </span>
199 199 
                     </span>
200 200 
                   </td>
201 201 
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
202 202 
                       <span v-if="item.Tue_N.patient_id">
203 203 
                         <span>{{ item.Tue_N.patient }} </span>
204 204 
                           <span >{{ item.Tue_N.mode_name }}</span>
205 
-                          <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
206 
-                          <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span> -->
205 
+                          <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>-->
206 
+                          <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span>
207 207 
                       </span>
208 208 
                   </td>
209 209 
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
210 210 
                       <span v-if="item.Wed_N.patient_id">
211 211 
                         <span>{{ item.Wed_N.patient }} </span>
212 212 
                           <span >{{ item.Wed_N.mode_name }}</span>
213 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
214 
-                          <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}} </span> -->
213 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>-->
214 
+                          <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}} </span>
215 215 
                       </span>
216 216 
                   </td>
217 217 
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
218 218 
                       <span v-if="item.Thurs_N.patient_id">
219 219 
                         <span>{{ item.Thurs_N.patient }} </span>
220 220 
                           <span >{{ item.Thurs_N.mode_name }}</span>
221 
-                          <!-- <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
222 
-                          <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span> -->
221 
+                          <!-- <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> -->
222 
+                          <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span>
223 223 
                       </span>
224 224 
                   </td>
225 225 
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
226 226 
                       <span v-if="item.Fri_N.patient_id">
227 227 
                         <span>{{ item.Fri_N.patient }} </span>
228 228 
                           <span >{{ item.Fri_N.mode_name }}</span>
229 
-                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
230 
-                          <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}} </span> -->
229 
+                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span> -->
230 
+                          <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}} </span>
231 231 
                       </span>
232 232 
                   </td>
233 233 
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
234 234 
                       <span v-if="item.Sat_N.patient_id">
235 235 
                         <span>{{ item.Sat_N.patient }} </span>
236 236 
                           <span >{{ item.Sat_N.mode_name }}</span>
237 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
238 
-                          <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span> -->
237 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>  -->
238 
+                          <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span>
239 239 
                       </span>
240 240 
                   </td>
241 241 
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
242 242 
                       <span v-if="item.Sun_N.patient_id">
243 243 
                         <span>{{ item.Sun_N.patient }} </span>
244 244 
                           <span >{{ item.Sun_N.mode_name }}</span>
245 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
246 
-                          <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}</span> -->
245 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>-->
246 
+                          <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}</span>
247 247 
                       </span>
248 248 
                   </td>
249 249 
                 </template>
 
@@ -253,170 +253,170 @@
253 253 
                     <span v-if="item.Mon_M.patient_id">
254 254 
                       <span>{{ item.Mon_M.patient }} </span>
255 255 
                       <span >{{ item.Mon_M.mode_name }}</span>
256 
-                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
256 
+                      <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>-->
257 257 
                       <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
258 
-                      </span> -->
258 
+                      </span>
259 259 
                     </span>
260 260 
                   </td>
261 261 
                   <td style="min-width:50px;" v-if="first_day == 1 ">
262 262 
                   <span v-if="item.Mon_A.patient_id">
263 263 
                     <span>{{ item.Mon_A.patient }} </span>
264 264 
                     <span >{{ item.Mon_A.mode_name }}</span>
265 
-                     <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
266 
-                    <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span> -->
265 
+                     <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>-->
266 
+                    <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span>
267 267 
                   </span>
268 268 
                   </td>
269 269 
                   <td style="min-width:50px;" v-if="first_day == 1 " >
270 270 
                       <span v-if="item.Mon_N.patient_id">
271 271 
                           <span>{{ item.Mon_N.patient }} </span>
272 272 
                           <span >{{ item.Mon_N.mode_name }}</span>
273 
-                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
274 
-                          <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}</span> -->
273 
+                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>-->
274 
+                          <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}</span>
275 275 
                       </span>
276 276 
                   </td>
277 277 
                   <td style="min-width:50px;"  v-if="second_day == 2">
278 278 
                     <span v-if="item.Tue_M.patient_id">
279 279 
                         <span>{{ item.Tue_M.patient }} </span>
280 280 
                         <span >{{ item.Tue_M.mode_name }}</span>
281 
-                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
282 
-                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span> -->
281 
+                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>-->
282 
+                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span>
283 283 
                     </span>
284 284 
                   </td>
285 285 
                   <td style="min-width:50px;"  v-if="second_day == 2">
286 286 
                       <span v-if="item.Tue_A.patient_id">
287 287 
                         <span>{{ item.Tue_A.patient }} </span>
288 288 
                           <span >{{ item.Tue_A.mode_name }}</span>
289 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
290 
-                          <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span> -->
289 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>-->
290 
+                          <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span>
291 291 
                       </span>
292 292 
                   </td>
293 293 
                   <td style="min-width:50px;"  v-if="second_day == 2">
294 294 
                       <span v-if="item.Tue_N.patient_id">
295 295 
                         <span>{{ item.Tue_N.patient }} </span>
296 296 
                           <span >{{ item.Tue_N.mode_name }}</span>
297 
-                          <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
298 
-                          <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span> -->
297 
+                          <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>-->
298 
+                          <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span>
299 299 
                       </span>
300 300 
                   </td>
301 301 
                   <td style="min-width:50px;" v-if="three_day == 3">
302 302 
                       <span v-if="item.Wed_M.patient_id">
303 303 
                         <span>{{ item.Wed_M.patient }} </span>
304 304 
                           <span >{{ item.Wed_M.mode_name }}</span>
305 
-                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
306 
-                          <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span> -->
305 
+                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>-->
306 
+                          <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span>
307 307 
                       </span>
308 308 
                   </td>
309 309 
                   <td style="min-width:50px;" v-if="three_day == 3">
310 310 
                       <span v-if="item.Wed_A.patient_id">
311 311 
                         <span>{{ item.Wed_A.patient }} </span>
312 312 
                           <span >{{ item.Wed_A.mode_name }}</span>
313 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
314 
-                          <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}</span> -->
313 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>-->
314 
+                          <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}</span>
315 315 
                       </span>
316 316 
                   </td>
317 317 
                   <td style="min-width:50px;" v-if="three_day == 3">
318 318 
                       <span v-if="item.Wed_N.patient_id">
319 319 
                         <span>{{ item.Wed_N.patient }} </span>
320 320 
                           <span >{{ item.Wed_N.mode_name }}</span>
321 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
322 
-                          <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}</span> -->
321 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>-->
322 
+                          <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}</span>
323 323 
                       </span>
324 324 
                   </td>
325 325 
                   <td style="min-width:50px;" v-if="four_day == 4">
326 326 
                       <span v-if="item.Thurs_M.patient_id">
327 327 
                         <span>{{ item.Thurs_M.patient }} </span>
328 328 
                           <span >{{ item.Thurs_M.mode_name }}</span>
329 
-                          <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
330 
-                          <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span> -->
329 
+                          <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>-->
330 
+                          <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span>
331 331 
                       </span>
332 332 
                   </td>
333 333 
                   <td style="min-width:50px;" v-if="four_day == 4">
334 334 
                       <span v-if="item.Thurs_A.patient_id">
335 335 
                         <span>{{ item.Thurs_A.patient }} </span>
336 336 
                           <span >{{ item.Thurs_A.mode_name }}</span>
337 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
338 
-                          <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span> -->
337 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>-->
338 
+                          <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span>
339 339 
                       </span>
340 340 
                   </td>
341 341 
                   <td style="min-width:50px;" v-if="four_day == 4">
342 342 
                       <span v-if="item.Thurs_N.patient_id">
343 343 
                         <span>{{ item.Thurs_N.patient }} </span>
344 344 
                           <span >{{ item.Thurs_N.mode_name }}</span>
345 
-                          <!-- <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
346 
-                          <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span> -->
345 
+                          <!-- <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>-->
346 
+                          <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span>
347 347 
                       </span>
348 348 
                   </td>
349 349 
                   <td style="min-width:50px;" v-if="five_day == 5">
350 350 
                       <span v-if="item.Fri_M.patient_id">
351 351 
                         <span>{{ item.Fri_M.patient }} </span>
352 352 
                           <span >{{ item.Fri_M.mode_name }}</span>
353 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
354 
-                          <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}</span> -->
353 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span> -->
354 
+                          <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}</span>
355 355 
                       </span>
356 356 
                   </td>
357 357 
                   <td style="min-width:50px;" v-if="five_day == 5">
358 358 
                       <span v-if="item.Fri_A.patient_id">
359 359 
                         <span>{{ item.Fri_A.patient }} </span>
360 360 
                           <span >{{ item.Fri_A.mode_name }}</span>
361 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
362 
-                          <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}} </span> -->
361 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> -->
362 
+                          <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}} </span>
363 363 
                       </span>
364 364 
                   </td>
365 365 
                   <td style="min-width:50px;" v-if="five_day == 5">
366 366 
                       <span v-if="item.Fri_N.patient_id">
367 367 
                         <span>{{ item.Fri_N.patient }} </span>
368 368 
                           <span >{{ item.Fri_N.mode_name }}</span>
369 
-                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
370 
-                          <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}</span> -->
369 
+                          <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>-->
370 
+                          <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}</span>
371 371 
                       </span>
372 372 
                   </td>
373 373 
                   <td style="min-width:50px;" v-if="six_day == 6">
374 374 
                       <span v-if="item.Sat_M.patient_id">
375 375 
                         <span>{{ item.Sat_M.patient }} </span>
376 376 
                           <span >{{ item.Sat_M.mode_name }}</span>
377 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
378 
-                          <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span> -->
377 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> -->
378 
+                          <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span>
379 379 
                       </span>
380 380 
                   </td>
381 381 
                   <td style="min-width:50px;" v-if="six_day == 6">
382 382 
                       <span v-if="item.Sat_A.patient_id">
383 383 
                         <span>{{ item.Sat_A.patient }} </span>
384 384 
                           <span >{{ item.Sat_A.mode_name }}</span>
385 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
386 
-                          <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span> -->
385 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> -->
386 
+                          <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span>
387 387 
                       </span>
388 388 
                   </td>
389 389 
                   <td style="min-width:50px;" v-if="six_day == 6">
390 390 
                       <span v-if="item.Sat_N.patient_id">
391 391 
                         <span>{{ item.Sat_N.patient }} </span>
392 392 
                           <span >{{ item.Sat_N.mode_name }}</span>
393 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
394 
-                          <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span> -->
393 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> -->
394 
+                          <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span>
395 395 
                       </span>
396 396 
                   </td>
397 397 
                   <td style="min-width:50px;" v-if="seven_day == 7">
398 398 
                       <span v-if="item.Sun_M.patient_id">
399 399 
                         <span>{{ item.Sun_M.patient }} </span>
400 400 
                           <span >{{ item.Sun_M.mode_name }}</span>
401 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
402 
-                          <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span> -->
401 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>-->
402 
+                          <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span>
403 403 
                       </span>
404 404 
                   </td>
405 405 
                   <td style="min-width:50px;" v-if="seven_day == 7">
406 406 
                       <span v-if="item.Sun_A.patient_id">
407 407 
                         <span>{{ item.Sun_A.patient }} </span>
408 408 
                           <span >{{ item.Sun_A.mode_name }}</span>
409 
-                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
410 
-                          <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span> -->
409 
+                          <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>-->
410 
+                          <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span>
411 411 
                       </span>
412 412 
                   </td>
413 413 
                   <td style="min-width:50px;" v-if="seven_day == 7">
414 414 
                       <span v-if="item.Sun_N.patient_id">
415 415 
                         <span>{{ item.Sun_N.patient }} </span>
416 416 
                           <span >{{ item.Sun_N.mode_name }}</span>
417 
-                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
417 
+                          <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>-->
418 418 
                           <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
419 
-                          </span> -->
419 
+                          </span>
420 420 
                       </span>
421 421 
                   </td>
422 422 
                 </template>

+ 0 - 3
src/xt_pages/workforce/scheduleTablePrintTwo.vue Näytä tiedosto 

@@ -502,9 +502,6 @@
502 502 
                       </span>
503 503 
                   </td>
504 504 
                 </template>
505 
-
506 
-
507 
-
508 505 
                 <!-- <td>{{item.total}}</td> -->
509 506 
             </tr>
510 507 
         </table>