diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index 0f6773ab..a2bad29d 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -15,6 +15,9 @@
+
+
+
搜索
重置
@@ -363,6 +366,15 @@ export default {
this.loading = false;
});
},
+ switchActionStatus(value) {
+ console.log(value)
+ if (!value) {
+ this.queryParams.actionStatus = null;
+ } else {
+ this.queryParams.actionStatus = 0;
+ }
+ this.getList()
+ },
// 取消按钮
cancel() {
this.open = false;
diff --git a/klp-ui/src/views/wms/coil/index.vue b/klp-ui/src/views/wms/coil/index.vue
index 3c4d46ea..da51480b 100644
--- a/klp-ui/src/views/wms/coil/index.vue
+++ b/klp-ui/src/views/wms/coil/index.vue
@@ -14,7 +14,8 @@ export default {
qrcode: true,
querys: {
dataType: 1,
- itemType: 'raw_material'
+ // itemType: 'raw_material'
+ materialType: '原料'
},
labelType: '2',
hideType: true
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 4cb29bd6..a3727dcc 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -73,6 +73,11 @@
+
@@ -450,7 +455,8 @@ export default {
createTime: undefined,
createBy: undefined,
updateTime: undefined,
- updateBy: undefined
+ updateBy: undefined,
+ materialType: '原料',
};
this.resetForm("form");
},
diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue
index 85defb1f..1b0f8033 100644
--- a/klp-ui/src/views/wms/coil/product.vue
+++ b/klp-ui/src/views/wms/coil/product.vue
@@ -13,8 +13,9 @@ export default {
return {
qrcode: false,
querys: {
- itemType: 'product',
- dataType: 1
+ // itemType: 'product',
+ dataType: 1,
+ materialType: '产品'
},
labelType: '3',
showStatus: true,
diff --git a/klp-ui/src/views/wms/coil/rubbish.vue b/klp-ui/src/views/wms/coil/rubbish.vue
index abbaf8d6..fea43c8c 100644
--- a/klp-ui/src/views/wms/coil/rubbish.vue
+++ b/klp-ui/src/views/wms/coil/rubbish.vue
@@ -14,8 +14,9 @@ export default {
qrcode: false,
querys: {
// itemType: 'rubbish',
- // dataType: 2
- warehouseId: 111,
+ dataType: 1,
+ materialType: '废品'
+ // warehouseId: 111,
},
hideWarehouseQuery: true,
labelType: '3',