查询bug修复

src/hooks/web/common.ts

@@ -194,14 +194,26 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = [])
             const orKeys = key.split(':')
             const ConditionalList = { ConditionalList: [] }
             if (params[key]) {
-              orKeys.forEach((item) => {
-                let obj = {
-                  Key: 1,
-                  Value: {
-                    FieldName: item,
-                    FieldValue: params[key],
-                    ConditionalType: 1,
-                  },
+              orKeys.forEach((item, index) => {
+                let obj = []
+                if (index == 0) {
+                  obj = {
+                    Key: 0,
+                    Value: {
+                      FieldName: item,
+                      FieldValue: params[key],
+                      ConditionalType: 1,
+                    },
+                  }
+                } else {
+                  obj = {
+                    Key: 1,
+                    Value: {
+                      FieldName: item,
+                      FieldValue: params[key],
+                      ConditionalType: 1,
+                    },
+                  }
                 }
                 ConditionalList.ConditionalList.push(obj)
               })
@@ -209,7 +221,6 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = [])
             }
           } else {
             let isEqual = false
-
             if (equal.length) {
               isEqual = equal.includes(key)
             }

src/views/approve/paid/components/mainActionBar.vue

@@ -139,7 +139,7 @@
   // 全部审核通过
   const allApprove = () => {
     OneClickAudit({
-      status: 1,
+      result: 1,
       remark: '通过'
     }).then(res => {
       props.reload()

src/views/operation/paidApply/detail/columns.tsx

@@ -585,7 +585,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'accountDate',
     label: '会计期间',
-    component: 'DatePicker',
+    component: 'RangePicker',
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
@@ -595,7 +595,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'etd',
     label: '开船日期',
-    component: 'DatePicker',
+    component: 'RangePicker',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 4 },