diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
index 4875ff62..8ef4eb4d 100644
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@@ -43,7 +43,7 @@
           </div>
         </div>
         <div class="SearchBox">
-          <BasicForm class="Form" @register="registerSearchBoxForm" />
+          <BasicForm class="Form" @register="registerSearchBoxForm" :disabledDate="disabledDate" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset" :disabled="!rowId"> 重置 </a-button>
             <a-button
@@ -178,7 +178,7 @@
   const loading = ref(false)
   const rowId = ref('')
   const height = ref(300)
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, getFieldsValue, validate }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -192,6 +192,7 @@
 
     Viewlist.value.splice(0)
     list.value.splice(0)
+
     if (unref(isUpdate)) {
       // setModalProps({ confirmLoading: true });
       rowId.value = data.record.id
@@ -199,8 +200,6 @@
       if (res.succeeded) {
         allCheck.value = false
         someCheck.value = false
-        console.log(res.data)
-
         setFieldsValue({
           ...res.data,
         })
@@ -209,19 +208,69 @@
         ViewlallCheck.value = false
         ViewlsomeCheck.value = false
         resetSearchBoxFields()
-        GetViewListDetail(
-          `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
-        )
+        GetViewListDetail(null, res.data)
       }
     } else {
+      setFieldsValue({})
       rowId.value = ''
     }
+
     setModalProps({ loading: false })
   })
 
-  function GetViewListDetail(queryCondition) {
+  function GetViewListDetail(data, resData) {
+    console.log(data, resData)
+
+    let queryCondition: any = []
+
+    if (getFieldsValue().customerId || resData.customerId) {
+      queryCondition.push({
+        ConditionalList: [
+          {
+            Key: 0,
+            Value: {
+              FieldName: 'oldContainerOwnerId',
+              FieldValue: getFieldsValue().customerId || resData.customerId,
+              ConditionalType: 0,
+            },
+          },
+          {
+            Key: 1,
+            Value: {
+              FieldName: 'rentCustomerId',
+              FieldValue: getFieldsValue().customerId || resData.customerId,
+              ConditionalType: 0,
+            },
+          },
+        ],
+      })
+    }
+    if (getFieldsValue().billStartDate || resData.billStartDate) {
+      queryCondition.push({
+        ConditionalList: [
+          {
+            Key: 0,
+            Value: { FieldName: 'dropoffdate', FieldValue: 'null', ConditionalType: 0 },
+          },
+          {
+            Key: 1,
+            Value: {
+              FieldName: 'dropoffdate',
+              FieldValue: getFieldsValue().billStartDate || resData.billStartDate,
+              ConditionalType: 3,
+            },
+          },
+        ],
+      })
+    }
+
+    if (data) {
+      data.forEach((item) => {
+        queryCondition.push(item)
+      })
+    }
     ApiDetailView({
-      queryCondition,
+      queryCondition: JSON.stringify(queryCondition),
       pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
     }).then((res) => {
       Viewlist.value.splice(0)
@@ -245,7 +294,6 @@
       list.value.splice(0)
       let Arr = ['pickupDate', 'dropoffDate', 'feeStartDate', 'bsdate']
       res.data.forEach((item) => {
-        console.log(item)
         Arr.forEach((e) => {
           if (item[e]) {
             item[e] = item[e].split(' ')[0]
@@ -579,6 +627,8 @@
     }
   }
   //--------------------------------------- tab1 View ---------------------------------------
+  const disabledDate = ref(['2024/08/10', '2024/08/20'])
+
   const [
     registerSearchBoxForm,
     { resetFields: resetSearchBoxFields, validate: validateSearchBox },
@@ -785,15 +835,10 @@
     Object.keys(values).forEach((item) => {
       if (values[item]) {
         console.log(values[item].split(','))
-
-        if (item == 'cntrno') {
-          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 })
-        } else {
-          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 })
-        }
+        ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 5 })
       }
     })
-    GetViewListDetail(JSON.stringify(ApiData))
+    GetViewListDetail(ApiData, null)
   }
   function ViewTableAdd() {
     let ApiData: any = { id: rowId.value, ids: [] }
@@ -814,9 +859,7 @@
             ViewlsomeCheck.value = false
             GetListDetail()
             resetSearchBoxFields()
-            GetViewListDetail(
-              `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
-            )
+            GetViewListDetail(null, null)
           }
           // getData(false)
           notification.success({ message: res.message, duration: 3 })
diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx
index 82855ee1..e8268c7b 100644
--- a/src/views/ContainerManagement/CustFeeDui/columns.tsx
+++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx
@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
+import dayjs from 'dayjs'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
 import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger'
 import { useOptionsStore } from '/@/store/modules/options'
@@ -24,6 +25,7 @@ const usedStateList = [
     value: 'new',
   },
 ]
+const billEndDate = ref()
 // 业务类型字典
 const businessTypeDict = ref([])
 getDictOption('CM_BusinessType').then((res) => {
@@ -101,8 +103,26 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '费用状态？？',
-    dataIndex: 'billno',
+    title: '应收费用状态',
+    dataIndex: 'arFeeStatusName',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '应付费用状态',
+    dataIndex: 'apFeeStatusName',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '应收开票状态',
+    dataIndex: 'arInvoiceStatusName',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '应付开票状态',
+    dataIndex: 'apInvoiceStatusName',
     sorter: true,
     width: 150,
   },
@@ -276,12 +296,27 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 6 },
     defaultValue: '',
     required: true,
-    componentProps: {
-      showTime: false,
-      allowClear: true,
-      valueFormat: 'YYYY-MM-DD',
-      format: 'YYYY-MM-DD',
-      style: 'width:100%',
+
+    componentProps: ({ formModel }) => {
+      return {
+        showTime: false,
+        allowClear: true,
+        valueFormat: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD',
+        style: 'width:100%',
+        onChange: (e, obj) => {
+          if (e && obj) {
+            setTimeout(() => {
+              billEndDate.value = formModel.billEndDate
+            }, 100)
+          }
+          if (!obj && !e) {
+            setTimeout(() => {
+              billEndDate.value = ''
+            }, 100)
+          }
+        },
+      }
     },
   },
   {
@@ -344,30 +379,6 @@ export const formSchema: FormSchema[] = [
 ]
 
 export const formSearchBoxSchema: FormSchema[] = [
-  {
-    field: 'ctnBizstateId',
-    label: '业务信息',
-    component: 'ApiSelect',
-    required: false,
-
-    colProps: { span: 6 },
-    componentProps: ({ formModel }) => {
-      return {
-        allowClear: true,
-        showSearch: true,
-        api: GetClientListByCode,
-        params: { code: 'leasing' },
-        labelField: 'pinYinCode',
-        showName: 'shortName',
-        valueField: 'shortName',
-        resultField: 'data',
-        immediate: false,
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-      }
-    },
-  },
   {
     field: 'feestartdate',
     label: '按日明细',
@@ -380,6 +391,9 @@ export const formSearchBoxSchema: FormSchema[] = [
       valueFormat: 'YYYY-MM-DD',
       format: 'YYYY-MM-DD',
       style: 'width:100%',
+      disabledDate: (current) => {
+        return current && current <= dayjs(billEndDate.value).subtract(0, 'day')
+      },
     },
   },
 ]