From b976de48c1d35e10456eb343374dd4e509dc14c9 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 12 Jul 2024 18:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=EF=BC=8C?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../initialContainerMainRequest/index.vue | 5 ++++-
.../productputaway/productputawayJobMain/index.vue | 3 +++
.../productputawayRecordMain/index.vue | 3 +++
.../productputawayRequestMain/index.vue | 3 +++
.../productreceipt/productreceiptJobMain/index.vue | 3 +++
.../productreceiptscrapJobMain/index.vue | 3 +++
.../productreceiptscrapRecordMain/index.vue | 3 +++
.../productreceiptscrapRequestMain/index.vue | 14 ++++++++++++--
8 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 80a5ba071..6024c640f 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -139,7 +139,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
newRow['toInventoryStatus'] = 'OK'
tableData.value.push(newRow)
})
-
+
}else if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code']
}else {
@@ -487,6 +487,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'INITIAL'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 83e25ee9b..57a431d19 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -260,6 +260,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'predict'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index 9778c239b..c788adcc7 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -170,6 +170,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'predict'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 9cfa44045..997469e15 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -426,6 +426,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'predict'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 209c2b91b..b9a0ae9fa 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -364,6 +364,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'predict'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index ce5ab9968..7a96fc26d 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -301,6 +301,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'scrap'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index e5f369ecc..e9a0eb4cd 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -213,6 +213,9 @@ const searchFormClick = (searchData) => {
'action':'==',
'value':'scrap'
}
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index c053bb4b0..811f90d25 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -115,7 +115,7 @@
-
@@ -169,7 +169,7 @@ const buttondataTable = ref([{
const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
const isCreateLabel = ref(false)
const formLabelRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等
+const labelType = ref('') // 标签类别 采购还是制造等
const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap
})
@@ -637,6 +637,16 @@ const importSuccess = () => {
// 筛选提交
const searchFormClick = (searchData) => {
+
+ if (!Array.isArray(searchData.filters)) {
+ searchData.filters = [];
+ }
+ const cmd = {
+ 'column':'type',
+ 'action':'==',
+ 'value':'scrap'
+ };
+ searchData.filters.push(cmd);
tableObject.params = {
isSearch: true,
filters: searchData.filters