From b65ff1cdb128084cb9ee8bc087e755e5dcb9fba3 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: Thu, 19 Sep 2024 11:43:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BuyCtn/TenantAuditStepModal.vue | 1 + .../CtnScrap/TenantAuditStepModal.vue | 1 + .../RentIn/TenantAuditStepModal.vue | 1 + .../RentOneWay/TenantAuditStepModal.vue | 1 + .../RentOneWayIn/TenantAuditStepModal.vue | 40 ++++++++++++++----- .../ContainerManagement/RentOneWayIn/api.ts | 36 ++++++++--------- .../RentOneWayIn/columns.tsx | 2 +- .../RentOut/TenantAuditStepModal.vue | 1 + .../SellCtn/TenantAuditStepModal.vue | 1 + .../TemplatImport/TenantAuditStepModal.vue | 1 + 10 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue index 76094afb..c7e8c7b6 100644 --- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue index 5043e5dc..e4db53b5 100644 --- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index 615c27dc..f0312786 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index c4de6aea..a07bc7f3 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue index 58da7664..54532d42 100644 --- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue +++ b/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) { - res.data.bodyList.forEach((item) => { - list.value.push(item) - }) - } + GetListDetail() } } 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) { - res.data.bodyList.forEach((item) => { - list.value.push(item) - }) - } + GetListDetail() } } const activeKey = ref('1') diff --git a/src/views/ContainerManagement/RentOneWayIn/api.ts b/src/views/ContainerManagement/RentOneWayIn/api.ts index 143454e4..fdeb29ff 100644 --- a/src/views/ContainerManagement/RentOneWayIn/api.ts +++ b/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', - // editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail', + listDetail = '/containerManagementApi/CM_RentOneWay_Detail/GetCM_RentOneWay_DetailList', + 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) -// export function ApiListDetail(data: PageRequest) { -// return request({ -// url: Api.listDetail, -// method: 'post', -// data, -// }) -// } -// // 编辑详情 (Auth) -// export function ApiEditDetail(data: PageRequest) { -// return request({ -// url: Api.editDetail, -// method: 'post', -// data, -// }) -// } +// 列表详情 (Auth) +export function ApiListDetail(data: PageRequest) { + return request({ + url: Api.listDetail, + method: 'post', + data, + }) +} +// 编辑详情 (Auth) +export function ApiEditDetail(data: PageRequest) { + return request({ + url: Api.editDetail, + method: 'post', + data, + }) +} // 删除详情 (Auth) export function ApiDelDetail(data: PageRequest) { return request({ diff --git a/src/views/ContainerManagement/RentOneWayIn/columns.tsx b/src/views/ContainerManagement/RentOneWayIn/columns.tsx index 41c46b0c..cc7ccaa4 100644 --- a/src/views/ContainerManagement/RentOneWayIn/columns.tsx +++ b/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 }, diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index 7b46de3a..f3d7e65f 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index 9a6e6615..3e83cf4d 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/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 }) }) diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue index d1d7b2a2..027be735 100644 --- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue +++ b/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 }) }