Browse Source

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

XMLWAN 3 years ago
parent
commit
c93083193d

+ 83 - 101
src/xt_pages/stock/drugs/drugStockInOrder.vue View File

@@ -176,14 +176,91 @@
176 176
       <el-pagination
177 177
         @size-change="handleSizeChange"
178 178
         @current-change="handleCurrentChange"
179
-        :page-sizes="[10, 50, 100]"
180
-        :page-size="10"
179
+        :page-sizes="[5, 10, 50, 100]"
180
+        :page-size="5"
181 181
         background
182
-        style="margin-top:20px;float: right"
182
+        style="margin-top:20px;text-align: right"
183 183
         layout="total, sizes, prev, pager, next, jumper"
184 184
         :total="total"
185 185
       >
186 186
       </el-pagination>
187
+      <el-table
188
+        v-show="showOne"
189
+        :data="WarehouseInfo.warehouseInfoDate"
190
+        :class="signAndWeighBoxPatients"
191
+        style="width: 100%;margin-top:10px;"
192
+        border
193
+        highlight-current-row
194
+        v-loading="Warehouse.loading"
195
+        ref="multipleTable"
196
+        @selection-change="select"
197
+        :row-style="{ color: '#303133' }"
198
+        :header-cell-style="{
199
+          backgroundColor: 'rgb(245, 247, 250)',
200
+          color: '#606266'
201
+        }"
202
+      >
203
+        <el-table-column label="药品名称" align="center">
204
+          <template slot-scope="scope">
205
+             {{scope.row.drug.drug_name}}
206
+          </template>
207
+        </el-table-column>
208
+        <el-table-column label="药品类型" align="center">
209
+          <template slot-scope="scope">
210
+              {{getDrugType(scope.row.drug.drug_type)}}
211
+          </template>
212
+        </el-table-column>
213
+        <el-table-column label="规格&单位" align="center">
214
+          <template slot-scope="scope">
215
+            {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
216
+          </template>
217
+        </el-table-column>
218
+        <el-table-column label="批号" align="center">
219
+          <template slot-scope="scope">
220
+            {{scope.row.number}}
221
+          </template>
222
+        </el-table-column>
223
+        <el-table-column label="入库数量" align="center">
224
+          <template slot-scope="scope">
225
+            {{scope.row.warehousing_count}}
226
+          </template>
227
+        </el-table-column>
228
+        <el-table-column label="进货价" align="center">
229
+          <template slot-scope="scope">
230
+            {{scope.row.price}}
231
+          </template>
232
+        </el-table-column>
233
+        <el-table-column label="总价" align="center">
234
+          <template slot-scope="scope">
235
+            {{scope.row.total_price}}
236
+          </template>
237
+        </el-table-column>
238
+        <el-table-column label="生产厂家" align="center">
239
+          <template slot-scope="scope">
240
+            {{getManufacturer(scope.row.drug.manufacturer)}}
241
+          </template>
242
+        </el-table-column>
243
+       <el-table-column label="生产日期" align="center">
244
+          <template slot-scope="scope">
245
+             {{getTime(scope.row.product_date)}}
246
+          </template>
247
+        </el-table-column>
248
+        <el-table-column label="有效日期" align="center">
249
+          <template slot-scope="scope">
250
+            {{getTime(scope.row.expiry_date)}}
251
+          </template>
252
+        </el-table-column>
253
+        <el-table-column label="批准文号" align="center">
254
+          <template slot-scope="scope">
255
+             {{scope.row.number}}
256
+          </template>
257
+        </el-table-column>
258
+        <el-table-column label="备注" align="center">
259
+          <template slot-scope="scope">
260
+            {{scope.row.remark}}
261
+          </template>
262
+        </el-table-column>
263
+      </el-table>
187 264
     </div>
188 265
 
189 266
 
@@ -285,104 +362,9 @@
285 362
     
286 363
 
287 364
 
288
-      <el-table
289
-        v-show="showOne"
290
-        :data="WarehouseInfo.warehouseInfoDate"
291
-        :class="signAndWeighBoxPatients"
292
-        style="width: 100%"
293
-        border
294
-        highlight-current-row
295
-        v-loading="Warehouse.loading"
296
-        ref="multipleTable"
297
-        @selection-change="select"
298
-        :row-style="{ color: '#303133' }"
299
-        :header-cell-style="{
300
-          backgroundColor: 'rgb(245, 247, 250)',
301
-          color: '#606266'
302
-        }"
303
-      >
304
-        <el-table-column align="center" type="selection" width="55">
305
-        </el-table-column>
306
-
307
-        <el-table-column label="药品名称" align="center">
308
-          <template slot-scope="scope">
309
-             {{scope.row.drug.drug_name}}
310
-          </template>
311
-        </el-table-column>
312
-
313
-        <el-table-column label="药品类型" align="center">
314
-          <template slot-scope="scope">
315
-              {{getDrugType(scope.row.drug.drug_type)}}
316
-          </template>
317
-        </el-table-column>
318
-
319
-        <el-table-column label="规格&单位" align="center">
320
-          <template slot-scope="scope">
321
-             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
322
-          </template>
323
-        </el-table-column>
324
-       
325
-        <el-table-column label="批号" align="center">
326
-          <template slot-scope="scope">
327
-           {{scope.row.number}}
328
-          </template>
329
-        </el-table-column>
330
-        
331
-        <el-table-column label="入库数量" align="center">
332
-          <template slot-scope="scope">
333
-             {{scope.row.warehousing_count}}
334
-          </template>
335
-        </el-table-column>
336
-
337
-       <el-table-column label="进货价" align="center">
338
-          <template slot-scope="scope">
339
-            {{scope.row.price}}
340
-          </template>
341
-        </el-table-column>
342
-
343
-      
344
-       <el-table-column label="总价" align="center">
345
-          <template slot-scope="scope">
346
-             {{scope.row.total_price}}
347
-          </template>
348
-        </el-table-column>
349 365
       
350 366
 
351
-       <el-table-column label="生产厂家" align="center">
352
-          <template slot-scope="scope">
353
-             {{getManufacturer(scope.row.drug.manufacturer)}}
354
-          </template>
355
-        </el-table-column>
356
-
357
-
358
-       <el-table-column label="生产日期" align="center">
359
-          <template slot-scope="scope">
360
-             {{getTime(scope.row.product_date)}}
361
-          </template>
362
-        </el-table-column>
363
-       
364
-
365
-       <el-table-column label="有效日期" align="center">
366
-          <template slot-scope="scope">
367
-             {{getTime(scope.row.expiry_date)}}
368
-          </template>
369
-        </el-table-column>
370
-
371
-        <el-table-column label="批准文号" align="center">
372
-          <template slot-scope="scope">
373
-             {{scope.row.number}}
374
-          </template>
375
-        </el-table-column>
376
-
377
-
378
-        <el-table-column label="备注" align="center">
379
-          <template slot-scope="scope">
380
-            {{scope.row.remark}}
381
-          </template>
382
-        </el-table-column>
383
-      </el-table>
384
-
385
-      <el-pagination
367
+      <!-- <el-pagination
386 368
         @size-change="handleSizeChange"
387 369
         @current-change="handleCurrentChange"
388 370
         :page-sizes="[10, 50, 100]"
@@ -392,7 +374,7 @@
392 374
         layout="total, sizes, prev, pager, next, jumper"
393 375
         :total="total"
394 376
       >
395
-      </el-pagination>
377
+      </el-pagination> -->
396 378
 
397 379
   </div>
398 380
 </template>
@@ -450,7 +432,7 @@ export default {
450 432
       searchKey: "",
451 433
       type: 1,
452 434
       page: 1,
453
-      limit: 10,
435
+      limit: 5,
454 436
       checked: false,
455 437
       total: 0,
456 438
       pageTotal: 0,

+ 88 - 104
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -184,118 +184,102 @@
184 184
       <el-pagination
185 185
         @size-change="handleSizeChange"
186 186
         @current-change="handleCurrentChange"
187
-        :page-sizes="[10, 50, 100]"
188
-        :page-size="10"
187
+        :page-sizes="[5, 10, 50, 100]"
188
+        :page-size="5"
189 189
         background
190
-        style="margin-top:20px;float: right"
190
+        style="margin-top:20px;text-align: right"
191 191
         layout="total, sizes, prev, pager, next, jumper"
192 192
         :total="total"
193 193
       >
194 194
       </el-pagination>
195
-    </div>
196
-
197
-
198
-<!-- 使用详情 -->
199
-    <div v-show="tableShow" style="margin-bottom:10px">
200
-      <el-table
201
-        :data="tableList"
202
-        :class="signAndWeighBoxPatients"
203
-        style="width: 100%"
204
-        border
205
-        highlight-current-row
206
-        ref="multipleTable"
207
-        @selection-change="select"
208
-        :row-style="{ color: '#303133' }"
209
-        :header-cell-style="{
210
-          backgroundColor: 'rgb(245, 247, 250)',
211
-          color: '#606266'
212
-        }"
213
-      >
214
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
215
-
216
-        <el-table-column label="药品名称" align="center">
217
-          <template slot-scope="scope">
218
-             {{scope.row.drug_name}}
219
-          </template>
220
-        </el-table-column>
221
-        <el-table-column label="药品类型" align="center">
222
-          <template slot-scope="scope">
223
-              {{getDrugType(scope.row.drug_type)}}
224
-          </template>
225
-        </el-table-column>
226
-         <el-table-column label="规格&单位" align="center">
227
-          <template slot-scope="scope">
228
-             {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
229
-          </template>
230
-        </el-table-column>
231
-       
232
-        <el-table-column label="批号" align="center">
233
-          <template slot-scope="scope">
234
-           {{scope.row.number}}
235
-          </template>
236
-        </el-table-column>
237
-        
238
-        <el-table-column label="出库数量" align="center">
239
-          <template slot-scope="scope">
240
-             {{scope.row.count}}
241
-          </template>
242
-        </el-table-column>
243
-
244
-       <el-table-column label="进货价" align="center">
245
-          <template slot-scope="scope">
246
-            {{scope.row.price}}
247
-          </template>
248
-        </el-table-column>
249
-
250
-      
251
-       <el-table-column label="总价" align="center">
252
-          <template slot-scope="scope">
253
-             {{scope.row.total_price}}
254
-          </template>
255
-        </el-table-column>
256
-      
257
-
258
-       <el-table-column label="生产厂家" align="center">
259
-          <template slot-scope="scope">
260
-             {{getManufacturerName(scope.row.manufacturer)}}
261
-          </template>
262
-        </el-table-column>
263
-
264
-
265
-       <el-table-column label="生产日期" align="center">
266
-          <template slot-scope="scope">
267
-             {{getTime(scope.row.product_date)}}
268
-          </template>
269
-        </el-table-column>
270
-       
271
-
272
-       <el-table-column label="有效日期" align="center">
273
-          <template slot-scope="scope">
274
-             {{getTime(scope.row.expiry_date)}}
275
-          </template>
276
-        </el-table-column>
277
-
278
-        <el-table-column label="批准文号" align="center">
279
-          <template slot-scope="scope">
280
-             {{scope.row.number}}
281
-          </template>
282
-        </el-table-column>
195
+      <!-- 使用详情 -->
196
+      <div v-show="tableShow" style="margin-top:10px">
197
+        <el-table
198
+          :data="tableList"
199
+          :class="signAndWeighBoxPatients"
200
+          style="width: 100%"
201
+          border
202
+          highlight-current-row
203
+          ref="multipleTable"
204
+          @selection-change="select"
205
+          :row-style="{ color: '#303133' }"
206
+          :header-cell-style="{
207
+            backgroundColor: 'rgb(245, 247, 250)',
208
+            color: '#606266'
209
+          }"
210
+        >
211
+          <el-table-column label="药品名称" align="center">
212
+            <template slot-scope="scope">
213
+              {{scope.row.drug_name}}
214
+            </template>
215
+          </el-table-column>
216
+          <el-table-column label="药品类型" align="center">
217
+            <template slot-scope="scope">
218
+                {{getDrugType(scope.row.drug_type)}}
219
+            </template>
220
+          </el-table-column>
221
+          <el-table-column label="规格&单位" align="center">
222
+            <template slot-scope="scope">
223
+              {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
224
+            </template>
225
+          </el-table-column>
226
+          <el-table-column label="批号" align="center">
227
+            <template slot-scope="scope">
228
+            {{scope.row.number}}
229
+            </template>
230
+          </el-table-column>
231
+          <el-table-column label="出库数量" align="center">
232
+            <template slot-scope="scope">
233
+              {{scope.row.count}}
234
+            </template>
235
+          </el-table-column>
236
+          <el-table-column label="进货价" align="center">
237
+            <template slot-scope="scope">
238
+              {{scope.row.price}}
239
+            </template>
240
+          </el-table-column>
241
+          <el-table-column label="总价" align="center">
242
+            <template slot-scope="scope">
243
+              {{scope.row.total_price}}
244
+            </template>
245
+          </el-table-column>
246
+          <el-table-column label="生产厂家" align="center">
247
+            <template slot-scope="scope">
248
+              {{getManufacturerName(scope.row.manufacturer)}}
249
+            </template>
250
+          </el-table-column>
251
+          <el-table-column label="生产日期" align="center">
252
+            <template slot-scope="scope">
253
+              {{getTime(scope.row.product_date)}}
254
+            </template>
255
+          </el-table-column>
256
+          <el-table-column label="有效日期" align="center">
257
+            <template slot-scope="scope">
258
+              {{getTime(scope.row.expiry_date)}}
259
+            </template>
260
+          </el-table-column>
261
+          <el-table-column label="批准文号" align="center">
262
+            <template slot-scope="scope">
263
+              {{scope.row.number}}
264
+            </template>
265
+          </el-table-column>
266
+          <el-table-column label="备注" align="center">
267
+            <template slot-scope="scope">
268
+              {{scope.row.remark}}
269
+            </template>
270
+          </el-table-column>
271
+          <el-table-column label="操作" align="center">
272
+            <template slot-scope="scope">
273
+              <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
274
+            </template>
275
+          </el-table-column>
276
+        </el-table>
283 277
 
278
+      </div>
279
+    </div>
284 280
 
285
-        <el-table-column label="备注" align="center">
286
-          <template slot-scope="scope">
287
-            {{scope.row.remark}}
288
-          </template>
289
-        </el-table-column>
290 281
 
291
-        <el-table-column label="操作" align="center">
292
-          <template slot-scope="scope">
293
-             <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
294
-          </template>
295
-        </el-table-column>
296
-      </el-table>
297 282
 
298
-    </div>
299 283
 
300 284
 
301 285
     <el-dialog
@@ -560,7 +544,7 @@ export default {
560 544
         { path: false, name: "出库单" }
561 545
       ],
562 546
       page: 1,
563
-      limit: 10,
547
+      limit: 5,
564 548
       checked: false,
565 549
       total: 0,
566 550
       pageTotal: 0,

+ 33 - 52
src/xt_pages/stock/stockInOrder.vue View File

@@ -165,112 +165,93 @@
165 165
       <el-pagination
166 166
         @size-change="handleSizeChange"
167 167
         @current-change="handleCurrentChange"
168
-        :page-sizes="[10, 50, 100]"
169
-        :page-size="10"
168
+        :page-sizes="[5, 10, 50, 100]"
169
+        :page-size="5"
170 170
         background
171
-        style="margin-top:20px;float: right"
171
+        style="margin-top:20px;text-align: right"
172 172
         layout="total, sizes, prev, pager, next, jumper"
173 173
         :total="total"
174 174
       >
175 175
       </el-pagination>
176
-    </div>
177
-
178
-
179
-   <div v-show="tableShow" style="margin-top:80px">
180
-      <el-table
181
-        :data="tableList"
182
-        :class="signAndWeighBoxPatients"
183
-        style="width: 100%"
184
-        border
185
-        highlight-current-row
186
-        v-loading="Warehouse.loading"
187
-        ref="multipleTable"
188
-        @selection-change="select"
189
-        :row-style="{ color: '#303133' }"
190
-        :header-cell-style="{
191
-          backgroundColor: 'rgb(245, 247, 250)',
192
-          color: '#606266'
193
-        }"
194
-      >
195
-       <!-- <el-table-column align="center" type="selection" width="55">
196
-       </el-table-column> -->
197
-
198
-       <el-table-column label="耗材名称" align="center">
176
+      <div v-show="tableShow" style="margin-top:10px;">
177
+        <el-table
178
+          :data="tableList"
179
+          :class="signAndWeighBoxPatients"
180
+          style="width: 100%"
181
+          border
182
+          highlight-current-row
183
+          v-loading="Warehouse.loading"
184
+          ref="multipleTable"
185
+          @selection-change="select"
186
+          :row-style="{ color: '#303133' }"
187
+          :header-cell-style="{
188
+            backgroundColor: 'rgb(245, 247, 250)',
189
+            color: '#606266'
190
+          }"
191
+        >
192
+        <el-table-column label="耗材名称" align="center">
199 193
           <template slot-scope="scope">
200 194
             {{ scope.row.GoodInfo.good_name }}
201 195
           </template>
202 196
         </el-table-column>
203
-      
204 197
         <el-table-column label="耗材类型" align="center">
205 198
           <template slot-scope="scope">
206 199
             {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
207 200
           </template>
208 201
         </el-table-column>
209
-
210
-
211
-       <el-table-column label="规格&单位" align="center">
202
+        <el-table-column label="规格&单位" align="center">
212 203
           <template slot-scope="scope">
213 204
             {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
214 205
           </template>
215 206
         </el-table-column>
216
-
217
-
218
-       <el-table-column label="批号" align="center">
207
+        <el-table-column label="批号" align="center">
219 208
           <template slot-scope="scope">
220 209
             {{ scope.row.number}}
221 210
           </template>
222 211
         </el-table-column>
223
-        
224 212
         <el-table-column label="入库数量" align="center">
225 213
           <template slot-scope="scope">
226 214
             {{ scope.row.warehousing_count}}
227 215
           </template>
228 216
         </el-table-column>
229
-
230
-
231 217
         <el-table-column label="进货价" align="center">
232 218
           <template slot-scope="scope">
233 219
             {{ scope.row.price}}
234 220
           </template>
235 221
         </el-table-column>
236
-
237
-
238
-       <el-table-column label="总价" align="center">
222
+        <el-table-column label="总价" align="center">
239 223
           <template slot-scope="scope">
240 224
             {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
241 225
           </template>
242 226
         </el-table-column>
243
-
244
-
245
-         <el-table-column label="生产厂家" align="center">
227
+        <el-table-column label="生产厂家" align="center">
246 228
           <template slot-scope="scope">
247 229
             {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
248 230
           </template>
249 231
         </el-table-column>
250
-
251 232
         <el-table-column label="生产日期" align="center">
252 233
           <template slot-scope="scope">
253 234
             {{ getTime(scope.row.product_date)}}
254 235
           </template>
255 236
         </el-table-column>
256
-
257
-
258
-       <el-table-column label="有效期" align="center">
237
+        <el-table-column label="有效期" align="center">
259 238
           <template slot-scope="scope">
260 239
             {{ getTime(scope.row.expiry_date)}}
261 240
           </template>
262 241
         </el-table-column>
263
-
264 242
         <el-table-column label="备注" align="center">
265 243
           <template slot-scope="scope">
266 244
             {{ scope.row.remark }}
267 245
           </template>
268 246
         </el-table-column>
269
-       
270
-      </el-table>
247
+        </el-table>
248
+      </div>
271 249
     </div>
272 250
 
273 251
 
252
+   
253
+
254
+
274 255
     <el-dialog
275 256
       title="详情"
276 257
       :visible.sync="dialogVisible"
@@ -702,7 +683,7 @@ export default {
702 683
       searchKey: "",
703 684
       type: 1,
704 685
       page: 1,
705
-      limit: 10,
686
+      limit: 5,
706 687
       checked: false,
707 688
       total: 0,
708 689
       pageTotal: 0,
@@ -752,7 +733,7 @@ export default {
752 733
         dealer:0
753 734
       }, 
754 735
       warehousing_time: '',
755
-     warehouse:{},
736
+      warehouse:{},
756 737
       propForm: {
757 738
         goods: [],
758 739
         goodType: [],
@@ -773,7 +754,7 @@ export default {
773 754
       },
774 755
         isCreated: 1,
775 756
         isVisibility: false,
776
-       drug_id:1,
757
+        drug_id:1,
777 758
       },
778 759
       drug_id:1,
779 760
       tableShow:false,

+ 84 - 103
src/xt_pages/stock/stockOutOrder.vue View File

@@ -172,117 +172,98 @@
172 172
       <el-pagination
173 173
         @size-change="handleSizeChange"
174 174
         @current-change="handleCurrentChange"
175
-        :page-sizes="[10, 50, 100]"
176
-        :page-size="10"
175
+        :page-sizes="[5, 10, 50, 100]"
176
+        :page-size="5"
177 177
         background
178
-        style="margin-top:20px;float: right"
178
+        style="margin-top:20px;text-align: right"
179 179
         layout="total, sizes, prev, pager, next, jumper"
180 180
         :total="total"
181 181
       >
182 182
       </el-pagination>
183
+      <!--  详情 -->
184
+      <div v-show="tableShow" style="margin-top:10px;">
185
+        <el-table
186
+            :data="tableList"
187
+            :class="signAndWeighBoxPatients"
188
+            style="width: 100%"
189
+            border
190
+            highlight-current-row
191
+            ref="multipleTable"
192
+            @selection-change="select"
193
+            :row-style="{ color: '#303133' }"
194
+            :header-cell-style="{
195
+              backgroundColor: 'rgb(245, 247, 250)',
196
+              color: '#606266'
197
+            }"
198
+          >
199
+          <el-table-column label="耗材名称" align="center">
200
+            <template slot-scope="scope">
201
+              {{ scope.row.good_name }}
202
+            </template>
203
+          </el-table-column>
204
+          <el-table-column label="耗材类型" align="center">
205
+            <template slot-scope="scope">
206
+              {{  getTypeName(scope.row.good_type_id)}}
207
+            </template>
208
+          </el-table-column>
209
+          <el-table-column label="规格&单位" align="center">
210
+            <template slot-scope="scope">
211
+              {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
212
+            </template>
213
+          </el-table-column>
214
+          <el-table-column label="批号" align="center">
215
+            <template slot-scope="scope">
216
+              {{ scope.row.number}}
217
+            </template>
218
+          </el-table-column>
219
+          <el-table-column label="出库数量" align="center">
220
+            <template slot-scope="scope">
221
+              <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
222
+              <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
223
+            </template>
224
+          </el-table-column>
225
+          <el-table-column label="出货价" align="center">
226
+            <template slot-scope="scope">
227
+              {{ scope.row.price}}
228
+            </template>
229
+          </el-table-column>
230
+          <el-table-column label="总价" align="center">
231
+            <template slot-scope="scope">
232
+              {{ (scope.row.count * scope.row.price).toFixed(2)}}
233
+            </template>
234
+          </el-table-column>
235
+          <el-table-column label="生产厂家" align="center">
236
+            <template slot-scope="scope">
237
+              {{ getManufactuerName(scope.row.manufacturer)}}
238
+            </template>
239
+          </el-table-column>
240
+          <el-table-column label="生产日期" align="center">
241
+            <template slot-scope="scope">
242
+              {{ getTime(scope.row.product_date)}}
243
+            </template>
244
+          </el-table-column>
245
+          <el-table-column label="有效期" align="center">
246
+            <template slot-scope="scope">
247
+              {{ getTime(scope.row.expiry_date)}}
248
+            </template>
249
+          </el-table-column>
250
+          <el-table-column label="备注" align="center">
251
+            <template slot-scope="scope">
252
+              {{ scope.row.remark }}
253
+            </template>
254
+          </el-table-column>
255
+          <el-table-column label="操作" align="center">
256
+            <template slot-scope="scope">
257
+              <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
258
+            </template>
259
+          </el-table-column>
260
+        </el-table>
261
+      </div>
183 262
     </div>
184 263
 
185 264
 
186 265
 
187
-   <!--  详情 -->
188
-  <div v-show="tableShow">
189
-     <el-table
190
-        :data="tableList"
191
-        :class="signAndWeighBoxPatients"
192
-        style="width: 100%"
193
-        border
194
-        highlight-current-row
195
-        ref="multipleTable"
196
-        @selection-change="select"
197
-        :row-style="{ color: '#303133' }"
198
-        :header-cell-style="{
199
-          backgroundColor: 'rgb(245, 247, 250)',
200
-          color: '#606266'
201
-        }"
202
-      >
203
-       <el-table-column align="center" type="selection" width="55">
204
-       </el-table-column>
205
-
206
-       <el-table-column label="耗材名称" align="center">
207
-          <template slot-scope="scope">
208
-            {{ scope.row.good_name }}
209
-          </template>
210
-        </el-table-column>
211
-      
212
-        <el-table-column label="耗材类型" align="center">
213
-          <template slot-scope="scope">
214
-            {{  getTypeName(scope.row.good_type_id)}}
215
-          </template>
216
-        </el-table-column>
217
-
218
-
219
-       <el-table-column label="规格&单位" align="center">
220
-          <template slot-scope="scope">
221
-            {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
222
-          </template>
223
-        </el-table-column>
224
-
225
-
226
-       <el-table-column label="批号" align="center">
227
-          <template slot-scope="scope">
228
-            {{ scope.row.number}}
229
-          </template>
230
-        </el-table-column>
231
-        
232
-        <el-table-column label="出库数量" align="center">
233
-          <template slot-scope="scope">
234
-           <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
235
-           <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
236
-          </template>
237
-        </el-table-column>
238
-
239
-
240
-        <el-table-column label="出货价" align="center">
241
-          <template slot-scope="scope">
242
-            {{ scope.row.price}}
243
-          </template>
244
-        </el-table-column>
245
-
246
-
247
-       <el-table-column label="总价" align="center">
248
-          <template slot-scope="scope">
249
-            {{ (scope.row.count * scope.row.price).toFixed(2)}}
250
-          </template>
251
-        </el-table-column>
252
-
253
-
254
-         <el-table-column label="生产厂家" align="center">
255
-          <template slot-scope="scope">
256
-            {{ getManufactuerName(scope.row.manufacturer)}}
257
-          </template>
258
-        </el-table-column>
259
-
260
-        <el-table-column label="生产日期" align="center">
261
-          <template slot-scope="scope">
262
-            {{ getTime(scope.row.product_date)}}
263
-          </template>
264
-        </el-table-column>
265
-
266
-
267
-       <el-table-column label="有效期" align="center">
268
-          <template slot-scope="scope">
269
-            {{ getTime(scope.row.expiry_date)}}
270
-          </template>
271
-        </el-table-column>
272
-
273
-        <el-table-column label="备注" align="center">
274
-          <template slot-scope="scope">
275
-            {{ scope.row.remark }}
276
-          </template>
277
-        </el-table-column>
278
-        <el-table-column label="操作" align="center">
279
-          <template slot-scope="scope">
280
-            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
281
-          </template>
282
-        </el-table-column>
283
-      </el-table>  
284
-    
285
-  </div>
266
+  
286 267
 
287 268
 
288 269
     <!-- 新增弹窗 -->
@@ -749,7 +730,7 @@ export default {
749 730
         { path: false, name: "出库单" }
750 731
       ],
751 732
       page: 1,
752
-      limit: 10,
733
+      limit: 5,
753 734
       checked: false,
754 735
       total: 0,
755 736
       pageTotal: 0,