28169 2 kuukautta sitten
vanhempi
commit
ef2fc7ceeb

+ 16 - 1
src/store/modules/globalConfig.js Näytä tiedosto

@@ -1120,7 +1120,22 @@ const global_config = {
1120 1120
         zongliang_unit: 'mg',
1121 1121
         gaimingcheng_unit: '',
1122 1122
         gaijiliang_unit: ''
1123
-      }
1123
+      },
1124
+      18: {
1125
+        id: 18,
1126
+        name: '贝米肝素钠注射液',
1127
+        type: 1,
1128
+        shouji: 1,
1129
+        weichi: 1,
1130
+        zongliang: 1,
1131
+        gaimingcheng: -1,
1132
+        gaijiliang: -1,
1133
+        shouji_unit: 'iu',
1134
+        weichi_unit: 'iu/h',
1135
+        zongliang_unit: 'iu',
1136
+        gaimingcheng_unit: '',
1137
+        gaijiliang_unit: ''
1138
+      },
1124 1139
     },
1125 1140
     anticoagulants_set: {
1126 1141
       type: 2

+ 1 - 1
src/xt_pages/stock/drugs/drugInventory.vue Näytä tiedosto

@@ -26,7 +26,7 @@
26 26
           <drug-damaged ref="childOne"></drug-damaged>
27 27
         </el-tab-pane>
28 28
 
29
-        <!-- <el-tab-pane label="盘点记录表" name="seven">
29
+        <!-- <el-tab-pane label="盘点日志表" name="seven">
30 30
             <inventory-record ref="childSeven"></inventory-record>
31 31
          </el-tab-pane> -->
32 32
       </el-tabs>

+ 1 - 1
src/xt_pages/stock/stockInventory.vue Näytä tiedosto

@@ -22,7 +22,7 @@
22 22
                 <stockDamaged ref="childOne"></stockDamaged>
23 23
             </el-tab-pane>
24 24
 
25
-            <el-tab-pane label="盘点记录表" name="seven">
25
+            <el-tab-pane label="盘点日志表" name="seven">
26 26
                 <inventory-record ref="childSeven"></inventory-record>
27 27
             </el-tab-pane>
28 28
         </el-tabs>

+ 155 - 6
src/xt_pages/stock/stockInventoryModePrint.vue Näytä tiedosto

@@ -28,8 +28,7 @@
28 28
                         <td align="center">生产日期</td> 
29 29
                         <td align="center">有效日期</td>
30 30
                         <td align="center">生产厂商</td>
31
-                       
32
-                       
31
+                        <td align="center">盘点数量</td>
33 32
                        
34 33
                     </tr>
35 34
 
@@ -39,11 +38,161 @@
39 38
                         <td align="center">{{ getInCount(item.good_id) }}</td>
40 39
                         <td align="center">{{ getOutCount(item.good_id) }}</td> 
41 40
                         <td align="center">{{ getSumCount(item.good_id) }}</td>
42
-                        <td align="center">生产厂商</td>
41
+                        <td align="center">
42
+                            <table
43
+                                class="ware_table"
44
+                                style="width: 100%; border-collapse: collapse"
45
+                                >
46
+                                <tr
47
+                                    v-for="(it, i) in item.child"
48
+                                    :key="i"
49
+                                    style="width: 100%"
50
+                                >
51
+                                    <td
52
+                                    :style="[
53
+                                        {
54
+                                        border:
55
+                                            i === item.child.length - 1
56
+                                            ? 'none'
57
+                                            : '',
58
+                                        },
59
+                                        {
60
+                                        borderStyle:
61
+                                            i === item.child.length - 1
62
+                                            ? 'initial'
63
+                                            : 'hidden',
64
+                                        },
65
+                                        {
66
+                                        borderBottom:
67
+                                            i === item.child.length - 1
68
+                                            ? 'none'
69
+                                            : '1px solid',
70
+                                        },
71
+                                    ]"
72
+                                    >
73
+                                    {{ it.number }}
74
+                                    </td>
75
+                              </tr>
76
+                            </table>
77
+                        </td>
43 78
                        
44
-                        <td align="center">本月入库数量</td>
45
-                        <td align="center">本月出库数量</td>
46
-                        <td align="center">本月剩余库存</td>
79
+                        <td align="center">
80
+                            <table
81
+                                class="ware_table"
82
+                                style="width: 100%; border-collapse: collapse"
83
+                                >
84
+                                <tr
85
+                                    v-for="(it, i) in item.child"
86
+                                    :key="i"
87
+                                    style="width: 100%"
88
+                                >
89
+                                    <td
90
+                                    :style="[
91
+                                        {
92
+                                        border:
93
+                                            i === item.child.length - 1
94
+                                            ? 'none'
95
+                                            : '',
96
+                                        },
97
+                                        {
98
+                                        borderStyle:
99
+                                            i === item.child.length - 1
100
+                                            ? 'initial'
101
+                                            : 'hidden',
102
+                                        },
103
+                                        {
104
+                                        borderBottom:
105
+                                            i === item.child.length - 1
106
+                                            ? 'none'
107
+                                            : '1px solid',
108
+                                        },
109
+                                    ]"
110
+                                    >
111
+                                    {{ getTime(it.product_date) }}
112
+                                    </td>
113
+                              </tr>
114
+                            </table>
115
+                        </td>
116
+                        <td align="center">
117
+                            <table
118
+                                class="ware_table"
119
+                                style="width: 100%; border-collapse: collapse"
120
+                                >
121
+                                <tr
122
+                                    v-for="(it, i) in item.child"
123
+                                    :key="i"
124
+                                    style="width: 100%"
125
+                                >
126
+                                    <td
127
+                                    :style="[
128
+                                        {
129
+                                        border:
130
+                                            i === item.child.length - 1
131
+                                            ? 'none'
132
+                                            : '',
133
+                                        },
134
+                                        {
135
+                                        borderStyle:
136
+                                            i === item.child.length - 1
137
+                                            ? 'initial'
138
+                                            : 'hidden',
139
+                                        },
140
+                                        {
141
+                                        borderBottom:
142
+                                            i === item.child.length - 1
143
+                                            ? 'none'
144
+                                            : '1px solid',
145
+                                        },
146
+                                    ]"
147
+                                    >
148
+                                    {{ getTime(it.expiry_date) }}
149
+                                    </td>
150
+                              </tr>
151
+                            </table>
152
+                        </td>
153
+                        <td align="center">
154
+
155
+                            <table
156
+                                class="ware_table"
157
+                                style="width: 100%; border-collapse: collapse"
158
+                                >
159
+                                <tr
160
+                                    v-for="(it, i) in item.child"
161
+                                    :key="i"
162
+                                    style="width: 100%"
163
+                                >
164
+                                    <td
165
+                                    :style="[
166
+                                        {
167
+                                        border:
168
+                                            i === item.child.length - 1
169
+                                            ? 'none'
170
+                                            : '',
171
+                                        },
172
+                                        {
173
+                                        borderStyle:
174
+                                            i === item.child.length - 1
175
+                                            ? 'initial'
176
+                                            : 'hidden',
177
+                                        },
178
+                                        {
179
+                                        borderBottom:
180
+                                            i === item.child.length - 1
181
+                                            ? 'none'
182
+                                            : '1px solid',
183
+                                        },
184
+                                    ]"
185
+                                    >
186
+                                    {{ getManufacturerName(it.manufacturer) }}
187
+                                    </td>
188
+                              </tr>
189
+                            </table>
190
+
191
+                        </td>
192
+                        <td align="center">
193
+
194
+                            
195
+                        </td>
47 196
                        
48 197
                     </tr>
49 198