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

解决 往来单位以及港口信息 Bug

Browse Source
szh-new
张同海 4 months ago
parent 74d5041711
commit cbd34ab189
2 changed files with 123 additions and 90 deletions
Show Stats Download Patch File Download Diff File

137
src/views/baseinfo/infoclient/columns.tsx
Unescape Escape View File

@ -185,7 +185,7 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '企业备案号',
title: '海关备案号',
dataIndex: 'registrationNo',
sorter: true,
width: 150,
@ -329,12 +329,12 @@ export const columns: BasicColumn[] = [
},
},
{
title: '冷藏费率',
dataIndex: 'unitPrice',
sorter: true,
width: 150,
},
// {
// title: '冷藏费率',
// dataIndex: 'unitPrice',
// sorter: true,
// width: 150,
// },
{
title: '提成比例',
dataIndex: 'commissionRate',
@ -368,21 +368,21 @@ export const columns: BasicColumn[] = [
return RText
},
},
{
title: '仓储费开始日期模式',
dataIndex: 'wmsFeeRateType',
sorter: true,
width: 250,
customRender: ({ text }) => {
let RText = ''
wmsFeeRateTypeList.forEach((e) => {
if (e.value == text) {
RText = e.label
}
})
return RText
},
},
// {
// title: '仓储费开始日期模式',
// dataIndex: 'wmsFeeRateType',
// sorter: true,
// width: 250,
// customRender: ({ text }) => {
// let RText = ''
// wmsFeeRateTypeList.forEach((e) => {
// if (e.value == text) {
// RText = e.label
// }
// })
// return RText
// },
// },
{
title: '其他类型',
dataIndex: 'others',
@ -494,7 +494,7 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'registrationNo',
label: '企业备案号',
label: '海关备案号',
component: 'Input',
colProps: { span: 4 },
},
@ -525,6 +525,12 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
show: false,
},
{
field: 'divider-selects',
component: 'Divider',
label: '基本信息',
colProps: { span: 24 },
},
{
field: 'description',
label: '客户全称',
@ -628,9 +634,22 @@ export const formSchema: FormSchema[] = [
}
},
},
{
field: 'saleOrgIdList',
label: '所属分部',
// required: true,
component: 'Select',
colProps: { span: 12 },
componentProps: {
options: DeptList,
allowClear: true,
mode: 'multiple',
class: 'NoLimitHeight',
},
},
{
field: 'registrationNo',
label: '企业备案号',
label: '海关备案号',
// required: true,
component: 'Input',
defaultValue: '',
@ -716,6 +735,12 @@ export const formSchema: FormSchema[] = [
},
},
},
{
field: 'divider-selects',
component: 'Divider',
label: '业务属性及干系人',
colProps: { span: 24 },
},
{
field: 'sourceId',
label: '业务来源',
@ -791,14 +816,14 @@ export const formSchema: FormSchema[] = [
},
},
},
{
field: 'unitPrice',
label: '冷藏费率',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
// {
// field: 'unitPrice',
// label: '冷藏费率',
// // required: true,
// component: 'Input',
// defaultValue: '',
// colProps: { span: 4 },
// },
{
field: 'commissionRate',
label: '提成比例',
@ -837,23 +862,23 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'wmsFeeRateType',
label: '仓储费开始日期模式',
// required: true,
component: 'Select',
colProps: { span: 4 },
labelWidth: 140,
defaultValue: '',
componentProps: {
options: wmsFeeRateTypeList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
},
},
// {
// field: 'wmsFeeRateType',
// label: '仓储费开始日期模式',
// // required: true,
// component: 'Select',
// colProps: { span: 4 },
// labelWidth: 140,
// defaultValue: '',
// componentProps: {
// options: wmsFeeRateTypeList,
// allowClear: true,
// showSearch: true,
// filterOption: (input: string, option: any) => {
// return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
// },
// },
// },
{
label: '开票方式',
field: 'invoicingMethod',
@ -904,19 +929,7 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '否',
},
},
{
field: 'saleOrgIdList',
label: '所属分部',
// required: true,
component: 'Select',
colProps: { span: 12 },
componentProps: {
options: DeptList,
allowClear: true,
mode: 'multiple',
class: 'NoLimitHeight',
},
},
{
field: 'isOverdueDeduction',
label: '是否超期扣单',

64
src/views/baseinfo/port/columns.tsx
Unescape Escape View File

@ -72,21 +72,21 @@ export const columns: BasicColumn[] = [
return RData
},
},
{
title: '国家',
dataIndex: 'countryId',
sorter: true,
width: 200,
customRender: ({ text }) => {
let RData = text
CountrySelectList.forEach((e) => {
if (e.value == text) {
RData = e.label
}
})
return RData
},
},
// {
// title: '国家',
// dataIndex: 'countryId',
// sorter: true,
// width: 200,
// customRender: ({ text }) => {
// let RData = text
// CountrySelectList.forEach((e) => {
// if (e.value == text) {
// RData = e.label
// }
// })
// return RData
// },
// },
{
title: '航线',
dataIndex: 'laneId',
@ -141,19 +141,30 @@ export const searchFormSchema: FormSchema[] = [
field: 'CnName',
label: '港口中文名称',
component: 'Input',
colProps: { span: 4 }
colProps: { span: 4 },
},
{
field: 'countryName',
field: 'countryId',
label: '国家',
component: 'Input',
colProps: { span: 4 }
component: 'Select',
colProps: { span: 4 },
defaultValue: '',
componentProps: () => {
return {
options: CountrySelectList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
}
},
},
{
field: 'ediCode',
label: 'EDI代码',
component: 'Input',
colProps: { span: 4 }
colProps: { span: 4 },
},
]
export const formSchema: FormSchema[] = [
@ -183,6 +194,7 @@ export const formSchema: FormSchema[] = [
label: '国家名称',
component: 'Input',
colProps: { span: 12 },
show: false,
},
{
field: 'chau',
@ -213,13 +225,21 @@ export const formSchema: FormSchema[] = [
component: 'Select',
colProps: { span: 12 },
defaultValue: '',
componentProps: {
componentProps: ({ formModel }) => {
return {
options: CountrySelectList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e, obj) => {
if (obj) {
formModel.countryId = obj.value
formModel.countryName = obj.label
}
},
}
},
},
{
@ -242,7 +262,7 @@ export const formSchema: FormSchema[] = [
label: 'EDI代码',
component: 'Input',
required: true,
colProps: { span: 12 }
colProps: { span: 12 },
},
{

Write Preview
Loading…
Cancel
Save