箱管 调整

src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue

@@ -362,6 +362,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue

@@ -373,6 +373,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -375,6 +375,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue

@@ -362,6 +362,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue

@@ -164,7 +164,7 @@
   import {
     ApiEdit,
     ApiInfo,
-    // ApiListDetail,
+    ApiListDetail,
     ApiDelDetail,
     // // ApiMakeFee,
     // ApiDetailView,
@@ -211,17 +211,38 @@
         setFieldsValue({
           ...res.data,
         })
-        if (res.data.bodyList) {
+        GetListDetail()
-          res.data.bodyList.forEach((item) => {
-            list.value.push(item)
-          })
-        }
       }
     } else {
       rowId.value = ''
     }
     setModalProps({ loading: false })
   })
+  function GetListDetail() {
+    ApiListDetail({
+      queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
+      pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
+    }).then((res) => {
+      // console.log(res)
+
+      // list.value.splice(0)
+      // res.data.forEach((item) => {
+      //   list.value.push(item)
+      // })
+      // ------------------
+      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]
+          }
+        })
+        list.value.push(item)
+      })
+    })
+  }
   // function MakeFee() {
   //   ApiMakeFee({ id: rowId.value }).then((res) => {
   //     notification.success({ message: res.message, duration: 3 })
@@ -288,6 +309,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })
@@ -355,11 +377,7 @@
       await setFieldsValue({
         ...res.data,
       })
-      if (res.data.bodyList) {
+      GetListDetail()
-        res.data.bodyList.forEach((item) => {
-          list.value.push(item)
-        })
-      }
     }
   }
   const activeKey = ref('1')

src/views/ContainerManagement/RentOneWayIn/api.ts

@@ -7,8 +7,8 @@ enum Api {
   info = '/containerManagementApi/CM_RentOneWay_In/GetCM_RentOneWay_In',
   del = '/containerManagementApi/CM_RentOneWay_In/DeleteCM_RentOneWay_In',
 
-  // listDetail = '/containerManagementApi/CM_RentOneWay_Detail/GetCM_RentOneWay_DetailList',
+  listDetail = '/containerManagementApi/CM_RentOneWay_Detail/GetCM_RentOneWay_DetailList',
-  // editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail',
+  editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail',
   delDetail = '/containerManagementApi/CM_RentOneWay_Detail/DeleteCM_RentOneWay_Detail',
   
   Confirm = '/containerManagementApi/CM_RentOneWay_In/CM_RentOneWay_In_Confirm',
@@ -50,22 +50,22 @@ export function ApiDel(data: PageRequest) {
   })
 }
 
-// // 列表详情 (Auth)
+// 列表详情 (Auth)
-// export function ApiListDetail(data: PageRequest) {
+export function ApiListDetail(data: PageRequest) {
-//   return request<DataResult>({
+  return request<DataResult>({
-//     url: Api.listDetail,
+    url: Api.listDetail,
-//     method: 'post',
+    method: 'post',
-//     data,
+    data,
-//   })
+  })
-// }
+}
-// // 编辑详情 (Auth)
+// 编辑详情 (Auth)
-// export function ApiEditDetail(data: PageRequest) {
+export function ApiEditDetail(data: PageRequest) {
-//   return request<DataResult>({
+  return request<DataResult>({
-//     url: Api.editDetail,
+    url: Api.editDetail,
-//     method: 'post',
+    method: 'post',
-//     data,
+    data,
-//   })
+  })
-// }
+}
 // 删除详情 (Auth)
 export function ApiDelDetail(data: PageRequest) {
   return request<DataResult>({

src/views/ContainerManagement/RentOneWayIn/columns.tsx

@@ -252,7 +252,7 @@ export const formSchema: FormSchema[] = [
     label: '业务类型',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    defaultValue: 103,
+    defaultValue: 108,
     dynamicDisabled: ({}) => {
       return true
     },

src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue

@@ -393,6 +393,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue

@@ -373,6 +373,7 @@
           fileId: dsFile.value.dsFileList.SelectId,
         }
         ApiDealExcel(ApiData).then((res) => {
+          activeKey.value = '1'
           refresh()
           notification.success({ message: res.message, duration: 3 })
         })

src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue

@@ -216,6 +216,7 @@
         }
         ApiDealExcel(ApiData).then((res) => {
           if (res.succeeded) {
+            activeKey.value = '1'
             refresh()
             notification.success({ message: res.message, duration: 3 })
           }