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

Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

Browse Source
szh-new
lijingjia 3 months ago
parent 6d6685ecfc 450a361418
commit 914890901d
7 changed files with 171 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
Unescape Escape View File

@ -19,14 +19,14 @@
@click="closeModal"
>取消</a-button
>
<a-button
<!-- <a-button
type="success"
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
@click="handleSave(false)"
>仅保存</a-button
>
> -->
<a-button
pre-icon="ant-design:check-circle-outlined"
type="primary"

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

@ -299,25 +299,23 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'etd',
label: 'ETD',
component: 'DatePicker',
component: 'RangePicker',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
allowClear: true,
},
},
{
field: 'eta',
label: 'ETA',
component: 'DatePicker',
component: 'RangePicker',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
allowClear: true,
},
},
]
@ -761,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',

4
src/views/ContainerManagement/RentIn/columns.tsx
Unescape Escape View File

@ -485,7 +485,7 @@ export const formSchema: FormSchema[] = [
export const formSearchBoxSchema: FormSchema[] = [
{
field: 'oldContainerOwner',
field: 'oldContainerOwnerId',
label: '原箱主',
component: 'ApiSelect',
required: false,
@ -499,7 +499,7 @@ export const formSearchBoxSchema: FormSchema[] = [
params: { code: 'leasing' },
labelField: 'pinYinCode',
showName: 'shortName',
valueField: 'shortName',
valueField: 'id',
resultField: 'data',
immediate: false,
filterOption: (input: string, option: any) => {

151
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: '租箱业务号',
@ -564,19 +581,71 @@
})
process(dict)
},
readOnly: true,
},
{
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,
@ -595,6 +664,7 @@
})
process(dict)
},
readOnly: true,
},
{
title: '箱生产日期',
@ -602,6 +672,7 @@
data: 'productionDate',
type: 'date',
dateFormat: 'YYYY-MM-DD',
readOnly: true,
},
{
title: '箱皮重',
@ -609,6 +680,7 @@
data: 'ctnWeight',
type: 'numeric',
format: '0',
readOnly: true,
},
{
title: '原始价格',
@ -616,6 +688,7 @@
data: 'ctnValue_Base',
type: 'numeric',
format: '0',
readOnly: true,
},
{
title: '购入成本',
@ -623,11 +696,20 @@
data: 'ctnValue_BuyingPrice',
type: 'numeric',
format: '0',
readOnly: true,
},
{
title: '卖出价格',
width: 120,
data: 'ctnValue_SellPrice',
type: 'numeric',
format: '0',
readOnly: true,
},
{
title: '提箱港口',
title: '当前港口',
width: 120,
data: 'pickupPort',
data: 'port',
type: 'dropdown',
// 下拉框数据，可以同步或者异步返回(异步需要process返回)
source: async (query, process) => {
@ -664,7 +746,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 +775,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 +785,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 +803,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 +944,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,
},
// // 控制回车移动

4
src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue
Unescape Escape View File

@ -19,14 +19,14 @@
@click="closeModal"
>取消</a-button
>
<a-button
<!-- <a-button
type="success"
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
@click="handleSave(false)"
>仅保存</a-button
>
> -->
<a-button
pre-icon="ant-design:check-circle-outlined"
type="primary"

9
src/views/ContainerManagement/StateChange/columns.tsx
Unescape Escape View File

@ -196,9 +196,16 @@ export const formSchema: FormSchema[] = [
field: 'cntrno',
label: '集装箱号',
component: 'InputTextArea',
required: true,
rules: [
{
required: true,
trigger: 'blur',
message: '请输入集装箱号',
},
],
colProps: { span: 24 },
componentProps: {
validateOnRuleChange: false,
placeholder: '请输入，多个箱号请以“，”逗号间隔',
rows: 3,
},

4
src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
Unescape Escape View File

@ -19,14 +19,14 @@
@click="closeModal"
>取消</a-button
>
<a-button
<!-- <a-button
type="success"
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
@click="handleSave(false)"
>仅保存</a-button
>
> -->
<a-button
pre-icon="ant-design:check-circle-outlined"
type="primary"

Write Preview
Loading…
Cancel
Save