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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -643,7 +643,7 @@
                       <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                       <td height="32px">
                         <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
-                        <img style="height:20px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
+                        <img style="height:30px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                       </td>
                       <!-- <td height="35px">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
@@ -651,7 +651,7 @@
                   </td> -->
                       <td height="32px">
                         <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
-                        <img style="height:20px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                        <img style="height:30px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
                       </td>
                       <td height="32px">
                         <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
@@ -824,7 +824,7 @@
                 <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                 <td height="32px">
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
-                  <img style="height:20px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
+                  <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                 </td>
                 <!-- <td height="35px">
                 <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
@@ -832,7 +832,7 @@
               </td> -->
                 <td height="32px">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
-                  <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                  <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
                 </td>
                 <td height="32px">
                   <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
@@ -973,7 +973,7 @@
                     <div class="under_line" style="width: 80px;text-align: center">
                       <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}</span>
-                      <img style="height:23px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
@@ -981,7 +981,7 @@
                     <div class="under_line" style="width: 80px;text-align: center">
                       <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) }}</span>
-                      <img style="height:23px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
@@ -990,25 +990,25 @@
                       <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
                       <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
                       <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                         {{ getAdminUser(check == null ? 0 : check.modifier) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier">
                       <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
@@ -1017,7 +1017,7 @@
                       <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
@@ -1026,7 +1026,7 @@
                       <span v-if="setAdminUserES(prescription.creater) == ''">
                         {{ getAdminUser(prescription.creater) }}
                       </span>
-                      <img style="height:23px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
                     </div>
                   </div>
                 </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printOne.vue

@@ -110,6 +110,7 @@
             </span>
             <span style="position: absolute;top:260px;left:540px">{{ totalPrice }}</span>
         </div>
+        <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div>
         <div>
             <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
             <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>

src/xt_pages/outpatientCharges/summary.vue

@@ -100,10 +100,10 @@
                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
                             结算单
                         </el-button>
-                        <el-button size="mini" type="primary" v-if="scope.row.order_status == 2" @click="settlementPrint(scope.row)">结算单</el-button>
+                        <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
                         <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
                             退费
                         </el-button>