see999 4 years ago
parent
commit
b613dbe264

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

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

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

177
       <el-pagination
177
       <el-pagination
178
         @size-change="handleSizeChange"
178
         @size-change="handleSizeChange"
179
         @current-change="handleCurrentChange"
179
         @current-change="handleCurrentChange"
180
-        :page-sizes="[10, 50, 100]"
181
-        :page-size="10"
180
+        :page-sizes="[5, 10, 50, 100]"
181
+        :page-size="5"
182
         background
182
         background
183
-        style="margin-top:20px;float: right"
183
+        style="margin-top:20px;text-align: right"
184
         layout="total, sizes, prev, pager, next, jumper"
184
         layout="total, sizes, prev, pager, next, jumper"
185
         :total="total"
185
         :total="total"
186
       >
186
       >
187
       </el-pagination>
187
       </el-pagination>
188
-    </div>
189
-
190
-
191
-   <div v-show="tableShow" style="margin-top:80px">
192
-      <el-table
193
-        :data="tableList"
194
-        :class="signAndWeighBoxPatients"
195
-        style="width: 100%"
196
-        border
197
-        highlight-current-row
198
-        v-loading="Warehouse.loading"
199
-        ref="multipleTable"
200
-        @selection-change="select"
201
-        :row-style="{ color: '#303133' }"
202
-        :header-cell-style="{
203
-          backgroundColor: 'rgb(245, 247, 250)',
204
-          color: '#606266'
205
-        }"
206
-      >
207
-       <!-- <el-table-column align="center" type="selection" width="55">
208
-       </el-table-column> -->
209
-
210
-       <el-table-column label="耗材名称" align="center">
188
+      <div v-show="tableShow" style="margin-top:10px;">
189
+        <el-table
190
+          :data="tableList"
191
+          :class="signAndWeighBoxPatients"
192
+          style="width: 100%"
193
+          border
194
+          highlight-current-row
195
+          v-loading="Warehouse.loading"
196
+          ref="multipleTable"
197
+          @selection-change="select"
198
+          :row-style="{ color: '#303133' }"
199
+          :header-cell-style="{
200
+            backgroundColor: 'rgb(245, 247, 250)',
201
+            color: '#606266'
202
+          }"
203
+        >
204
+        <el-table-column label="耗材名称" align="center">
211
           <template slot-scope="scope">
205
           <template slot-scope="scope">
212
             {{ scope.row.GoodInfo.good_name }}
206
             {{ scope.row.GoodInfo.good_name }}
213
           </template>
207
           </template>
214
         </el-table-column>
208
         </el-table-column>
215
-      
216
         <el-table-column label="耗材类型" align="center">
209
         <el-table-column label="耗材类型" align="center">
217
           <template slot-scope="scope">
210
           <template slot-scope="scope">
218
             {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
211
             {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
219
           </template>
212
           </template>
220
         </el-table-column>
213
         </el-table-column>
221
-
222
-
223
-       <el-table-column label="规格&单位" align="center">
214
+        <el-table-column label="规格&单位" align="center">
224
           <template slot-scope="scope">
215
           <template slot-scope="scope">
225
             {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
216
             {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
226
           </template>
217
           </template>
227
         </el-table-column>
218
         </el-table-column>
228
-
229
-
230
-       <el-table-column label="批号" align="center">
219
+        <el-table-column label="批号" align="center">
231
           <template slot-scope="scope">
220
           <template slot-scope="scope">
232
             {{ scope.row.number}}
221
             {{ scope.row.number}}
233
           </template>
222
           </template>
234
         </el-table-column>
223
         </el-table-column>
235
-        
236
         <el-table-column label="入库数量" align="center">
224
         <el-table-column label="入库数量" align="center">
237
           <template slot-scope="scope">
225
           <template slot-scope="scope">
238
             {{ scope.row.warehousing_count}}
226
             {{ scope.row.warehousing_count}}
239
           </template>
227
           </template>
240
         </el-table-column>
228
         </el-table-column>
241
-
242
-
243
         <el-table-column label="进货价" align="center">
229
         <el-table-column label="进货价" align="center">
244
           <template slot-scope="scope">
230
           <template slot-scope="scope">
245
             {{ scope.row.price}}
231
             {{ scope.row.price}}
246
           </template>
232
           </template>
247
         </el-table-column>
233
         </el-table-column>
248
-
249
-
250
-       <el-table-column label="总价" align="center">
234
+        <el-table-column label="总价" align="center">
251
           <template slot-scope="scope">
235
           <template slot-scope="scope">
252
             {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
236
             {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
253
           </template>
237
           </template>
254
         </el-table-column>
238
         </el-table-column>
255
-
256
-
257
-         <el-table-column label="生产厂家" align="center">
239
+        <el-table-column label="生产厂家" align="center">
258
           <template slot-scope="scope">
240
           <template slot-scope="scope">
259
             {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
241
             {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
260
           </template>
242
           </template>
261
         </el-table-column>
243
         </el-table-column>
262
-
263
         <el-table-column label="生产日期" align="center">
244
         <el-table-column label="生产日期" align="center">
264
           <template slot-scope="scope">
245
           <template slot-scope="scope">
265
             {{ getTime(scope.row.product_date)}}
246
             {{ getTime(scope.row.product_date)}}
266
           </template>
247
           </template>
267
         </el-table-column>
248
         </el-table-column>
268
-
269
-
270
-       <el-table-column label="有效期" align="center">
249
+        <el-table-column label="有效期" align="center">
271
           <template slot-scope="scope">
250
           <template slot-scope="scope">
272
             {{ getTime(scope.row.expiry_date)}}
251
             {{ getTime(scope.row.expiry_date)}}
273
           </template>
252
           </template>
274
         </el-table-column>
253
         </el-table-column>
275
-
276
         <el-table-column label="备注" align="center">
254
         <el-table-column label="备注" align="center">
277
           <template slot-scope="scope">
255
           <template slot-scope="scope">
278
             {{ scope.row.remark }}
256
             {{ scope.row.remark }}
279
           </template>
257
           </template>
280
         </el-table-column>
258
         </el-table-column>
281
-       
282
-      </el-table>
259
+        </el-table>
260
+      </div>
283
     </div>
261
     </div>
284
 
262
 
285
 
263
 
264
+   
265
+
266
+
286
     <el-dialog
267
     <el-dialog
287
       title="详情"
268
       title="详情"
288
       :visible.sync="dialogVisible"
269
       :visible.sync="dialogVisible"
714
       searchKey: "",
695
       searchKey: "",
715
       type: 1,
696
       type: 1,
716
       page: 1,
697
       page: 1,
717
-      limit: 10,
698
+      limit: 5,
718
       checked: false,
699
       checked: false,
719
       total: 0,
700
       total: 0,
720
       pageTotal: 0,
701
       pageTotal: 0,
764
         dealer:0
745
         dealer:0
765
       }, 
746
       }, 
766
       warehousing_time: '',
747
       warehousing_time: '',
767
-     warehouse:{},
748
+      warehouse:{},
768
       propForm: {
749
       propForm: {
769
         goods: [],
750
         goods: [],
770
         goodType: [],
751
         goodType: [],
785
       },
766
       },
786
         isCreated: 1,
767
         isCreated: 1,
787
         isVisibility: false,
768
         isVisibility: false,
788
-       drug_id:1,
769
+        drug_id:1,
789
       },
770
       },
790
       drug_id:1,
771
       drug_id:1,
791
       tableShow:false,
772
       tableShow:false,

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

172
       <el-pagination
172
       <el-pagination
173
         @size-change="handleSizeChange"
173
         @size-change="handleSizeChange"
174
         @current-change="handleCurrentChange"
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
         background
177
         background
178
-        style="margin-top:20px;float: right"
178
+        style="margin-top:20px;text-align: right"
179
         layout="total, sizes, prev, pager, next, jumper"
179
         layout="total, sizes, prev, pager, next, jumper"
180
         :total="total"
180
         :total="total"
181
       >
181
       >
182
       </el-pagination>
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
     </div>
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
         { path: false, name: "出库单" }
730
         { path: false, name: "出库单" }
750
       ],
731
       ],
751
       page: 1,
732
       page: 1,
752
-      limit: 10,
733
+      limit: 5,
753
       checked: false,
734
       checked: false,
754
       total: 0,
735
       total: 0,
755
       pageTotal: 0,
736
       pageTotal: 0,