|
|
@@ -122,11 +122,14 @@
|
|
122
|
122
|
</el-table-column>
|
|
123
|
123
|
<el-table-column label="生产商" align="center">
|
|
124
|
124
|
<template slot-scope="scope">
|
|
125
|
|
- <tr style="background: none">
|
|
|
125
|
+ <!-- <tr style="background: none">
|
|
126
|
126
|
<td style="border-right: none; border-inline-end: none">
|
|
127
|
127
|
{{ getManufacture(scope.row.manufacturer) }}
|
|
128
|
128
|
</td>
|
|
129
|
|
- </tr>
|
|
|
129
|
+ </tr> -->
|
|
|
130
|
+ <span>
|
|
|
131
|
+ {{ getManufacture(scope.row.manufacturer) }}
|
|
|
132
|
+ </span>
|
|
130
|
133
|
</template>
|
|
131
|
134
|
</el-table-column>
|
|
132
|
135
|
<el-table-column label="入库数量" align="center">
|
|
|
@@ -183,7 +186,42 @@
|
|
183
|
186
|
|
|
184
|
187
|
<el-table-column label="剩余库存量" align="center" v-if="showThree">
|
|
185
|
188
|
<template slot-scope="scope">
|
|
186
|
|
- <span
|
|
|
189
|
+ <tr style="background: none">
|
|
|
190
|
+ <td
|
|
|
191
|
+ v-if="
|
|
|
192
|
+ org_id == 9671 ||
|
|
|
193
|
+ org_id == 10138 ||
|
|
|
194
|
+ org_id == 10028 ||
|
|
|
195
|
+ org_id == 9675 ||
|
|
|
196
|
+ org_id == 4 ||
|
|
|
197
|
+ org_id == 3877 ||
|
|
|
198
|
+ org_id == 10243 ||
|
|
|
199
|
+ org_id == 10088 ||
|
|
|
200
|
+ org_id == 10245 ||
|
|
|
201
|
+ org_id == 9779 ||
|
|
|
202
|
+ org_id == 10106 ||
|
|
|
203
|
+ org_id == 9504 ||
|
|
|
204
|
+ org_id == 10215 ||
|
|
|
205
|
+ org_id == 10188 ||
|
|
|
206
|
+ org_id == 10191 ||
|
|
|
207
|
+ org_id == 9919 ||
|
|
|
208
|
+ org_id == 10265 ||
|
|
|
209
|
+ org_id == 10164 ||
|
|
|
210
|
+ org_id == 10290
|
|
|
211
|
+ "
|
|
|
212
|
+ >
|
|
|
213
|
+ {{ getOverFlushInfo(scope.row.xt_warehouse_info) }}
|
|
|
214
|
+ </td>
|
|
|
215
|
+ <td v-else>
|
|
|
216
|
+ {{
|
|
|
217
|
+ getWareInfo(scope.row.xt_warehouse_info) -
|
|
|
218
|
+ getAutoCount(scope.row.id) -
|
|
|
219
|
+ getOutCount(scope.row.id) +
|
|
|
220
|
+ getCancelCount(scope.row.id)
|
|
|
221
|
+ }}
|
|
|
222
|
+ </td>
|
|
|
223
|
+ </tr>
|
|
|
224
|
+ <!-- <span
|
|
187
|
225
|
v-if="
|
|
188
|
226
|
org_id == 9671 ||
|
|
189
|
227
|
org_id == 10138 ||
|
|
|
@@ -213,7 +251,7 @@
|
|
213
|
251
|
getAutoCount(scope.row.id) -
|
|
214
|
252
|
getOutCount(scope.row.id) +
|
|
215
|
253
|
getCancelCount(scope.row.id)
|
|
216
|
|
- }}</span>
|
|
|
254
|
+ }}</span> -->
|
|
217
|
255
|
</template>
|
|
218
|
256
|
</el-table-column>
|
|
219
|
257
|
|
|
|
@@ -437,7 +475,7 @@ export default {
|
|
437
|
475
|
this.getlist();
|
|
438
|
476
|
this.getStockDrugCount();
|
|
439
|
477
|
},
|
|
440
|
|
-
|
|
|
478
|
+
|
|
441
|
479
|
// 合并单元格样式
|
|
442
|
480
|
cellStyle({ row, column, rowIndex, columnIndex }) {
|
|
443
|
481
|
let arr = [6, 7, 8, 9];
|
|
|
@@ -906,7 +944,7 @@ export default {
|
|
906
|
944
|
display: block;
|
|
907
|
945
|
width: 100%;
|
|
908
|
946
|
}
|
|
909
|
|
-.spanClass .cell tr:last-of-type td{
|
|
|
947
|
+.spanClass .cell tr:last-of-type td {
|
|
910
|
948
|
border-bottom: none;
|
|
911
|
949
|
}
|
|
912
|
950
|
</style>
|
huangyw