diff --git a/.env.development b/.env.development
index 4b2a3424..cfac0a85 100644
--- a/.env.development
+++ b/.env.development
@@ -12,7 +12,7 @@ VITE_PUBLIC_PATH = /
# Cross-domain proxy, you can configure multiple
# Please note that no line breaks
-# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY = [["/basic-api","http:///60.209.125.238"],["/upload","http://localhost:3300/upload"]]
VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境
# Delete console
diff --git a/src/components/CostEntry/components/historyDrawer.vue b/src/components/CostEntry/components/historyDrawer.vue
index f9f52445..05868418 100644
--- a/src/components/CostEntry/components/historyDrawer.vue
+++ b/src/components/CostEntry/components/historyDrawer.vue
@@ -23,7 +23,7 @@
@row-click="onRowClick"
>
-
费用明细
+
费用明细 引入结算对象
{
@@ -170,5 +175,9 @@
.info {
padding: 0 15px;
}
+ .fee-checkbox span {
+ margin-left: 50px;
+ font-size: 12px;
+ }
}
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
index 4375d040..b99051a8 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
@@ -1041,12 +1041,17 @@ export const columns: BasicColumn[] = [
{
title: '主提单号',
dataIndex: 'mblno',
- width: 150,
+ width: 120,
+ },
+ {
+ title: '分提单号',
+ dataIndex: 'hblno',
+ width: 120,
},
{
title: '船名',
dataIndex: 'vessel',
- width: 150,
+ width: 120,
},
{
title: '航次',
@@ -1056,18 +1061,32 @@ export const columns: BasicColumn[] = [
{
title: '开船日期',
dataIndex: 'etd',
- width: 120,
+ width: 90,
},
-
{
title: '装货港',
dataIndex: 'loadPort',
- width: 140,
+ width: 110,
},
{
title: '卸货港',
dataIndex: 'dischargePort',
- width: 140,
+ width: 110,
+ },
+ {
+ title: '发货人',
+ dataIndex: 'shipper',
+ width: 110,
+ },
+ {
+ title: '收货人',
+ dataIndex: 'consignee',
+ width: 110,
+ },
+ {
+ title: '国内发货人',
+ dataIndex: 'shipperCn',
+ width: 110,
},
{
title: '发货人内容',
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index 5ad9e1cf..5ad1bfc7 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -207,7 +207,7 @@ export const basicInfoFormSchema: FormSchema[] = [
colProps: { span: 5 },
componentProps: ({ formModel, formActionType }) => {
return {
- api: GetClientListByCode,
+ api: GetSupplierListByCode,
params: { code: 'contract' },
labelField: 'pinYinCode',
valueField: 'shortName',
@@ -876,8 +876,8 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
componentProps: {
allowClear: true,
showTime: true,
- valueFormat: 'YYYY-MM-DD HH:mm',
- },
+ valueFormat: 'YYYY-MM-DD HH:mm'
+ }
},
{
label: '装货港',
@@ -899,15 +899,15 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
if (e && obj) {
formActionType ? formActionType.linkageForm({ key: 'loadPortCode', value: obj }) : null
formModel.loadPortId = obj.id
- formModel.loadPort = obj.portName
+ formModel.loadPort = obj.portName + ',' + obj.countryEnName
}
if (!e && !obj) {
formModel.loadPortId = null
formModel.loadPort = null
}
- },
+ }
}
- },
+ }
},
{
label: '卸货港',