From a0043c9366ac9125603871fc2310912cf8bd609d Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Thu, 10 Oct 2024 10:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=99=A8=E5=85=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerMainRequest/index.vue             | 11 ++++++++++-
 .../containerRecordMain/index.vue              | 16 +++++++++++++---
 .../initialContainerMainRequest/index.vue      |  9 ++++++++-
 .../scrapContainerMainRequest/index.vue        | 18 +++++++++++++++++-
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index b57594389..3f81139fe 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="searchList" @reset="setSearchParams" />
+    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -567,6 +567,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index 3a89bf209..d005e11a3 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -86,7 +86,7 @@ routeName.value = route.name
 const businessType = ref()
 const importFileName = ref()
 const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
-
+const searchType = ref()
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
@@ -99,18 +99,21 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'RETURN'
   }
+   searchType.value = 'RETURN'
   businessType.value = 'ReturnContainerManage'
   importFileName.value = '器具返回记录'
 } else if ( routeName.value == 'MoveContainerManageRecord') {
   tableObject.params = {
     type:'MOVE'
   }
+   searchType.value = 'MOVE'
   businessType.value = 'MoveContainerManage'
   importFileName.value = '器具转移记录'
 } else if ( routeName.value == 'InitialContainerManageRecord') {
   tableObject.params = {
     type:'INITIAL',
   }
+   searchType.value = 'INITIAL'
   businessType.value = 'InitialContainerManage'
   importFileName.value = '器具初始化记录'
 }
@@ -118,12 +121,14 @@ else if ( routeName.value == 'ScrapContainerManageRecord') {
   tableObject.params = {
     type:'SCRAP'
   }
+   searchType.value = 'SCRAP'
   businessType.value = 'ScrapContainerManage'
   importFileName.value = '器具报废记录'
 } else if ( routeName.value == 'DeliverContainerManageRecord') {
   tableObject.params = {
     type: 'DELIVER',
   }
+   searchType.value = 'DELIVER'
   businessType.value = 'DeliverContainerManage'
   importFileName.value = '器具发运记录'
 } else if( routeName.value == 'ContainerManageRecord'){
@@ -157,6 +162,11 @@ const HeadButttondata = [
   // },
 ]
 
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -248,7 +258,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':'INITIAL'
+    'value':searchType.value
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 7458d4eac..f84f80485 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -108,6 +108,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ContainerMainRequest.allSchemas.tableColumns)
 console.log(99 ,  routeName.value)
+const searchType = ref()
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerDetailRequestApi.getContainerDetailRequestPage // 分页接口
 })
@@ -120,6 +121,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'INITIAL',
   }
+   searchType.value = 'INITIAL'
   ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
     if(item.field == 'type'){
         item.value = "INITIAL"
@@ -162,6 +164,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   })
 }
 
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 48289d112..d66fec63d 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -111,6 +111,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ContainerMainRequest.allSchemas.tableColumns)
 console.log(99 ,  routeName.value)
+const searchType = ref()
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerDetailRequestApi.getContainerDetailRequestPage // 分页接口
 })
@@ -122,6 +123,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'SCRAP'
   }
+   searchType.value = 'SCRAP'
   ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
     if(item.field == 'type'){
         item.value = "SCRAP"
@@ -130,6 +132,11 @@ const { tableObject, tableMethods } = useTable({
   importFileName.value = '器具报废申请'
 }
 
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
 //定义  展示子表数据时是否显示新增/修改/删除按钮
 const trueFalse = ref(false)
 // 查询页面返回
@@ -529,6 +536,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters