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

src/xt_pages/hospitalStation/invoiceTemplate/printOne.vue

@@ -110,10 +110,10 @@
             </span>
             <span style="position: absolute;top:260px;left:540px">{{ totalPrice }}</span>
         </div>
-        <div style="position: absolute;top:300px;left:340px">银联：0</div>
-        <div style="position: absolute;top:300px;left:400px">现金：{{ list.psn_cash_money }}</div>
-        <div style="position: absolute;top:300px;left:480px">记账：0</div>
-        <div style="position: absolute;top:300px;left:540px">社保卡：0</div>
+        <div style="position: absolute;top:300px;left:320px">银联：0</div>
+        <div style="position: absolute;top:300px;left:380px">现金：{{ list.psn_cash_money }}</div>
+        <div style="position: absolute;top:300px;left:500px">记账：0</div>
+        <div style="position: absolute;top:300px;left:560px">社保卡：0</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/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -66,7 +66,7 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
-            <div style="width:50px;">领料人：</div><div style="width:100px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -54,7 +54,7 @@
                           <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
                         </div>
                         <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
-                          <div style="width:50px;">领料人：</div><div style="width:100px;"></div>
+                          <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
                           <div style="width:80px;">审批：</div><div style="width:100px;"></div>
                           <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>