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

Merge branch 'zth' into dev

Browse Source
feature-JimuReport-1106-yjl
张同海 3 weeks ago
parent 8264ec7c46 e315c55970
commit f268c90b68
7 changed files with 83 additions and 58 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', field: 'rmbAccountId',
label: '人民币账户', label: '进项人民币银行',
component: 'DEdit', component: 'DEdit',
colProps: { span: 8 }, colProps: { span: 8 },
defaultValue: '', defaultValue: '',
@ -922,12 +922,14 @@ export const EditformSchema2: FormSchema[] = [
onChange: (e, obj) => { onChange: (e, obj) => {
const { formModel } = En const { formModel } = En
if (e && obj) { if (e && obj) {
formModel.pcorpId = obj.value formModel.rmbAccountId = obj.value
formModel.pcorpName = obj.label formModel.rmbBankName = obj.bankName
formModel.rmbBankAccountNo = obj.bankAccountNo
} }
if (!e && !obj) { if (!e && !obj) {
formModel.pcorpId = '' formModel.rmbAccountId = ''
formModel.pcorpName = '' formModel.rmbBankName = ''
formModel.rmbBankAccountNo = ''
} }
}, },
onEdit: () => { onEdit: () => {
@ -951,7 +953,7 @@ export const EditformSchema2: FormSchema[] = [
}, },
{ {
field: 'usdAccountId', field: 'usdAccountId',
label: '美金账户', label: '进项美金银行',
component: 'DEdit', component: 'DEdit',
colProps: { span: 8 }, colProps: { span: 8 },
defaultValue: '', defaultValue: '',
@ -967,7 +969,7 @@ export const EditformSchema2: FormSchema[] = [
const { formModel } = En const { formModel } = En
if (e && obj) { if (e && obj) {
formModel.usdAccountId = obj.value formModel.usdAccountId = obj.value
formModel.usdBankName = obj.label formModel.usdBankName = obj.bankName
formModel.usdBankAccountNo = obj.bankAccountNo formModel.usdBankAccountNo = obj.bankAccountNo
} }
if (!e && !obj) { if (!e && !obj) {

2
src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
Unescape Escape View File

@ -406,7 +406,7 @@
data: 'unitPrice', data: 'unitPrice',
type: 'numeric', type: 'numeric',
format: '0.00', format: '0.00',
readOnly: true, // readOnly: true,
}, },
{ {
title: '汇率', title: '汇率',

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

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

3
src/views/baseinfo/userEmail/columns.tsx
Unescape Escape View File

@ -107,6 +107,7 @@ export const formSchema: FormSchema[] = [
label: '邮箱账号', label: '邮箱账号',
component: 'Input', component: 'Input',
colProps: { span: 12 }, colProps: { span: 12 },
rules: [{ type: 'email', message: '请填写正确的邮箱地址' }],
}, },
{ {
field: 'showName', field: 'showName',
@ -117,7 +118,7 @@ export const formSchema: FormSchema[] = [
{ {
field: 'password', field: 'password',
label: '密码', label: '密码',
component: 'Input', component: 'InputPassword',
colProps: { span: 12 }, colProps: { span: 12 },
}, },
{ {

2
src/views/fee/FeeCustTemplate/feeField.vue
Unescape Escape View File

@ -410,7 +410,7 @@
data: 'unitPrice', data: 'unitPrice',
type: 'numeric', type: 'numeric',
format: '0.00', format: '0.00',
readOnly: true, // readOnly: true,
}, },
{ {
title: '汇率', title: '汇率',

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

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

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

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

Write Preview
Loading…
Cancel
Save