소스 검색

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

csx 3 년 전
부모
커밋
0b040ea87d
2개의 변경된 파일15개의 추가작업 그리고 15개의 파일을 삭제
  1. 6 6
      src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue
  2. 9 9
      src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

+ 6 - 6
src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue 파일 보기

@@ -1,8 +1,8 @@
1 1
 <template>
2 2
     <div>
3 3
         <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
4
-            <span v-if="org_id ==10138"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt=""></span> 
5
-             <span v-if="org_id ==10278"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/beierlog.png" alt=""></span> 
4
+            <span v-if="$store.getters.xt_user.org_id == 10138"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt=""></span>
5
+             <span v-if="$store.getters.xt_user.org_id ==10278"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/beierlog.png" alt=""></span>
6 6
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
7 7
             <div style="display:flex;">
8 8
                 <div>单据号:<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
@@ -75,8 +75,8 @@
75 75
                 <div>操作人:<span style="width:100px;display:inline-block;">{{info.doctor_name}}</span></div>
76 76
                 <div>操作日期:<span style="width:100px;display:inline-block;">{{info.record_date}}</span></div>
77 77
             </div>
78
-          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
79
-          <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
78
+          <span v-if="$store.getters.xt_user.org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
79
+          <span v-if="$store.getters.xt_user.org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
80 80
         </div>
81 81
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
82 82
           <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
@@ -183,8 +183,8 @@
183 183
                 <div>操作人:<span style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span></div>
184 184
                 <div>操作日期:<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
185 185
             </div>
186
-            <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
187
-            <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
186
+            <span v-if="$store.getters.xt_user.org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
187
+            <span v-if="$store.getters.xt_user.org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
188 188
         </div>
189 189
     </div>
190 190
 

+ 9 - 9
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue 파일 보기

@@ -2,8 +2,8 @@
2 2
     <div>
3 3
         <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print"
4 4
              style="position: relative;">
5
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
6
-            <img style="width:100%;height:80px" v-if="org_id==10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
5
+            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
6
+            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
7 7
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
8 8
             <div style="display:flex;">
9 9
                 <div>单据号:<span
@@ -142,12 +142,12 @@
142 142
                 <div>操作日期:<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
143 143
                 </div>
144 144
             </div>
145
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
146
-            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
147
-            
145
+            <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
146
+            <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
147
+
148 148
         </div>
149 149
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
150
-            <img style="width:100%;height:80px" v-if="org_id != 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
150
+            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id != 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
151 151
             <img style="width:100%;height:80px" v-else src="https://kuyi.shengws.com/beierlog.png" alt="">
152 152
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
153 153
             <div style="display:flex;">
@@ -286,9 +286,9 @@
286 286
                 <div>操作日期:<span style="width:100px;display:inline-block;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
287 287
                 </div>
288 288
             </div>
289
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
290
-            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
291
-           
289
+            <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
290
+            <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
291
+
292 292
         </div>
293 293
     </div>
294 294