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

11/04

Browse Source
feature-JimuReport-1106-yjl
张同海 4 weeks ago
parent 2f25f913ac
commit e315c55970
4 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File

16
src/views/baseinfo/infoclient/EditColumns.tsx
Unescape Escape View File

@ -907,7 +907,7 @@ export const EditformSchema2: FormSchema[] = [
},
{
field: 'rmbAccountId',
label: '人民币账户',
label: '进项人民币银行',
component: 'DEdit',
colProps: { span: 8 },
defaultValue: '',
@ -922,12 +922,14 @@ export const EditformSchema2: FormSchema[] = [
onChange: (e, obj) => {
const { formModel } = En
if (e && obj) {
formModel.pcorpId = obj.value
formModel.pcorpName = obj.label
formModel.rmbAccountId = obj.value
formModel.rmbBankName = obj.bankName
formModel.rmbBankAccountNo = obj.bankAccountNo
}
if (!e && !obj) {
formModel.pcorpId = ''
formModel.pcorpName = ''
formModel.rmbAccountId = ''
formModel.rmbBankName = ''
formModel.rmbBankAccountNo = ''
}
},
onEdit: () => {
@ -951,7 +953,7 @@ export const EditformSchema2: FormSchema[] = [
},
{
field: 'usdAccountId',
label: '美金账户',
label: '进项美金银行',
component: 'DEdit',
colProps: { span: 8 },
defaultValue: '',
@ -967,7 +969,7 @@ export const EditformSchema2: FormSchema[] = [
const { formModel } = En
if (e && obj) {
formModel.usdAccountId = obj.value
formModel.usdBankName = obj.label
formModel.usdBankName = obj.bankName
formModel.usdBankAccountNo = obj.bankAccountNo
}
if (!e && !obj) {

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

@ -96,7 +96,7 @@ if (res15.succeeded) {
res15.data.forEach((e) => {
if (e.accountName && e.id) {
usdAccountData.push({
label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`,
label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}-${e.swiftCode}`,
value: e.id,
...e,
})
@ -1364,7 +1364,7 @@ export const formSchema2: FormSchema[] = [
},
{
field: 'rmbAccountId',
label: '人民币账户',
label: '进项人民币银行',
component: 'Select',
colProps: { span: 8 },
defaultValue: '',
@ -1380,7 +1380,7 @@ export const formSchema2: FormSchema[] = [
const { formModel } = En
if (e && obj) {
formModel.rmbAccountId = obj.value
formModel.rmbBankName = obj.label
formModel.rmbBankName = obj.bankName
formModel.rmbBankAccountNo = obj.bankAccountNo
}
if (!e && !obj) {
@ -1404,9 +1404,15 @@ export const formSchema2: FormSchema[] = [
component: 'Input',
show: false,
},
{
label: '进账美金SwiftCode',
field: 'usdSwiftCode',
component: 'Input',
show: false,
},
{
field: 'usdAccountId',
label: '美金账户',
label: '进项美金银行',
component: 'Select',
colProps: { span: 8 },
defaultValue: '',
@ -1422,13 +1428,15 @@ export const formSchema2: FormSchema[] = [
const { formModel } = En
if (e && obj) {
formModel.usdAccountId = obj.value
formModel.usdBankName = obj.label
formModel.usdBankName = obj.bankName
formModel.usdBankAccountNo = obj.bankAccountNo
formModel.usdSwiftCode = obj.swiftCode
}
if (!e && !obj) {
formModel.usdAccountId = ''
formModel.usdBankName = ''
formModel.usdBankAccountNo = ''
formModel.usdSwiftCode = ''
}
},
}

86
src/views/operation/seaexport/columns.tsx
Unescape Escape View File

@ -89,7 +89,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
showName: 'shortName',
resultField: 'data',
immediate: false
immediate: false,
}
},
},
@ -129,7 +129,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data'
resultField: 'data',
}
},
},
@ -147,7 +147,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data'
resultField: 'data',
}
},
},
@ -165,7 +165,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'vesselName',
resultField: 'data',
immediate: false,
mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE'
mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE',
}
},
},
@ -173,7 +173,7 @@ export const searchFormSchema: FormSchema[] = [
label: '船司航次',
field: 'innerVoyno',
component: 'Input',
colProps: { span: 4 }
colProps: { span: 4 },
},
{
label: '装货港',
@ -189,7 +189,7 @@ export const searchFormSchema: FormSchema[] = [
labelField: 'pinYinCode',
showName: 'portName',
valueField: 'id',
immediate: false
immediate: false,
}
},
},
@ -207,7 +207,7 @@ export const searchFormSchema: FormSchema[] = [
labelField: 'pinYinCode',
showName: 'portName',
valueField: 'id',
immediate: false
immediate: false,
}
},
},
@ -225,7 +225,7 @@ export const searchFormSchema: FormSchema[] = [
labelField: 'pinYinCode',
showName: 'portName',
valueField: 'id',
immediate: false
immediate: false,
}
},
},
@ -242,7 +242,7 @@ export const searchFormSchema: FormSchema[] = [
immediate: false,
labelField: 'ediCode',
valueField: 'id',
resultField: 'data'
resultField: 'data',
}
},
},
@ -259,9 +259,9 @@ export const searchFormSchema: FormSchema[] = [
immediate: false,
labelField: 'laneName',
valueField: 'id',
resultField: 'data'
resultField: 'data',
}
}
},
},
{
label: '客服',
@ -277,7 +277,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data'
resultField: 'data',
}
},
},
@ -307,7 +307,7 @@ export const searchFormSchema: FormSchema[] = [
valueField: 'id',
showName: 'shortName',
resultField: 'data',
immediate: false
immediate: false,
}
},
},
@ -315,31 +315,31 @@ export const searchFormSchema: FormSchema[] = [
field: 'contractNo',
label: '约号',
component: 'Input',
colProps: { span: 4 }
colProps: { span: 4 },
},
{
label: '场站',
field: 'yard',
component: 'Input',
show: false
show: false,
},
{
label: '订舱口',
field: 'forwarder',
component: 'Input',
show: false
show: false,
},
{
field: 'contractNo',
label: '约号',
component: 'Input',
show: false
show: false,
},
{
field: 'serviceContractNo',
label: '服务合同号',
component: 'Input',
show: false
show: false,
},
]
// 费用状态
@ -383,25 +383,25 @@ export const columns: BasicColumn[] = [
dataIndex: 'shipperCn',
title: '国内发货人',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'cntrTotal',
title: '箱型箱量',
sorter: true,
width: 100
width: 100,
},
{
dataIndex: 'quotePrice',
title: '卖单价',
sorter: true,
width: 80
width: 80,
},
{
dataIndex: 'floorPrice',
title: '底单价',
sorter: true,
width: 80
width: 80,
},
{
dataIndex: 'bookingNo',
@ -455,25 +455,25 @@ export const columns: BasicColumn[] = [
title: '卸货港',
dataIndex: 'dischargePort',
width: 120,
sorter: true
sorter: true,
},
{
title: '交货地',
sorter: true,
dataIndex: 'deliveryPlace',
width: 120
width: 120,
},
{
dataIndex: 'service',
title: '运输条款',
sorter: true,
width: 100
width: 100,
},
{
dataIndex: 'eta',
title: '预抵日期',
sorter: true,
width: 90
width: 90,
},
{
title: '订舱口',
@ -484,12 +484,12 @@ export const columns: BasicColumn[] = [
{
title: '运踪',
dataIndex: 'bookStatus',
width: 200
width: 200,
},
{
title: '提箱返场',
dataIndex: 'statusLog',
width: 140
width: 140,
},
{
title: '揽货人',
@ -519,7 +519,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'laner',
title: '航线',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'contractClientName',
@ -661,13 +661,13 @@ export const columns: BasicColumn[] = [
dataIndex: 'isBusinessLocking',
title: '业务锁定',
sorter: true,
width: 80
width: 80,
},
{
dataIndex: 'isFeeLocking',
title: '费用锁定',
width: 80,
sorter: true
sorter: true,
},
{
dataIndex: 'accountDate',
@ -733,19 +733,19 @@ export const columns: BasicColumn[] = [
dataIndex: 'yard',
title: '场站',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'customser',
title: '报关行',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'trucker',
title: '承运车队',
sorter: true,
width: 120
width: 120,
},
// {
// dataIndex: 'termDelivery',
@ -757,25 +757,25 @@ export const columns: BasicColumn[] = [
dataIndex: 'agent',
title: '国外代理',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'shipper',
title: '发货人',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'consignee',
title: '收货人',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'notifyParty',
title: '通知人',
width: 120,
sorter: true
sorter: true,
},
{
title: '收货地',
@ -787,7 +787,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'kindPkgsName',
title: '包装',
sorter: true,
width: 120
width: 120,
},
{
title: '件数',
@ -845,7 +845,7 @@ export const columns: BasicColumn[] = [
}
})
return name
}
},
},
{
dataIndex: 'issueDate',
@ -857,7 +857,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'issueType',
title: '签单方式',
sorter: true,
width: 100
width: 100,
},
// ...CtnMapArr,
{
@ -902,13 +902,13 @@ export const columns: BasicColumn[] = [
dataIndex: 'mblFrt',
title: '付费方式',
sorter: true,
width: 100
width: 100,
},
{
dataIndex: 'prepareAt',
title: '预付地点',
sorter: true,
width: 120
width: 120,
},
{
dataIndex: 'note',

14
src/views/system/org/columns.tsx
Unescape Escape View File

@ -532,6 +532,11 @@ export const BankColumns: BasicColumn[] = [
width: 230,
align: 'left',
},
{
title: 'SWIFT CODE',
dataIndex: 'swiftCode',
width: 100,
},
{
title: '是否默认',
dataIndex: 'isDefault',
@ -687,6 +692,15 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
{
label: 'SWIFT CODE',
field: 'swiftCode',
component: 'Input',
defaultValue: '',
colProps: {
span: 12,
},
},
{
field: 'isDefault',
component: 'Switch',

Write Preview
Loading…
Cancel
Save