箱管 单程租入 调整

feature-JimuReport-1106-yjl
张同海 1 month ago
parent c76d348859
commit eb35175041

@ -158,7 +158,7 @@
import { registerAllModules } from 'handsontable/registry' import { registerAllModules } from 'handsontable/registry'
registerAllModules() registerAllModules()
import 'handsontable/dist/handsontable.full.css' import 'handsontable/dist/handsontable.full.css'
import { formSchema, formSearchBoxSchema } from './columns' import { formSchema } from './columns'
import { import {
GetCtnSelectList, GetCtnSelectList,
GetClientPortSelectList, GetClientPortSelectList,
@ -498,11 +498,6 @@
width: 120, width: 120,
data: 'dropoffPortCode', data: 'dropoffPortCode',
}, },
{
title: '租箱客户ID',
width: 120,
data: 'rentCustomerId',
},
{ {
title: '租箱业务ID', title: '租箱业务ID',
width: 120, width: 120,
@ -538,9 +533,9 @@
}, },
}, },
{ {
title: '租箱客户', title: '原箱主',
width: 120, width: 120,
data: 'rentCustomerName', data: 'oldContainerOwner',
type: 'dropdown', type: 'dropdown',
// (process) // (process)
source: async (query, process) => { source: async (query, process) => {
@ -655,6 +650,7 @@
data: 'dropoffDate', data: 'dropoffDate',
type: 'date', type: 'date',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
readOnly: true,
}, },
{ {
title: '起租地点', title: '起租地点',
@ -691,6 +687,7 @@
width: 120, width: 120,
data: 'dropoffPort', data: 'dropoffPort',
type: 'dropdown', type: 'dropdown',
readOnly: true,
// (process) // (process)
source: async (query, process) => { source: async (query, process) => {
const res = (await GetClientPortSelectList({ queryKey: query }))?.data const res = (await GetClientPortSelectList({ queryKey: query }))?.data
@ -735,7 +732,7 @@
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// //
hiddenColumns: { hiddenColumns: {
columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], columns: [1, 2, 3, 4, 5, 6, 7, 8, 9],
indicators: true, indicators: true,
}, },
// //
@ -764,7 +761,7 @@
list.value[changes[0][0]]['ctnall'] = dict?.ctnName list.value[changes[0][0]]['ctnall'] = dict?.ctnName
list.value[changes[0][0]]['ctnCode'] = dict?.ediCode list.value[changes[0][0]]['ctnCode'] = dict?.ediCode
} }
if (changes[0][1] === 'rentCustomerName') { if (changes[0][1] === 'oldContainerOwner') {
const res = ContainerOwnerDict.value.length const res = ContainerOwnerDict.value.length
? ContainerOwnerDict.value ? ContainerOwnerDict.value
: (await GetClientListByCode({ code: 'leasing' }))?.data : (await GetClientListByCode({ code: 'leasing' }))?.data
@ -773,8 +770,8 @@
return item.pinYinCode === changes[0][3] return item.pinYinCode === changes[0][3]
}) })
if (item) dict = item[0] if (item) dict = item[0]
list.value[changes[0][0]]['rentCustomerName'] = dict?.pinYinCode list.value[changes[0][0]]['oldContainerOwner'] = dict?.pinYinCode
list.value[changes[0][0]]['rentCustomerId'] = dict?.id list.value[changes[0][0]]['oldContainerOwnerId'] = dict?.id
} }
if (changes[0][1] === 'rentDirect') { if (changes[0][1] === 'rentDirect') {
const res = rentDirectDict.value.length const res = rentDirectDict.value.length

@ -76,10 +76,10 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '租箱客户', title: '原箱主',
dataIndex: 'rentCustomerName', dataIndex: 'oldContainerOwner',
sorter: true, sorter: true,
width: 200, width: 150,
}, },
{ {
title: '业务日期', title: '业务日期',
@ -149,8 +149,8 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {
field: 'rentCustomerName', field: 'oldContainerOwner',
label: '租箱客户', label: '原箱主',
component: 'ApiSelect', component: 'ApiSelect',
required: false, required: false,
dynamicDisabled: false, dynamicDisabled: false,
@ -372,15 +372,15 @@ export const formSchema: FormSchema[] = [
// }, // },
// }, // },
{ {
field: 'rentCustomerId', field: 'oldContainerOwnerId',
label: '租箱客户', label: '原箱主',
component: 'Input', component: 'Input',
colProps: { span: 6 }, colProps: { span: 6 },
show: false, show: false,
}, },
{ {
field: 'rentCustomerName', field: 'oldContainerOwner',
label: '租箱客户', label: '原箱主',
component: 'ApiSelect', component: 'ApiSelect',
required: false, required: false,
dynamicDisabled: false, dynamicDisabled: false,
@ -401,10 +401,10 @@ export const formSchema: FormSchema[] = [
}, },
onChange: (e, obj) => { onChange: (e, obj) => {
if (e && obj) { if (e && obj) {
formModel.rentCustomerId = obj.id formModel.oldContainerOwnerId = obj.id
} }
if (!e && !obj) { if (!e && !obj) {
formModel.rentCustomerId = '' formModel.oldContainerOwnerId = ''
} }
}, },
} }
@ -473,12 +473,12 @@ export const formSchema: FormSchema[] = [
export const formSearchBoxSchema: FormSchema[] = [ export const formSearchBoxSchema: FormSchema[] = [
{ {
field: 'rentCustomerName', field: 'oldContainerOwner',
label: '租箱客户', label: '原箱主',
component: 'ApiSelect', component: 'ApiSelect',
required: false, required: false,
dynamicDisabled: false, dynamicDisabled: false,
colProps: { span: 6 }, colProps: { span: 4 },
componentProps: ({ formModel }) => { componentProps: ({ formModel }) => {
return { return {
allowClear: true, allowClear: true,

Loading…
Cancel
Save