lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

箱管 调整

Browse Source
szh-new
张同海 3 months ago
parent 8d56086a69
commit 88bc8c13fe
2 changed files with 133 additions and 16 deletions
Show Stats Download Patch File Download Diff File

12
src/views/ContainerManagement/CurrentState/columns.tsx
Unescape Escape View File

@ -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',

137
src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
Unescape Escape View File

@ -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,
},
// // 控制回车移动

Write Preview
Loading…
Cancel
Save