From 5551179f7df261202944958632981bd0c1465e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 26 Nov 2024 15:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E5=B9=B6=E8=A1=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerReconciliation/index.vue          | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue
index 2b0584ce..087a86bf 100644
--- a/src/views/operation/CustomerReconciliation/index.vue
+++ b/src/views/operation/CustomerReconciliation/index.vue
@@ -199,6 +199,7 @@
         ]
         var currentPageInfo: any = getPaginationRef()
         let otherQueryCondition: any = []
+        let ConditionalList: any = []
         let queryCondition: any = []
         let postParam: API.PageRequest = {
           queryCondition: '[]',
@@ -212,7 +213,7 @@
 
         for (let key in p) {
           Arr.forEach((item) => {
-            if ((key.includes(':') && key.includes(item) && p[key]) || (key == item && p[key])) {
+            if (key.includes(':') && key.includes(item) && p[key]) {
               // billNo
               if (item == 'billNo') {
                 queryCondition.push({
@@ -221,15 +222,38 @@
                   ConditionalType: 1,
                 })
               } else {
-                otherQueryCondition.push({
-                  FieldName: item,
-                  FieldValue: p[key],
-                  ConditionalType: 1,
+                // if (ConditionalList.length) {
+                //   ConditionalList.push({
+                //     Key: 1,
+                //     Value: {
+                //       FieldName: item,
+                //       FieldValue: p[key],
+                //       ConditionalType: 1,
+                //     },
+                //   })
+                // } else {
+                ConditionalList.push({
+                  Key: 1,
+                  Value: {
+                    FieldName: item,
+                    FieldValue: p[key],
+                    ConditionalType: 1,
+                  },
                 })
+                // }
               }
+            } else if (key == item && p[key]) {
+              otherQueryCondition.push({
+                FieldName: item,
+                FieldValue: p[key],
+                ConditionalType: 1,
+              })
             }
           })
         }
+        console.log(otherQueryCondition)
+
+        otherQueryCondition.push({ ConditionalList })
         postParam.otherQueryCondition = JSON.stringify(otherQueryCondition)
         postParam.queryCondition = JSON.stringify(queryCondition)
         return postParam