see999 3 years ago
parent
commit
611a517861

+ 2 - 2
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue View File

@@ -11,7 +11,7 @@
11 11
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
12 12
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
13 13
          
14
-          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
14
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
15 15
 
16 16
           <table class="print-table" border="1">
17 17
             <tbody>
@@ -68,7 +68,7 @@
68 68
           </table>
69 69
         
70 70
 
71
-          <div style="display:flex;margin-top:20px;float:right;">
71
+          <div style="display:flex;margin-top:1px;float:right;">
72 72
             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
73 73
             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
74 74
             <div style="width:50px;">会计:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>

+ 11 - 2
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue View File

@@ -58,12 +58,19 @@
58 58
           </table>
59 59
         
60 60
 
61
-          <div style="display:flex;margin-top:20px;float:right;">
61
+          <div v-if="orgId != 10024" style="display:flex;margin-top:20px;float:right;">
62 62
             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
63 63
             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
64 64
             <div style="width:50px;">会计:</div><div style="width:100px;"></div>
65 65
             <div style="width:50px;">审核:</div><div style="width:100px;"></div>
66 66
             <div style="width:70px;">制单人:</div><div style="width:100px;"></div>
67
+            <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
68
+            <div style="width:50px;">领料人:</div><div style="width:100px;"></div>
69
+            <div style="width:80px;">审批:</div><div style="width:100px;"></div>
70
+            <div style="width:50px;">会计:</div><div style="width:100px;">徐立琼</div>
71
+            <div style="width:50px;">审核:</div><div style="width:100px;">徐立琼</div>
72
+            <div style="width:70px;">制单人:</div><div style="width:100px;">徐立琼</div>
73
+          </div>
67 74
           </div>
68 75
         </div>
69 76
 
@@ -116,7 +123,8 @@
116 123
         is_inject:"",
117 124
         page:1,
118 125
         limit:10000,
119
-        keywords:""
126
+        keywords:"",
127
+        orgId:''
120 128
       }
121 129
     },
122 130
     methods: {
@@ -212,6 +220,7 @@
212 220
     },
213 221
     created() {
214 222
       const order_id = this.$route.query.id
223
+      this.orgId = this.$store.getters.xt_user.org.id;
215 224
       this.GetOrderDetail(order_id)
216 225
       this.getList()
217 226
     }

+ 3 - 3
src/xt_pages/stock/stockInOrderDetailPrint.vue View File

@@ -15,7 +15,7 @@
15 15
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
16 16
                         <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
17 17
                     </div>
18
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
18
+                    <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
19 19
                       打印时间:{{time_now}}
20 20
                     </div>
21 21
                     <div class="table_panel">
@@ -60,9 +60,9 @@
60 60
                             </tbody>
61 61
                         </table>
62 62
 
63
-                        <div style="display:flex;margin-top:20px;float:right;">
63
+                        <div style="display:flex;margin-top:1px;float:right;">
64 64
                             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
65
-                            <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
65
+                            <div style="width:80px;" v-if='orgId != 10024'>药材主任:</div><div style="width:100px;"></div>
66 66
                             <div style="width:50px;">会计:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
67 67
                             <div style="width:50px;">审核:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
68 68
                             <div style="width:70px;">制单人:</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>