From da5ba209bafa5e8baa09415e67641c2e370705fb 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: Mon, 26 Aug 2024 19:57:34 +0800
Subject: [PATCH] 08/26

---
 .../ContainerManagement/BuyCtn/columns.tsx    |   9 +
 .../CtnScrap/TenantAuditStepModal.vue         |   2 +-
 .../ContainerManagement/CtnScrap/columns.tsx  |  12 +
 .../ContainerManagement/RentIn/columns.tsx    |  30 ++
 .../RentOneWay/TenantAuditStepModal.vue       | 435 +++++++++---------
 .../ContainerManagement/RentOneWay/api.ts     |  38 ++
 .../ContainerManagement/RentOneWay/index.vue  |  82 ++--
 .../ContainerManagement/RentOut/columns.tsx   |  30 ++
 .../SellCtn/TenantAuditStepModal.vue          |   2 +-
 .../ContainerManagement/SellCtn/columns.tsx   |  15 +-
 10 files changed, 381 insertions(+), 274 deletions(-)

diff --git a/src/views/ContainerManagement/BuyCtn/columns.tsx b/src/views/ContainerManagement/BuyCtn/columns.tsx
index bf2fff61..1487f1f5 100644
--- a/src/views/ContainerManagement/BuyCtn/columns.tsx
+++ b/src/views/ContainerManagement/BuyCtn/columns.tsx
@@ -64,6 +64,12 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
+  {
+    title: '箱型箱量',
+    dataIndex: 'ctntotal',
+    sorter: true,
+    width: 200,
+  },
   {
     title: '已提箱',
     dataIndex: 'pickupCtntotal',
@@ -271,6 +277,9 @@ export const formSchema: FormSchema[] = [
     label: '箱型箱量',
     component: 'Input',
     colProps: { span: 6 },
+    dynamicDisabled: ({}) => {
+      return true
+    },
   },
   {
     field: 'accdate',
diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
index 9907b06b..82365786 100644
--- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     :use-wrapper="true"
-    title="租箱租入维护"
+    title="报废箱维护"
     width="55%"
     @register="registerModal"
     @ok="handleSave"
diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx
index b9719dfc..5b77ab37 100644
--- a/src/views/ContainerManagement/CtnScrap/columns.tsx
+++ b/src/views/ContainerManagement/CtnScrap/columns.tsx
@@ -58,6 +58,18 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
+  {
+    title: '已提箱',
+    dataIndex: 'pickupCtntotal',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '未提箱',
+    dataIndex: 'remainCtntotal',
+    sorter: true,
+    width: 150,
+  },
   {
     title: '业务状态',
     dataIndex: 'billState',
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index 0bf346d9..7e943df0 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -82,6 +82,36 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
+  {
+    title: '箱型箱量',
+    dataIndex: 'ctntotal',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '已提箱',
+    dataIndex: 'pickupCtntotal',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '未提箱',
+    dataIndex: 'remainCtntotal',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '已还箱',
+    dataIndex: 'dropoffCtntotal',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '未还箱',
+    dataIndex: 'dropoffRemainCtntotal',
+    sorter: true,
+    width: 200,
+  },
   {
     title: '原箱主',
     dataIndex: 'oldContainerOwner',
diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index e19c4a74..ee5ee8f5 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -50,7 +50,7 @@
             </hot-table>
           </div>
         </div>
-        <!-- <div class="SearchBox" v-if="TotTableType">
+        <div class="SearchBox">
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -59,7 +59,7 @@
             </a-button>
           </div>
         </div>
-        <div class="HotTable" v-if="TotTableType">
+        <div class="HotTable">
           <div>
             <a-button type="link" @click="ViewTableAdd" class="pl0">
               <span class="iconfont icon-new_document"></span>
@@ -83,7 +83,7 @@
               />
             </hot-table>
           </div>
-        </div> -->
+        </div>
       </a-tab-pane>
       <a-tab-pane key="2" tab="电子文档" :disabled="!rowId">
         <DsFile ref="dsFile" fileType="infoclient" :id="rowId" />
@@ -114,7 +114,7 @@
     </a-tabs>
     <!--右下角按钮-->
     <template #footer>
-      <!-- <a-button
+      <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
         :loading="loading"
@@ -122,8 +122,8 @@
         @click="Confirm()"
       >
         确认执行
-      </a-button> -->
-      <!-- <a-button
+      </a-button>
+      <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
         :loading="loading"
@@ -131,7 +131,7 @@
         @click="Cancel()"
       >
         取消执行
-      </a-button> -->
+      </a-button>
       <a-button
         pre-icon="ant-design:close-outlined"
         type="warning"
@@ -188,10 +188,10 @@
     ApiListDetail,
     ApiDelDetail,
     // ApiMakeFee,
-    // ApiDetailView,
-    // ApiAddCtn,
-    // ApiConfirm,
-    // ApiCancel,
+    ApiDetailView,
+    ApiAddCtn,
+    ApiConfirm,
+    ApiCancel,
   } from './api'
   import { GetClientListByCode } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -211,24 +211,14 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
-    submitFunc: submit,
   })
 
-  const TotTableType = ref(false)
-  async function submit() {
-    const values = await validate()
-    if (values.rentDirectId == 1) {
-      TotTableType.value = true
-    } else {
-      TotTableType.value = false
-    }
-  }
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
     activeKey.value = '1'
-    TotTableType.value = false
+
     // Viewlist.value.splice(0)
     list.value.splice(0)
     if (unref(isUpdate)) {
@@ -241,12 +231,12 @@
         setFieldsValue({
           ...res.data,
         })
-        submit()
+
         GetListDetail()
-        // ViewlallCheck.value = false
-        // ViewlsomeCheck.value = false
-        // handleReset()
-        // GetViewListDetail('[]')
+        ViewlallCheck.value = false
+        ViewlsomeCheck.value = false
+        handleReset()
+        GetViewListDetail('[]')
       }
     } else {
       rowId.value = ''
@@ -254,17 +244,17 @@
     setModalProps({ loading: false })
   })
 
-  // function GetViewListDetail(queryCondition) {
-  //   ApiDetailView({
-  //     queryCondition,
-  //     pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
-  //   }).then((res) => {
-  //     Viewlist.value.splice(0)
-  //     res.data.forEach((item) => {
-  //       Viewlist.value.push(item)
-  //     })
-  //   })
-  // }
+  function GetViewListDetail(queryCondition) {
+    ApiDetailView({
+      queryCondition,
+      pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
+    }).then((res) => {
+      Viewlist.value.splice(0)
+      res.data.forEach((item) => {
+        Viewlist.value.push(item)
+      })
+    })
+  }
   function GetListDetail() {
     ApiListDetail({
       queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
@@ -295,52 +285,52 @@
   //     notification.success({ message: res.message, duration: 3 })
   //   })
   // }
-  // function Confirm() {
-  //   let type: boolean = true
-  //   let ApiData: any = {
-  //     id: rowId.value,
-  //     ids: [],
-  //   }
-  //   list.value.forEach((e: any, i) => {
-  //     if (e.selected) {
-  //       if (e.id) {
-  //         ApiData.ids.push(e.id)
-  //       } else {
-  //         type = false
-  //       }
-  //     }
-  //   })
-  //   if (type) {
-  //     ApiConfirm(ApiData).then((res) => {
-  //       notification.success({ message: res.message, duration: 3 })
-  //     })
-  //   } else {
-  //     notification.success({ message: '请先保存明细表', duration: 3 })
-  //   }
-  // }
-  // function Cancel() {
-  //   let type: boolean = true
-  //   let ApiData: any = {
-  //     id: rowId.value,
-  //     ids: [],
-  //   }
-  //   list.value.forEach((e: any, i) => {
-  //     if (e.selected) {
-  //       if (e.id) {
-  //         ApiData.ids.push(e.id)
-  //       } else {
-  //         type = false
-  //       }
-  //     }
-  //   })
-  //   if (type) {
-  //     ApiCancel(ApiData).then((res) => {
-  //       notification.success({ message: res.message, duration: 3 })
-  //     })
-  //   } else {
-  //     notification.success({ message: '请先保存明细表', duration: 3 })
-  //   }
-  // }
+  function Confirm() {
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
+        }
+      }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+      })
+    } else {
+      notification.success({ message: '请先保存明细表', duration: 3 })
+    }
+  }
+  function Cancel() {
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
+        }
+      }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+      })
+    } else {
+      notification.success({ message: '请先保存明细表', duration: 3 })
+    }
+  }
   async function handleSave(exit) {
     try {
       const values = await validate()
@@ -797,138 +787,136 @@
     }
   }
   //--------------------------------------- tab1 View ---------------------------------------
-  // const [
-  //   registerSearchBoxForm,
-  //   { resetFields: resetSearchBoxFields, validate: validateSearchBox },
-  // ] = useForm({
-  //   labelWidth: 100,
-  //   schemas: formSearchBoxSchema,
-  //   showActionButtonGroup: false,
-  //   submitFunc: submit,
-  // })
-  // const Viewlist = ref<any>([])
-  // // 全部勾选
-  // const ViewlallCheck = ref(false)
+  const [
+    registerSearchBoxForm,
+    { resetFields: resetSearchBoxFields, validate: validateSearchBox },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: formSearchBoxSchema,
+    showActionButtonGroup: false,
+  })
+  const Viewlist = ref<any>([])
+  // 全部勾选
+  const ViewlallCheck = ref(false)
   // 部分勾选
-  // const ViewlsomeCheck = ref(false)
-  // watchEffect(() => {
-  //   // 全选
-  //   if (ViewlallCheck.value) {
-  //     Viewlist.value.forEach((item: any) => {
-  //       item.selected = true
-  //     })
-  //   } else {
-  //     // 取消全选
-  //     Viewlist.value.forEach((item: any) => {
-  //       item.selected = false
-  //     })
-  //   }
-  // })
-  // watch(
-  //   Viewlist.value,
-  //   (val) => {
-  //     let a = 0
-  //     let b = 0
-  //     val.forEach((item: any) => {
-  //       if (item.selected) {
-  //         a += 1
-  //       } else {
-  //         b += 1
-  //       }
-  //     })
-  //     if (a == 0) {
-  //       ViewlallCheck.value = false
-  //     }
-  //     if (b == 0) {
-  //       ViewlallCheck.value = true
-  //     }
-  //     if (a != 0 && b != 0) {
-  //       ViewlsomeCheck.value = true
-  //     } else {
-  //       ViewlsomeCheck.value = false
-  //     }
-  //   },
-  //   {
-  //     deep: true,
-  //   },
-  // )
-  // const Viewsettings = {
-  //   height: '163',
-  //   readOnly: true,
-  //   // autoWrapRow: true,
-  //   // autoWrapCol: true,
-  //   // 每行的高度
-  //   rowHeights: 26,
-  //   fixedColumnsLeft: 1,
-  //   // 需要隐藏的列
-  //   hiddenColumns: {
-  //     columns: [1, 2, 3, 4, 5, 6, 7, 8],
-  //     indicators: true,
-  //   },
-  //   // // 控制回车移动
-  //   // enterMoves: 'row',
-  //   // columnSorting: false,
-  //   // // 如果通过复制或者填写校验出现错误，清空输入框
-  //   // afterValidate: function (isValid, value, row, prop, source) {
-  //   //   if (!isValid) {
-  //   //     hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
-  //   //   }
-  //   // },
-  //   columns: columns,
-  //   // 此行直接复制，必须(非商用)
-  //   licenseKey: 'non-commercial-and-evaluation',
-  //   // // 定义所有单元格发生变化的回调处理
-  //   // async afterChange(changes, source) {},
-  // }
-  // function handleReset() {
-  //   resetSearchBoxFields()
-  //   handleSearch()
-  // }
-  // async function handleSearch() {
-  //   const values = await validateSearchBox()
-  //   console.log(values)
-  //   let ApiData: any = []
-  //   Object.keys(values).forEach((item) => {
-  //     if (values[item]) {
-  //       console.log(values[item].split(','))
+  const ViewlsomeCheck = ref(false)
+  watchEffect(() => {
+    // 全选
+    if (ViewlallCheck.value) {
+      Viewlist.value.forEach((item: any) => {
+        item.selected = true
+      })
+    } else {
+      // 取消全选
+      Viewlist.value.forEach((item: any) => {
+        item.selected = false
+      })
+    }
+  })
+  watch(
+    Viewlist.value,
+    (val) => {
+      let a = 0
+      let b = 0
+      val.forEach((item: any) => {
+        if (item.selected) {
+          a += 1
+        } else {
+          b += 1
+        }
+      })
+      if (a == 0) {
+        ViewlallCheck.value = false
+      }
+      if (b == 0) {
+        ViewlallCheck.value = true
+      }
+      if (a != 0 && b != 0) {
+        ViewlsomeCheck.value = true
+      } else {
+        ViewlsomeCheck.value = false
+      }
+    },
+    {
+      deep: true,
+    },
+  )
+  const Viewsettings = {
+    height: '163',
+    readOnly: true,
+    // autoWrapRow: true,
+    // autoWrapCol: true,
+    // 每行的高度
+    rowHeights: 26,
+    fixedColumnsLeft: 1,
+    // 需要隐藏的列
+    hiddenColumns: {
+      columns: [1, 2, 3, 4, 5, 6, 7, 8],
+      indicators: true,
+    },
+    // // 控制回车移动
+    // enterMoves: 'row',
+    // columnSorting: false,
+    // // 如果通过复制或者填写校验出现错误，清空输入框
+    // afterValidate: function (isValid, value, row, prop, source) {
+    //   if (!isValid) {
+    //     hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
+    //   }
+    // },
+    columns: columns,
+    // 此行直接复制，必须(非商用)
+    licenseKey: 'non-commercial-and-evaluation',
+    // // 定义所有单元格发生变化的回调处理
+    // async afterChange(changes, source) {},
+  }
+  function handleReset() {
+    resetSearchBoxFields()
+    handleSearch()
+  }
+  async function handleSearch() {
+    const values = await validateSearchBox()
+    console.log(values)
+    let ApiData: any = []
+    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 })
-  //       }
-  //     }
-  //   })
-  //   GetViewListDetail(JSON.stringify(ApiData))
-  // }
-  // function ViewTableAdd() {
-  //   let ApiData: any = { id: rowId.value, ids: [] }
-  //   Viewlist.value.forEach((e: any, i) => {
-  //     if (e.selected) {
-  //       ApiData.ids.push(e.id)
-  //     }
-  //   })
-  //   console.log(ApiData.ids)
-  //   if (ApiData.ids.length) {
-  //     ApiAddCtn(ApiData).then(async (res) => {
-  //       if (res.succeeded) {
-  //         const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
-  //         if (res.succeeded) {
-  //           allCheck.value = false
-  //           someCheck.value = false
-  //           ViewlallCheck.value = false
-  //           ViewlsomeCheck.value = false
-  //           submit()
-  //           GetListDetail()
-  //           handleReset()
-  //           GetViewListDetail('[]')
-  //         }
-  //         // getData(false)
-  //         notification.success({ message: res.message, duration: 3 })
-  //       }
-  //     })
-  //   }
-  // }
+        if (item == 'cntrno') {
+          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 })
+        } else {
+          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 })
+        }
+      }
+    })
+    GetViewListDetail(JSON.stringify(ApiData))
+  }
+  function ViewTableAdd() {
+    let ApiData: any = { id: rowId.value, ids: [] }
+    Viewlist.value.forEach((e: any, i) => {
+      if (e.selected) {
+        ApiData.ids.push(e.id)
+      }
+    })
+    console.log(ApiData.ids)
+    if (ApiData.ids.length) {
+      ApiAddCtn(ApiData).then(async (res) => {
+        if (res.succeeded) {
+          const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
+          if (res.succeeded) {
+            allCheck.value = false
+            someCheck.value = false
+            ViewlallCheck.value = false
+            ViewlsomeCheck.value = false
+            GetListDetail()
+            handleReset()
+            GetViewListDetail('[]')
+          }
+          // getData(false)
+          notification.success({ message: res.message, duration: 3 })
+        }
+      })
+    }
+  }
   //--------------------------------------- tab3 ---------------------------------------
   // 应收传到应付的数据
   const broReceiveData = ref([])
@@ -948,13 +936,14 @@
     position: absolute;
     left: 15px;
   }
-  // .SearchBox {
-  //   display: flex;
-  //   .Form {
-  //     flex: 1;
-  //   }
-  //   .mt-4 {
-  //     margin-left: 10px;
-  //   }
-  // }
+  .SearchBox {
+    display: flex;
+    .Form {
+      flex: 1;
+      margin-right: 10px;
+    }
+    .mt-4 {
+      margin-left: 10px;
+    }
+  }
 </style>
diff --git a/src/views/ContainerManagement/RentOneWay/api.ts b/src/views/ContainerManagement/RentOneWay/api.ts
index 319218b7..37040fd6 100644
--- a/src/views/ContainerManagement/RentOneWay/api.ts
+++ b/src/views/ContainerManagement/RentOneWay/api.ts
@@ -11,6 +11,11 @@ enum Api {
   editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail',
   delDetail = '/containerManagementApi/CM_RentOneWay_Detail/DeleteCM_RentOneWay_Detail',
   
+  Confirm = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_Confirm',
+  Cancel = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_Cancel',
+
+  DetailView = '/containerManagementApi/CM_RentOut/CM_RentOut_NeedRent_View',
+  AddCtn = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_AddCtn',
 }
 // 列表 (Auth)
 export function ApiList(data: PageRequest) {
@@ -70,3 +75,36 @@ export function ApiDelDetail(data: PageRequest) {
   })
 }
 
+// _确认 (Auth)
+export function ApiConfirm(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.Confirm,
+    method: 'post',
+    data,
+  })
+}
+// _取消 (Auth)
+export function ApiCancel(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.Cancel,
+    method: 'post',
+    data,
+  })
+}
+
+// 租箱租入明细视图 (Auth)
+export function ApiDetailView(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.DetailView,
+    method: 'post',
+    data,
+  })
+}
+// 租箱租入退租_添加 (Auth)
+export function ApiAddCtn(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.AddCtn,
+    method: 'post',
+    data,
+  })
+}
\ No newline at end of file
diff --git a/src/views/ContainerManagement/RentOneWay/index.vue b/src/views/ContainerManagement/RentOneWay/index.vue
index 90f2cbb1..85e4e069 100644
--- a/src/views/ContainerManagement/RentOneWay/index.vue
+++ b/src/views/ContainerManagement/RentOneWay/index.vue
@@ -17,14 +17,14 @@
             删除
           </a-button>
         </a-popconfirm>
-        <!-- <a-button type="link" @click="Confirm">
+        <a-button type="link" @click="Confirm">
           <span class="iconfont icon-yiwancheng2"></span>
           确认执行
         </a-button>
         <a-button type="link" @click="Cancel">
           <span class="iconfont icon-weiwancheng"></span>
           取消确认
-        </a-button> -->
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -47,11 +47,7 @@
 <script lang="ts" setup>
   import { ref } from 'vue'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import {
-    ApiList,
-    ApiDel,
-    // , ApiConfirm, ApiCancel
-  } from './api'
+  import { ApiList, ApiDel, ApiConfirm, ApiCancel } from './api'
   import { useModal } from '/@/components/Modal'
   import TenantAuditStepModal from './TenantAuditStepModal.vue'
   import { columns, searchFormSchema } from './columns'
@@ -102,42 +98,42 @@
       isUpdate: false,
     })
   }
-  // function Confirm() {
-  //   const select = getSelectRows()
-  //   let ApiData: any = {
-  //     id: '',
-  //     ids: [],
-  //   }
-  //   if (select.length === 0) {
-  //     notification.warning({ message: '请至少选择一条数据', duration: 3 })
-  //     return false
-  //   } else {
-  //     ApiData.ids = select.map((item) => {
-  //       return item.id
-  //     })
-  //   }
-  //   ApiConfirm(ApiData).then((res) => {
-  //     notification.success({ message: res.message, duration: 3 })
-  //   })
-  // }
-  // function Cancel() {
-  //   const select = getSelectRows()
-  //   let ApiData: any = {
-  //     id: '',
-  //     ids: [],
-  //   }
-  //   if (select.length === 0) {
-  //     notification.warning({ message: '请至少选择一条数据', duration: 3 })
-  //     return false
-  //   } else {
-  //     ApiData.ids = select.map((item) => {
-  //       return item.id
-  //     })
-  //   }
-  //   ApiCancel(ApiData).then((res) => {
-  //     notification.success({ message: res.message, duration: 3 })
-  //   })
-  // }
+  function Confirm() {
+    const select = getSelectRows()
+    let ApiData: any = {
+      id: '',
+      ids: [],
+    }
+    if (select.length === 0) {
+      notification.warning({ message: '请至少选择一条数据', duration: 3 })
+      return false
+    } else {
+      ApiData.ids = select.map((item) => {
+        return item.id
+      })
+    }
+    ApiConfirm(ApiData).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+    })
+  }
+  function Cancel() {
+    const select = getSelectRows()
+    let ApiData: any = {
+      id: '',
+      ids: [],
+    }
+    if (select.length === 0) {
+      notification.warning({ message: '请至少选择一条数据', duration: 3 })
+      return false
+    } else {
+      ApiData.ids = select.map((item) => {
+        return item.id
+      })
+    }
+    ApiCancel(ApiData).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+    })
+  }
 
   function handleDel() {
     const select = getSelectRows()
diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx
index 17e47f61..902cf474 100644
--- a/src/views/ContainerManagement/RentOut/columns.tsx
+++ b/src/views/ContainerManagement/RentOut/columns.tsx
@@ -85,6 +85,36 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
+  {
+    title: '箱型箱量',
+    dataIndex: 'ctntotal',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '已提箱',
+    dataIndex: 'pickupCtntotal',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '未提箱',
+    dataIndex: 'remainCtntotal',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '已还箱',
+    dataIndex: 'dropoffCtntotal',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '未还箱',
+    dataIndex: 'dropoffRemainCtntotal',
+    sorter: true,
+    width: 200,
+  },
   {
     title: '租箱客户',
     dataIndex: 'rentCustomerName',
diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 9a15d4b5..21685e0c 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     :use-wrapper="true"
-    title="租箱租入维护"
+    title="卖箱维护"
     width="55%"
     @register="registerModal"
     @ok="handleSave"
diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx
index 64b450b5..6ff3aea7 100644
--- a/src/views/ContainerManagement/SellCtn/columns.tsx
+++ b/src/views/ContainerManagement/SellCtn/columns.tsx
@@ -47,14 +47,14 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '箱型箱量',
-    dataIndex: 'ctntotal',
+    title: '卖箱日期',
+    dataIndex: 'bsdate',
     sorter: true,
     width: 200,
   },
   {
-    title: '卖箱日期',
-    dataIndex: 'bsdate',
+    title: '箱型箱量',
+    dataIndex: 'ctntotal',
     sorter: true,
     width: 200,
   },
@@ -62,13 +62,13 @@ export const columns: BasicColumn[] = [
     title: '已提箱',
     dataIndex: 'pickupCtntotal',
     sorter: true,
-    width: 200,
+    width: 150,
   },
   {
     title: '未提箱',
     dataIndex: 'remainCtntotal',
     sorter: true,
-    width: 200,
+    width: 150,
   },
   {
     title: '业务锁定',
@@ -212,6 +212,9 @@ export const formSchema: FormSchema[] = [
     label: '箱型箱量',
     component: 'Input',
     colProps: { span: 6 },
+    dynamicDisabled: ({}) => {
+      return true
+    },
   },
   {
     field: 'accdate',