-
-
- 原料区(待筛选)
-
-
- 筛选
-
-
-
-
-
-
-
-
-
-
-
- 添加到采购 >>
- << 移除
-
+
-
+
采购单明细
-
-
+
+
+
+
+
@@ -98,10 +61,11 @@
import { createPurchasePlan } from '@/api/wms/purchasePlan'
import { listRawMaterial } from '@/api/wms/rawMaterial'
import UserSelect from '@/components/KLPService/UserSelect'
+import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect'
export default {
name: 'CreatePurchasePanel',
- components: { UserSelect },
+ components: { UserSelect, RawMaterialSelect },
props: {
orderId: {
type: [String, Number],
diff --git a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
index 89cd6598..4446f413 100644
--- a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
+++ b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
@@ -136,9 +136,9 @@
-
+
-
+
diff --git a/klp-ui/src/views/wms/stockIo/index.vue b/klp-ui/src/views/wms/stockIo/index.vue
index 8bd6ab43..1a33f50a 100644
--- a/klp-ui/src/views/wms/stockIo/index.vue
+++ b/klp-ui/src/views/wms/stockIo/index.vue
@@ -136,12 +136,12 @@
icon="el-icon-document"
@click="showDetail(scope.row)"
>明细
- 打印条码
+ >打印条码 -->
@@ -206,7 +206,7 @@
/>
-
-
+ -->
@@ -297,13 +297,13 @@ export default {
detailDialogVisible: false,
detailStockIo: null,
// 条码打印抽屉相关
- drawerBarcodeVisible: false,
- drawerBarcodeData: {
- barcodes: [],
- perRow: 3,
- barcodeWidth: 180,
- barcodeHeight: 60
- },
+ // drawerBarcodeVisible: false,
+ // drawerBarcodeData: {
+ // barcodes: [],
+ // perRow: 3,
+ // barcodeWidth: 180,
+ // barcodeHeight: 60
+ // },
};
},
created() {
@@ -438,22 +438,22 @@ export default {
// 刷新列表
this.getList();
},
- async handleShowBarcodeDrawer(row) {
- // 获取明细列表
- const res = await listStockIoDetail({ stockIoId: row.stockIoId });
- const details = res.data || res.rows || [];
- // 拼接条码内容 stockIoId_warehouseId_materialId_quantity
- const barcodes = details.filter(el => el.recordType == 0).map(item => {
- return encodeURIComponent(`${row.stockIoId}_${item.warehouseId || ''}_${item.itemId || ''}_${item.quantity || ''}`);
- });
- this.drawerBarcodeData = {
- barcodes,
- perRow: 3,
- barcodeWidth: 180,
- barcodeHeight: 60
- };
- this.drawerBarcodeVisible = true;
- },
+ // async handleShowBarcodeDrawer(row) {
+ // // 获取明细列表
+ // const res = await listStockIoDetail({ stockIoId: row.stockIoId });
+ // const details = res.data || res.rows || [];
+ // // 拼接条码内容 stockIoId_warehouseId_materialId_quantity
+ // const barcodes = details.filter(el => el.recordType == 0).map(item => {
+ // return encodeURIComponent(`${row.stockIoId}_${item.warehouseId || ''}_${item.itemId || ''}_${item.quantity || ''}`);
+ // });
+ // // this.drawerBarcodeData = {
+ // // barcodes,
+ // // perRow: 3,
+ // // barcodeWidth: 180,
+ // // barcodeHeight: 60
+ // // };
+ // // this.drawerBarcodeVisible = true;
+ // },
getIoTypeTagType(type) {
if (type === 'in') return 'success';
if (type === 'out') return 'primary';
diff --git a/klp-ui/src/views/wms/stockIo/panels/barcode.vue b/klp-ui/src/views/wms/stockIo/panels/barcode.vue
index b12002b7..8574f9d1 100644
--- a/klp-ui/src/views/wms/stockIo/panels/barcode.vue
+++ b/klp-ui/src/views/wms/stockIo/panels/barcode.vue
@@ -12,7 +12,7 @@
-
+
@@ -21,12 +21,9 @@
-
+
-
-
-
@@ -52,13 +49,13 @@
-
+
条码 {{ idx + 1 }}
-
-
+
+
-
+
@@ -156,14 +153,7 @@ export default {
barcodes: {
handler(newVal) {
// 初始化barcodeConfigs
- this.barcodeConfigs = newVal.map((b, i) => {
- const old = this.barcodeConfigs[i] || {};
- return {
- code: b,
- count: old.count || 1,
- textTpl: typeof old.textTpl === 'string' ? old.textTpl : b
- };
- });
+ this.barcodeConfigs = newVal;
this.$nextTick(this.renderPreviewIframe);
},
immediate: true