From 8d56086a69f30151651854bcb83a72afd315183b 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: Tue, 27 Aug 2024 17:54:10 +0800 Subject: [PATCH 1/3] =?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 --- .../CurrentState/TenantAuditStepModal.vue | 4 ++-- .../CurrentState/columns.tsx | 18 ++++++++---------- .../ContainerManagement/RentIn/columns.tsx | 4 ++-- .../StateChange/TenantAuditStepModal.vue | 4 ++-- .../StateChange/columns.tsx | 9 ++++++++- .../qbxdtbdrz/TenantAuditStepModal.vue | 4 ++-- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue index 5ab231ad..7b4fc7fd 100644 --- a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue @@ -19,14 +19,14 @@ @click="closeModal" >取消 - 仅保存 + > --> { diff --git a/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue b/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue index 50275dd5..7e61813e 100644 --- a/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue @@ -19,14 +19,14 @@ @click="closeModal" >取消 - 仅保存 + > --> 取消 - 仅保存 + > --> Date: Tue, 27 Aug 2024 19:16:06 +0800 Subject: [PATCH 2/3] =?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 --- .../CurrentState/columns.tsx | 12 ++ .../SellCtn/TenantAuditStepModal.vue | 137 ++++++++++++++++-- 2 files changed, 133 insertions(+), 16 deletions(-) diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index d65c7859..32176231 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -759,6 +759,18 @@ export const InfoColumns: BasicColumn[] = [ sorter: true, width: 150, }, + { + title: '变动来源', + dataIndex: 'changeSource', + sorter: true, + width: 150, + }, + { + title: '业务类型', + dataIndex: 'ctnBizState', + sorter: true, + width: 150, + }, { title: '箱来源', dataIndex: 'ctnSource', diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index 51d3bc0f..a2f3a73b 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -430,6 +430,9 @@ const PortDict = ref([]) const CtnFlowStateDict = ref([]) const ctnsourceDict = ref([]) + const isOnlineDict = ref([]) + const ctnBizStateDict = ref([]) + const ctnStateDict = ref([]) // // 币别字段 // const currencyDict = ref([]) watchEffect(() => { @@ -519,7 +522,21 @@ width: 120, data: 'ctnSourceId', }, - + { + title: '是否上线ID', + width: 120, + data: 'isOnlineId', + }, + { + title: '箱业务状态ID', + width: 120, + data: 'ctnBizStateId', + }, + { + title: '箱状态ID', + width: 120, + data: 'ctnStateId', + }, // ----------------- // { // title: '租箱业务号', @@ -566,17 +583,68 @@ }, }, { - title: '放箱单号', + title: '是否上线', width: 120, - data: 'ctnReleaseNo', + 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: '提箱日期', + title: '箱业务状态', width: 120, - data: 'pickupDate', - type: 'date', - dateFormat: 'YYYY-MM-DD', + 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: '放箱单号', + // width: 120, + // data: 'ctnReleaseNo', + // }, + // { + // title: '提箱日期', + // width: 120, + // data: 'pickupDate', + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // }, { title: '当前状态', width: 120, @@ -625,9 +693,9 @@ format: '0', }, { - title: '提箱港口', + title: '当前港口', width: 120, - data: 'pickupPort', + data: 'port', type: 'dropdown', // 下拉框数据，可以同步或者异步返回(异步需要process返回) source: async (query, process) => { @@ -664,7 +732,7 @@ fixedColumnsLeft: 1, // 需要隐藏的列 hiddenColumns: { - columns: [1, 2, 3, 4, 5, 6, 7], + columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], indicators: true, }, // 控制回车移动 @@ -693,7 +761,7 @@ list.value[changes[0][0]]['ctnall'] = dict?.ctnName list.value[changes[0][0]]['ctnCode'] = dict?.ediCode } - if (changes[0][1] === 'pickupPort') { + if (changes[0][1] === 'port') { const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data @@ -703,10 +771,10 @@ }) if (item) dict = item[0] - if (changes[0][1] === 'pickupPort') { - list.value[changes[0][0]]['pickupPort'] = dict?.portName - list.value[changes[0][0]]['pickupPortid'] = dict?.id - list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode + if (changes[0][1] === 'port') { + list.value[changes[0][0]]['port'] = dict?.portName + list.value[changes[0][0]]['portid'] = dict?.id + list.value[changes[0][0]]['portCode'] = dict?.ediCode } } if (changes[0][1] === 'ctnSource') { @@ -721,6 +789,43 @@ list.value[changes[0][0]]['ctnSource'] = dict?.label list.value[changes[0][0]]['ctnSourceId'] = dict?.value } + if (changes[0][1] === 'isOnline') { + const res = isOnlineDict.value.length + ? isOnlineDict.value + : await getDictOption('CM_IsOnlineEnum') + if (!isOnlineDict.value.length) isOnlineDict.value = res + const item = res.filter((item) => { + return item.label === changes[0][3] + }) + if (item) dict = item[0] + list.value[changes[0][0]]['isOnline'] = dict?.label + list.value[changes[0][0]]['isOnlineId'] = dict?.value + } + if (changes[0][1] === 'ctnBizState') { + const res = ctnBizStateDict.value.length + ? ctnBizStateDict.value + : await getDictOption('CM_CtnBizState') + if (!ctnBizStateDict.value.length) ctnBizStateDict.value = res + const item = res.filter((item) => { + return item.label === changes[0][3] + }) + if (item) dict = item[0] + list.value[changes[0][0]]['ctnBizState'] = dict?.label + list.value[changes[0][0]]['ctnBizStateId'] = dict?.value + } + if (changes[0][1] === 'ctnState') { + const res = ctnStateDict.value.length + ? ctnStateDict.value + : await getDictOption('CM_CtnState') + if (!ctnStateDict.value.length) ctnStateDict.value = res + const item = res.filter((item) => { + return item.label === changes[0][3] + }) + if (item) dict = item[0] + list.value[changes[0][0]]['ctnState'] = dict?.label + list.value[changes[0][0]]['ctnStateId'] = dict?.value + } + if (changes[0][1] === 'ctnFlowState') { const res = CtnFlowStateDict.value.length ? CtnFlowStateDict.value @@ -825,7 +930,7 @@ fixedColumnsLeft: 1, // 需要隐藏的列 hiddenColumns: { - columns: [1, 2, 3, 4, 5, 6, 7], + columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], indicators: true, }, // // 控制回车移动 From 450a3614188c17f50ee610f1bd6030bfeae93dcf 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: Tue, 27 Aug 2024 19:31:28 +0800 Subject: [PATCH 3/3] =?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 --- .../SellCtn/TenantAuditStepModal.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index a2f3a73b..198edb0f 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -581,6 +581,7 @@ }) process(dict) }, + readOnly: true, }, { title: '是否上线', @@ -663,6 +664,7 @@ }) process(dict) }, + readOnly: true, }, { title: '箱生产日期', @@ -670,6 +672,7 @@ data: 'productionDate', type: 'date', dateFormat: 'YYYY-MM-DD', + readOnly: true, }, { title: '箱皮重', @@ -677,6 +680,7 @@ data: 'ctnWeight', type: 'numeric', format: '0', + readOnly: true, }, { title: '原始价格', @@ -684,6 +688,7 @@ data: 'ctnValue_Base', type: 'numeric', format: '0', + readOnly: true, }, { title: '购入成本', @@ -691,6 +696,15 @@ data: 'ctnValue_BuyingPrice', type: 'numeric', format: '0', + readOnly: true, + }, + { + title: '卖出价格', + width: 120, + data: 'ctnValue_SellPrice', + type: 'numeric', + format: '0', + readOnly: true, }, { title: '当前港口',