Merge branch 'zth' into dev

src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue

@@ -43,14 +43,15 @@
           </div>
         </div>
         <div class="SearchBox">
-          <BasicForm class="Form" @register="registerSearchBoxForm" :disabledDate="disabledDate" />
+          <div class="Form"></div>
+          <!-- <BasicForm class="Form" @register="registerSearchBoxForm" :disabledDate="disabledDate" /> -->
           <div class="ButtonBox">
-            <a-button size="default" @click="handleReset" :disabled="!rowId"> 重置 </a-button>
+            <!-- <a-button size="default" @click="handleReset" :disabled="!rowId"> 重置 </a-button> -->
             <a-button
               type="primary"
               size="default"
               class="mt-4"
-              @click="handleSearch"
+              @click="GetViewListDetail(null)"
               :disabled="!rowId"
             >
               查询
@@ -83,10 +84,20 @@
           </div>
         </div>
       </a-tab-pane>
-      <a-tab-pane key="2" tab="电子文档" :disabled="!rowId">
+      <a-tab-pane key="2" tab="按日明细" :disabled="!rowId">
+        <hot-table ref="hotTb" :data="Tab2list" :settings="Tab2settings">
+          <img
+            v-show="!Tab2list.length"
+            class="hot-tb-no-data"
+            src="../../../assets/images/nodata.png"
+            alt=""
+          />
+        </hot-table>
+      </a-tab-pane>
+      <a-tab-pane key="3" tab="电子文档" :disabled="!rowId">
         <DsFile ref="dsFile" fileType="infoclient" :id="rowId" />
       </a-tab-pane>
-      <a-tab-pane key="3" tab="费用" :disabled="!rowId">
+      <a-tab-pane key="4" tab="费用" :disabled="!rowId">
         <div class="fee-card-box mt15">
           <FeeTable
             tbType="receive"
@@ -170,8 +181,7 @@
     ApiMakeFee,
     ApiDetailView,
     ApiAddCtn,
-    ApiConfirm,
+    ApiCalendarList,
-    ApiCancel,
   } from './api'
   import { GetClientListByCode } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -217,7 +227,8 @@
         ViewlallCheck.value = false
         ViewlsomeCheck.value = false
         resetSearchBoxFields()
-        GetViewListDetail(null, res.data)
+        GetViewListDetail(res.data)
+        GetTab2List()
       }
     } else {
       setFieldsValue({})
@@ -227,9 +238,7 @@
     setModalProps({ loading: false })
   })
 
-  function GetViewListDetail(data, resData) {
+  function GetViewListDetail(resData) {
-    console.log(data, resData)
-
     let queryCondition: any = []
 
     if (getFieldsValue().customerId || resData.customerId) {
@@ -272,18 +281,29 @@
         ],
       })
     }
-
+    if (getFieldsValue().billEndDate || resData.billEndDate) {
-    if (data) {
+      queryCondition.push({
-      data.forEach((item) => {
+        FieldName: 'feestartdate',
-        queryCondition.push(item)
+        FieldValue: getFieldsValue().billEndDate || resData.billEndDate,
+        ConditionalType: 5,
       })
     }
     ApiDetailView({
       queryCondition: JSON.stringify(queryCondition),
       pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
     }).then((res) => {
+      // Viewlist.value.splice(0)
+      // res.data.forEach((item) => {
+      //   Viewlist.value.push(item)
+      // })
       Viewlist.value.splice(0)
+      let Arr = ['feeStartDate', 'dropoffDate', 'billEndDate', 'bsdate']
       res.data.forEach((item) => {
+        Arr.forEach((e) => {
+          if (item[e]) {
+            item[e] = item[e].split(' ')[0]
+          }
+        })
         Viewlist.value.push(item)
       })
     })
@@ -301,7 +321,7 @@
       // })
       // ------------------
       list.value.splice(0)
-      let Arr = ['pickupDate', 'dropoffDate', 'feeStartDate', 'bsdate']
+      let Arr = ['feeStartDate', 'billStartDate', 'billEndDate']
       res.data.forEach((item) => {
         Arr.forEach((e) => {
           if (item[e]) {
@@ -752,7 +772,7 @@
     {
       title: '租箱日期',
       width: 120,
-      data: 'feeStartDate',
+      data: 'bsdate',
     },
     {
       title: '开始计费日期',
@@ -820,7 +840,7 @@
     fixedColumnsLeft: 1,
     // 需要隐藏的列
     hiddenColumns: {
-      columns: [1, 2, 3, 4, 5, 6, 7, 8],
+      columns: [1, 2],
       indicators: true,
     },
     // // 控制回车移动
@@ -840,20 +860,9 @@
   }
   function handleReset() {
     resetSearchBoxFields()
-    handleSearch()
+    GetViewListDetail(null)
-  }
-  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(','))
-        ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 5 })
-      }
-    })
-    GetViewListDetail(ApiData, null)
   }
+
   function ViewTableAdd() {
     let ApiData: any = { id: rowId.value, ids: [] }
     Viewlist.value.forEach((e: any, i) => {
@@ -873,7 +882,7 @@
             ViewlsomeCheck.value = false
             GetListDetail()
             resetSearchBoxFields()
-            GetViewListDetail(null, null)
+            GetViewListDetail(null)
           }
           // getData(false)
           notification.success({ message: res.message, duration: 3 })
@@ -881,6 +890,109 @@
       })
     }
   }
+  //--------------------------------------- tab2 ---------------------------------------
+  const Tab2list = ref<any>([])
+  const Tab2columns = [
+    {
+      data: 'selected',
+      type: 'checkbox',
+      title: ' ',
+      width: 32,
+      className: 'htCenter',
+      readOnly: false,
+    },
+    // -----------------
+    {
+      title: '主键Id',
+      width: 200,
+      data: 'id',
+    },
+    {
+      title: '租箱业务id',
+      width: 200,
+      data: 'pid',
+    },
+    // -----------------
+    {
+      title: '箱号',
+      width: 120,
+      data: 'cntrno',
+    },
+    {
+      title: '箱型',
+      width: 120,
+      data: 'ctnall',
+    },
+    {
+      title: '起租日',
+      width: 120,
+      data: 'feeStartDate',
+    },
+    {
+      title: '结算日期',
+      width: 120,
+      data: 'feeDate',
+    },
+    {
+      title: '币别',
+      width: 120,
+      data: 'currency',
+    },
+    {
+      title: '日租金',
+      width: 120,
+      data: 'dailyRate',
+    },
+  ]
+  const Tab2settings = {
+    height: '163',
+    readOnly: true,
+    // autoWrapRow: true,
+    // autoWrapCol: true,
+    // 每行的高度
+    rowHeights: 26,
+    fixedColumnsLeft: 1,
+    // 需要隐藏的列
+    hiddenColumns: {
+      columns: [1, 2],
+      indicators: true,
+    },
+    // // 控制回车移动
+    // enterMoves: 'row',
+    // columnSorting: false,
+    // // 如果通过复制或者填写校验出现错误，清空输入框
+    // afterValidate: function (isValid, value, row, prop, source) {
+    //   if (!isValid) {
+    //     hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
+    //   }
+    // },
+    columns: Tab2columns,
+    // 此行直接复制，必须(非商用)
+    licenseKey: 'non-commercial-and-evaluation',
+    // // 定义所有单元格发生变化的回调处理
+    // async afterChange(changes, source) {},
+  }
+  function GetTab2List() {
+    ApiCalendarList({
+      queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
+      pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
+    }).then((res) => {
+      // Tab2list.value.splice(0)
+      // res.data.forEach((item) => {
+      //   Tab2list.value.push(item)
+      // })
+      Tab2list.value.splice(0)
+      let Arr = ['feeStartDate', 'feeDate']
+      res.data.forEach((item) => {
+        Arr.forEach((e) => {
+          if (item[e]) {
+            item[e] = item[e].split(' ')[0]
+          }
+        })
+        Tab2list.value.push(item)
+      })
+    })
+  }
   //--------------------------------------- tab3 ---------------------------------------
   // 应收传到应付的数据
   const broReceiveData = ref([])

src/views/ContainerManagement/CustFeeDui/api.ts

@@ -17,7 +17,18 @@ enum Api {
   
   DetailView = '/containerManagementApi/CM_CustFeeDui/GetVW_CM_FeeBase_Detail',
   AddCtn = '/containerManagementApi/CM_CustFeeDui/AddVW_CM_FeeBase_Detail',
+
+  CalendarList = '/containerManagementApi/CM_CustFeeDui_Calendar/GetCM_CustFeeDui_CalendarList',
+  
   
+}
+// 列表 (Auth)
+export function ApiCalendarList(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.CalendarList,
+    method: 'post',
+    data,
+  })
 }
 // 租箱租入明细视图 (Auth)
 export function ApiDetailView(data: PageRequest) {
@@ -43,22 +54,7 @@ export function ApiMakeFee(data: PageRequest) {
     data,
   })
 }
-// 租箱租入_确认 (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 ApiList(data: PageRequest) {
   return request<DataResult>({

src/views/ContainerManagement/asd.json

@@ -1,103 +1,42 @@
 {
-  "id": "1823192191728750592",
+  "queryCondition": [
-  "businessType": 101,
-  "rentDirectId": 0,
-  "rentTypeId": 1,
-  "billState": null,
-  "oldContainerOwnerId": "1790269205392789504",
-  "oldContainerOwner": "青岛东胜",
-  "bsdate": "2024-08-13 00:00:00",
-  "accdate": "2024-11",
-  "isBusinessLocking": false,
-  "isFeeLocking": false,
-  "remark": "测试租入1",
-  "bodyList": [
     {
-      "id": "1823193258684190720",
+      "ConditionalList": [
-      "pid": "1823192191728750592",
+        {
-      "cntrno": "RENTIN002",
+          "Key": 0,
-      "ctnCode": "22G0",
+          "Value": {
-      "ctnall": "20GP",
+            "FieldName": "oldContainerOwnerId",
-      "oldContainerOwnerId": "1790269205392789504",
+            "FieldValue": "1790269205392789504",
-      "oldContainerOwner": null,
+            "ConditionalType": 0
-      "rentDirectId": 0,
+          }
-      "rentDirect": "租入",
+        },
-      "rentTypeId": 1,
+        {
-      "rentType": "长租",
+          "Key": 1,
-      "ctnReleaseNo": "releaseno001",
+          "Value": {
-      "bsdate": "2024-08-13 06:03:27",
+            "FieldName": "rentCustomerId",
-      "feeStartDate": "2024-08-13",
+            "FieldValue": "1790269205392789504",
-      "currency": "USD",
+            "ConditionalType": 0
-      "dailyRate": 0,
+          }
-      "pickupFee": 0,
+        }
-      "pickupDate": "2024-08-05",
+      ]
-      "dropoffFee": 0,
-      "dropoffDate": "2024-08-06",
-      "pickupPortid": "1816307156580962304",
-      "pickupPortCode": "AUSYD",
-      "pickupPort": "SYDNEY, AUSTRALIA",
-      "dropoffPortid": "1795717773662490624",
-      "dropoffPortCode": "1212",
-      "dropoffPort": "Test001",
-      "mblno": "2214",
-      "vehicleName": "2214",
-      "rentDetailId": "",
-      "selected": false
     },
+    { "FieldName": "feestartdate", "FieldValue": "2024-08-16", "ConditionalType": 5 },
     {
-      "id": "1823192516082667520",
+      "ConditionalList": [
-      "pid": "1823192191728750592",
+        {
-      "cntrno": "RENTIN001",
+          "Key": 0,
-      "ctnCode": "22G0",
+          "Value": { "FieldName": "dropoffdate", "FieldValue": "null", "ConditionalType": 0 }
-      "ctnall": "20GP",
+        },
-      "oldContainerOwnerId": "1790269205392789504",
+        {
-      "oldContainerOwner": null,
+          "Key": 1,
-      "rentDirectId": 0,
+          "Value": { "FieldName": "dropoffdate", "FieldValue": "2024-08-15", "ConditionalType": 3 }
-      "rentDirect": "租入",
+        }
-      "rentTypeId": 1,
+      ]
-      "rentType": "长租",
-      "ctnReleaseNo": "releaseno001",
-      "bsdate": "2024-08-13",
-      "feeStartDate": "2024-08-01 00:00:00",
-      "currency": "美元",
-      "dailyRate": 2,
-      "pickupFee": 10,
-      "pickupDate": "2024-08-01 00:00:00",
-      "dropoffFee": 10,
-      "dropoffDate": "2024-08-02",
-      "pickupPortid": "1816306937097228288",
-      "pickupPortCode": "CNTAO",
-      "pickupPort": "QINGDAO,CHINA",
-      "dropoffPortid": "1816306937097228288",
-      "dropoffPortCode": "CNTAO",
-      "dropoffPort": "QINGDAO,CHINA",
-      "mblno": "MBLNO0001",
-      "vehicleName": "船名/航次RentIn1",
-      "rentDetailId": "",
-      "selected": false
-    },
-    {
-      "selected": false,
-      "pickupDate": "2024-08-13",
-      "dropoffDate": "2024-08-13",
-      "feeStartDate": "2024-08-13",
-      "bsdate": "2024-08-13",
-      "cntrno": "RENTIN002",
-      "ctnall": "20RF",
-      "ctnCode": "22R0",
-      "ctnReleaseNo": "releaseno001",
-      "currency": "日元",
-      "dailyRate": 2,
-      "pickupFee": 10,
-      "dropoffFee": 10,
-      "dropoffPort": "CALLAO",
-      "dropoffPortid": "1763399503139966976",
-      "dropoffPortCode": "2123",
-      "mblno": "MBLNO0001",
-      "vehicleName": "2214",
-      "pickupPort": "Test001",
-      "pickupPortid": "1795717773662490624",
-      "pickupPortCode": "1212"
     }
-  ]
+  ],
+  "pageCondition": {
+    "pageIndex": 1,
+    "pageSize": 999,
+    "sortConditions": []
+  }
 }