diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue index d8339335..a38cca53 100644 --- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue @@ -243,10 +243,6 @@ }) submit() GetListDetail() - // ViewlallCheck.value = false - // ViewlsomeCheck.value = false - // handleReset() - // GetViewListDetail('[]') } } else { rowId.value = '' @@ -624,8 +620,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -644,7 +640,18 @@ }, ] const settings = { - height: '163', + height: 260, + // height: () => { + // // 表头高度 28 + // let RData = 260 + // if (list.value.length) { + // RData = 28 + list.value.length * 26 + // } + // console.log(RData) + + // // list.value + // return RData + // }, autoWrapRow: true, autoWrapCol: true, // 每行的高度 @@ -741,7 +748,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + 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 f6473a6e..5b7c0b3b 100644 --- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue @@ -630,8 +630,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -655,7 +655,7 @@ // }, ] const settings = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度 diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index 1dfa5943..f3f69324 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -662,8 +662,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -677,8 +677,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -697,7 +697,7 @@ }, ] const settings = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度 @@ -959,8 +959,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -974,8 +974,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index f8c6e77f..f0fb299f 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -674,8 +674,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -689,8 +689,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -704,8 +704,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -738,7 +738,7 @@ // }, ] const settings = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度 diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx index a3564aa0..29cb08ff 100644 --- a/src/views/ContainerManagement/RentOneWay/columns.tsx +++ b/src/views/ContainerManagement/RentOneWay/columns.tsx @@ -115,12 +115,12 @@ export const columns: BasicColumn[] = [ return text }, }, - { - title: '费用状态??', - dataIndex: 'accdate', - sorter: true, - width: 200, - }, + // { + // title: '费用状态??', + // dataIndex: 'accdate', + // sorter: true, + // width: 200, + // }, { title: '备注', dataIndex: 'remark', diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index 786be0b2..eb87b906 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -689,8 +689,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -704,8 +704,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -719,8 +719,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -739,7 +739,7 @@ }, ] const settings = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度 @@ -1021,8 +1021,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -1036,8 +1036,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -1051,8 +1051,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -1071,7 +1071,7 @@ }, ] const settings2 = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度 diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index 80a11c8e..b0b33ef8 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -575,87 +575,87 @@ process(dict) }, }, - { - title: '箱来源', - width: 120, - data: 'ctnSource', - type: 'dropdown', - // 下拉框数据,可以同步或者异步返回(异步需要process返回) - source: async (query, process) => { - const res = ctnsourceDict.value.length - ? ctnsourceDict.value - : await getDictOption('CM_CtnSource') - if (!ctnsourceDict.value.length) ctnsourceDict.value = res - const dict = res.map((res) => { - return res.label - }) - process(dict) - }, - readOnly: true, - }, - { - title: '是否上线', - width: 120, - data: 'isOnline', - type: 'dropdown', - // 下拉框数据,可以同步或者异步返回(异步需要process返回) - source: async (query, process) => { - const res = isOnlineDict.value.length - ? isOnlineDict.value - : await getDictOption('CM_IsOnlineEnum') - if (!isOnlineDict.value.length) isOnlineDict.value = res - const dict = res.map((res) => { - return res.label - }) - process(dict) - }, - }, - { - title: '箱业务状态', - width: 120, - data: 'ctnBizState', - type: 'dropdown', - // 下拉框数据,可以同步或者异步返回(异步需要process返回) - source: async (query, process) => { - const res = ctnBizStateDict.value.length - ? ctnBizStateDict.value - : await getDictOption('CM_CtnBizState') - if (!ctnBizStateDict.value.length) ctnBizStateDict.value = res - const dict = res.map((res) => { - return res.label - }) - process(dict) - }, - }, - { - title: '箱状态', - width: 120, - data: 'ctnState', - type: 'dropdown', - // 下拉框数据,可以同步或者异步返回(异步需要process返回) - source: async (query, process) => { - const res = ctnStateDict.value.length - ? ctnStateDict.value - : await getDictOption('CM_CtnState') - if (!ctnStateDict.value.length) ctnStateDict.value = res - const dict = res.map((res) => { - return res.label - }) - process(dict) - }, - }, // { - // title: '放箱单号', + // title: '箱来源', // width: 120, - // data: 'ctnReleaseNo', + // data: 'ctnSource', + // type: 'dropdown', + // // 下拉框数据,可以同步或者异步返回(异步需要process返回) + // source: async (query, process) => { + // const res = ctnsourceDict.value.length + // ? ctnsourceDict.value + // : await getDictOption('CM_CtnSource') + // if (!ctnsourceDict.value.length) ctnsourceDict.value = res + // const dict = res.map((res) => { + // return res.label + // }) + // process(dict) + // }, + // readOnly: true, + // }, + // { + // title: '是否上线', + // width: 120, + // data: 'isOnline', + // type: 'dropdown', + // // 下拉框数据,可以同步或者异步返回(异步需要process返回) + // source: async (query, process) => { + // const res = isOnlineDict.value.length + // ? isOnlineDict.value + // : await getDictOption('CM_IsOnlineEnum') + // if (!isOnlineDict.value.length) isOnlineDict.value = res + // const dict = res.map((res) => { + // return res.label + // }) + // process(dict) + // }, + // }, + // { + // title: '箱业务状态', + // width: 120, + // data: 'ctnBizState', + // type: 'dropdown', + // // 下拉框数据,可以同步或者异步返回(异步需要process返回) + // source: async (query, process) => { + // const res = ctnBizStateDict.value.length + // ? ctnBizStateDict.value + // : await getDictOption('CM_CtnBizState') + // if (!ctnBizStateDict.value.length) ctnBizStateDict.value = res + // const dict = res.map((res) => { + // return res.label + // }) + // process(dict) + // }, // }, // { - // title: '提箱日期', + // title: '箱状态', // width: 120, - // data: 'pickupDate', - // type: 'date', - // dateFormat: 'YYYY-MM-DD', + // data: 'ctnState', + // type: 'dropdown', + // // 下拉框数据,可以同步或者异步返回(异步需要process返回) + // source: async (query, process) => { + // const res = ctnStateDict.value.length + // ? ctnStateDict.value + // : await getDictOption('CM_CtnState') + // if (!ctnStateDict.value.length) ctnStateDict.value = res + // const dict = res.map((res) => { + // return res.label + // }) + // process(dict) + // }, + // }, + // { + // title: '放箱单号', + // width: 120, + // data: 'ctnReleaseNo', // }, + { + title: '提箱日期', + width: 120, + data: 'pickupDate', + type: 'date', + dateFormat: 'YYYY-MM-DD', + }, { title: '当前状态', width: 120, @@ -723,8 +723,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -738,8 +738,8 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data - if (!PortDict.value.length) PortDict.value = res + const res = (await GetClientPortSelectList({ queryKey: query }))?.data + PortDict.value = res const dict = res.map((res) => { return res.portName }) @@ -764,7 +764,7 @@ // }, ] const settings = { - height: '163', + height: '260', autoWrapRow: true, autoWrapCol: true, // 每行的高度