From eb111f59ba1947c6e4fd3d4ecca38c3d0a0c7026 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 3 Mar 2025 16:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=A2=E6=88=B7=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=AF=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts               |  8 ++++++--
 src/components/TableForm/src/TableForm.vue      | 10 ++++++----
 .../customerSaleInvoiceRequestMain.data.ts      | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 6979ee147..12d8d1a26 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -263,9 +263,9 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
     if (formSchema.searchPage && formSchema.verificationParams) {
       if (!formSchema.multiple) {
         //获取data.ts参数信息
-        const searchCondition = formSchema?.searchCondition || []
+        let searchCondition = formSchema?.searchCondition || []
         //获取失去焦点参数信息
-        const verificationParams = formSchema?.verificationParams ||
+        let verificationParams = formSchema?.verificationParams ||
           []
         console.log('走新方法啦')
         // searchCondition = [...searchCondition, ...verificationParams]
@@ -276,6 +276,9 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
           const filters: any[] = []
           if (searchCondition && searchCondition.length > 0) {
             // 转换筛选条件所需
+            // 如果searchCondition和verificationParams有重复参数的，已verificationParams为准
+            searchCondition = searchCondition.filter(aItem => verificationParams.every(bItem => aItem.key !== bItem.key));
+
             for (let i = 0; i < searchCondition.length; i++) {
               // searchCondition.forEach((item) => {
               // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
@@ -363,6 +366,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
               }
             }
           }
+          console.log(verificationParams)
           if (verificationParams && verificationParams.length > 0) {
             // 转换筛选条件所需
             for (let i = 0; i < verificationParams.length; i++) {
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 35c8ffc4d..a76a91848 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -394,14 +394,16 @@
     </el-table>
     <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
     <el-pagination
-      v-show="tableData.length > 10"
+      v-show="tableData.length > 1"
       style="margin-top: 10px"
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
+      :page-sizes="[1, 2, 3, 10]"
       :small="true"
       :background="false"
-      layout="total, prev, pager, next, jumper"
+      layout="total, sizes, prev, pager, next, jumper"
       :total="tableData.length"
+      @size-change="showTableData()"
     />
     <div class="button flex" style="padding-top: 10px" v-if="isShowButton || isShowReduceButtonSelection">
       <el-button
@@ -705,9 +707,9 @@ const visibleChange = (field, val, row, index) => {
   emit('visibleChange', field, val, row, index)
 }
 const currentPage = ref(1)
-const pageSize = ref(10)
+const pageSize = ref(2)
 const showTableData = () => {
-  if (props.tableData.length > 10) {
+  if (props.tableData.length > 1) {
     return props.tableData.slice(
       (currentPage.value - 1) * pageSize.value,
       currentPage.value * pageSize.value
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
index b6092b8db..0c0824221 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
@@ -90,6 +90,23 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+          }],
+        verificationPage: CustomerStatementMainApi.getCustomerStatementMainPage,
+        // 失去焦点校验参数
+        verificationParams: [{
+          key: 'status',
+          value: 5,
+          action: '==',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: false,
+        },{
+          key: 'number',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true,
         }]
       }
     },