From a3d77c4b5390ee729e186e71a91316914e8ff820 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 15 Jun 2024 14:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue        |  7 ++++++-
 src/components/SearchTable/src/SearchTable.vue    | 15 +++++++++++----
 .../supplierinvoiceRequestMain/index.vue          |  1 +
 .../supplierinvoiceRequestMain.data.ts            | 10 +++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 07ef4a755..e03a33ada 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -121,7 +121,7 @@
     </template>
   
   </Dialog>
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
 </template>
 <script setup lang="ts">
 import { SearchTable } from '@/components/SearchTable'
@@ -309,6 +309,11 @@ const props = defineProps({
     type:Function,
     required: false,
     default: null
+  },
+  showSearchTableQueryFields:{
+    type: Array,
+    required: false,
+    default: []
   }
 })
 
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 77a946718..edbac8a4a 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -1,9 +1,9 @@
 <template>
   <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth" >
     <!-- 搜索工作栏 -->
-    <!-- <ContentWrap>
+    <ContentWrap v-if="searchQuery">
       <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
-    </ContentWrap> -->
+    </ContentWrap>
 
     <!-- 列表头部 -->
     <TableHead
@@ -44,7 +44,13 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+const props = defineProps({
+  showSearchTableQueryFields:{
+    type: Array,
+    required: false,
+    default: []
+  }
+})
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -83,7 +89,7 @@ const rowRef = ref()
 const allSchemasRef = ref()
 const searchConditionRef = ref()
 const searchTableSelectionsList = ref()//表格弹窗回显的列表
-
+const searchQuery = ref(false)
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
   dialogWidth.value = '80%'
   multipleBol.value = multiple
@@ -103,6 +109,7 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
   tableColumns.value = allSchemas.tableColumns
 }
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => {
+  searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false
   dialogWidth.value = '80%'
   multipleBol.value = multiple
   HeadButttondata.value = multiple?[
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 42e996365..8f7b5ae4c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -46,6 +46,7 @@
     @success="getList" 
     :isOpenSearchTable="true"
     fieldTableColumn="poLine"
+    :showSearchTableQueryFields = "['poLine']"
     :rules="SupplierinvoiceRequestMainRules"
     :formAllSchemas="SupplierinvoiceRequestMain.allSchemas" 
     :searchTableParams="searchTableParams"
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 4f46bbcdf..78ef77b1d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -64,6 +64,14 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     label: '单据类型',
     field: 'billType'
   },
+  {
+    label: '收货日期',
+    field: 'deliveryDate',
+    isSearch: true,
+    table: {
+      width: 180,
+    },
+  },
   {
     label: '待开票单据号',
     field: 'recvBillNum',
@@ -1133,7 +1141,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   //仅是主列表页面的筛选搜索条件
   {
     label: '到货时间',
-    field: 'planArriveTime',
+    field: 'deliveryDate',
     sort: 'custom',
     isDetail:false,
     isTable: false,