From 8f96b7083db903e47658e6d29a3c424c3cf50771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Thu, 10 Oct 2024 09:43:32 +0800 Subject: [PATCH 1/3] 10/10 --- .../TaskMail/TenantAuditStepModal.vue | 4 +- src/views/baseinfo/TaskMail/columns.tsx | 17 ++++- .../infoclient/FeeCustTemplate/columns.tsx | 70 +++++++++---------- src/views/fee/FeeCustTemplate/columns.tsx | 70 +++++++++---------- 4 files changed, 87 insertions(+), 74 deletions(-) diff --git a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue index 933b8008..7eb49f5a 100644 --- a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue +++ b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue @@ -73,8 +73,6 @@ }) const DiyFieldIdS = ref([]) function linkageForm(data) { - console.log(data, 11111111) - // 清楚所有添加的Schema if (DiyFieldIdS.value.length) { DiyFieldIdS.value.forEach((item) => { @@ -84,6 +82,7 @@ } DiyFieldIdS.value.splice(0) + console.log(data, 11111111) data.forEach((item) => { appendSchemaByField( [ @@ -325,6 +324,7 @@ label: element.templateName, }) DiyFieldIdSObj[e.templateId] = e.fileName + DiyFieldIdSObj[`${e.templateId}-fileType`] = e.fileType } }) }) diff --git a/src/views/baseinfo/TaskMail/columns.tsx b/src/views/baseinfo/TaskMail/columns.tsx index 112243c3..d5ef43ed 100644 --- a/src/views/baseinfo/TaskMail/columns.tsx +++ b/src/views/baseinfo/TaskMail/columns.tsx @@ -208,8 +208,8 @@ export const formSchema: FormSchema[] = [ mode: 'multiple', class: 'NoLimitHeight', onChange: (e, obj) => { - if (formModel && formModel.id) { - console.log(formModel.id) + if (formModel && formModel.id && obj) { + console.log(formModel.id, e, obj) let DelData: any = [] if (formModel.attachments.length) { @@ -355,6 +355,19 @@ export const ReceiverformSchema: FormSchema[] = [ unCheckedValue: false, }, }, + { + field: 'isShipperCn', + label: '是否国内发货人', + component: 'Switch', + colProps: { span: 6 }, + defaultValue: false, + componentProps: { + checkedChildren: '是', + checkedValue: true, + unCheckedChildren: '否', + unCheckedValue: false, + }, + }, ] export const SenderformSchema: FormSchema[] = [ { diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx index cab2d1c1..d3aef981 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [ width: 120, }, { - title: '费用对象', + title: '客户名称', dataIndex: 'customerName', width: 200, }, @@ -223,7 +223,7 @@ export const formSchema: FormSchema[] = [ // }, { field: 'customerId', - label: '费用对象', + label: '客户名称', defaultValue: '', component: 'Input', show: false, @@ -231,44 +231,44 @@ export const formSchema: FormSchema[] = [ }, { field: 'customerName', - label: '费用对象', + label: '客户名称', component: 'Input', defaultValue: '', dynamicDisabled: true, colProps: { span: 6 }, }, - { - field: 'customerType', - label: '费用对象类别', - defaultValue: '', - component: 'ApiSelect', - colProps: { span: 6 }, - componentProps: ({ formModel }) => { - return { - api: () => { - return new Promise((resolve) => { - getDictOption('djy_cust_prop').then((res) => { - resolve(res) - }) - }) - }, - labelField: 'label', - valueField: 'value', - resultField: 'data', - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - } - }, - dynamicRules: ({ values }) => { - return [ - { - required: values.customerId ? false : true, - message: '未选择费用对象时,此项必填！', - }, - ] - }, - }, + // { + // field: 'customerType', + // label: '客户名称类别', + // defaultValue: '', + // component: 'ApiSelect', + // colProps: { span: 6 }, + // componentProps: ({ formModel }) => { + // return { + // api: () => { + // return new Promise((resolve) => { + // getDictOption('djy_cust_prop').then((res) => { + // resolve(res) + // }) + // }) + // }, + // labelField: 'label', + // valueField: 'value', + // resultField: 'data', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // dynamicRules: ({ values }) => { + // return [ + // { + // required: values.customerId ? false : true, + // message: '未选择客户名称时,此项必填！', + // }, + // ] + // }, + // }, // { // label: '', // field: 'customerId', diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx index 66500292..d8784798 100644 --- a/src/views/fee/FeeCustTemplate/columns.tsx +++ b/src/views/fee/FeeCustTemplate/columns.tsx @@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [ width: 120, }, { - title: '费用对象', + title: '客户名称', dataIndex: 'customerName', width: 200, }, @@ -243,7 +243,7 @@ export const formSchema: FormSchema[] = [ // }, { field: 'customerName', - label: '费用对象', + label: '客户名称', defaultValue: '', component: 'Input', show: false, @@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'customerId', - label: '费用对象', + label: '客户名称', component: 'ApiSelect', required: false, dynamicDisabled: false, @@ -277,38 +277,38 @@ export const formSchema: FormSchema[] = [ } }, }, - { - field: 'customerType', - label: '费用对象类别', - defaultValue: '', - component: 'ApiSelect', - colProps: { span: 6 }, - componentProps: ({ formModel }) => { - return { - api: () => { - return new Promise((resolve) => { - getDictOption('djy_cust_prop').then((res) => { - resolve(res) - }) - }) - }, - labelField: 'label', - valueField: 'value', - resultField: 'data', - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - } - }, - dynamicRules: ({ values }) => { - return [ - { - required: values.customerId ? false : true, - message: '未选择费用对象时,此项必填！', - }, - ] - }, - }, + // { + // field: 'customerType', + // label: '客户名称类别', + // defaultValue: '', + // component: 'ApiSelect', + // colProps: { span: 6 }, + // componentProps: ({ formModel }) => { + // return { + // api: () => { + // return new Promise((resolve) => { + // getDictOption('djy_cust_prop').then((res) => { + // resolve(res) + // }) + // }) + // }, + // labelField: 'label', + // valueField: 'value', + // resultField: 'data', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // dynamicRules: ({ values }) => { + // return [ + // { + // required: values.customerId ? false : true, + // message: '未选择客户名称时,此项必填！', + // }, + // ] + // }, + // }, // { // label: '', // field: 'customerId', From 9037cdea25e24fd7569d4aa33eac4ac9243b859d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Thu, 10 Oct 2024 16:55:37 +0800 Subject: [PATCH 2/3] 10/10 --- src/api/common/index.ts | 19 +- .../CustFeeDui/TenantAuditStepModal.vue | 63 ++++- .../CustFeeDui/columns.tsx | 4 +- .../TemplatImport/TenantAuditStepModal.vue | 12 +- src/views/ContainerManagement/asd.json | 256 ++++++++++++++---- 5 files changed, 297 insertions(+), 57 deletions(-) diff --git a/src/api/common/index.ts b/src/api/common/index.ts index c3f003ba..f0f2a6fc 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -96,7 +96,9 @@ enum Api { // 获取所有往来单位下拉列表 (Auth) GetAllClientList = '/mainApi/ClientCommon/GetAllClientList', // 获取往来单位银行信息下拉 - GetClientBank = '/mainApi/ClientCommon/GetClientBank' + GetClientBank = '/mainApi/ClientCommon/GetClientBank', + // 根据用户列导出Excel文件流 (Auth) + ExportExcelByColumn = '/mainApi/Excel/ExportExcelByColumn', } // 所有往来单位下拉数据 export function GetAllClientList(params) { @@ -105,7 +107,6 @@ export function GetAllClientList(params) { method: 'get', params, }) - } // 用户下拉数据 export function GetUserList(params) { @@ -499,14 +500,14 @@ export function GetFormSetListByModule(params) { return request({ url: Api.GetFormSetListByModule, method: 'get', - params + params, }) } export function GetFormSetInfoByModule(params) { return request({ url: Api.GetFormSetInfoByModule, method: 'get', - params + params, }) } @@ -514,10 +515,16 @@ export function GetClientBank(params) { return request({ url: Api.GetClientBank, method: 'get', - params + params, + }) +} +export function ExportExcelByColumn(data: LoginParams) { + return request>({ + url: Api.ExportExcelByColumn, + method: 'post', + data, }) } - /** * 上传api路径 diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 8c5ea509..86f2af2b 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -23,6 +23,10 @@ 从账单删除 + + + 导出Excel +
{ + if (!settings.hiddenColumns.columns.includes(index) && item?.type != 'checkbox') { + ApiData.columnSets.push({ + title: item.title, + enTitle: item.data, + dataIndex: item.data, + visible: true, + }) + if (item.title == '开始日期') { + ApiData.columnSets.push({ + title: 'OWNER', + enTitle: 'OWNER', + dataIndex: 'OWNER', + visible: true, + }) + } + } + }) + list.value.forEach((item) => { + ApiData.jsonDataStr.push({ + ...item, + OWNER: getFieldsValue().customerName, + }) + }) + ApiData.jsonDataStr = JSON.stringify(ApiData.jsonDataStr) + ExportExcelByColumn(ApiData).then((res) => { + console.log(res) + }) + } function FnClickDel() { let ApiData: any = { ids: [] } list.value.forEach((e: any, i) => { diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx index 73f71953..0c8121c5 100644 --- a/src/views/ContainerManagement/CustFeeDui/columns.tsx +++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx @@ -145,7 +145,7 @@ export const searchFormSchema: FormSchema[] = [ showName: 'shortName', valueField: 'shortName', resultField: 'data', - immediate: false, + immediate: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -246,7 +246,7 @@ export const formSchema: FormSchema[] = [ showName: 'shortName', valueField: 'id', resultField: 'data', - immediate: false, + immediate: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue index 4af9fb5f..bc9f9e32 100644 --- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue @@ -373,6 +373,16 @@ width: 120, data: 'port', }, + { + title: '是否上线', + width: 120, + data: 'isOnline', + }, + { + title: '当前箱业务状态', + width: 120, + data: 'ctnBizState', + }, { title: 'DEPOT/TEIMINAL', width: 120, @@ -394,7 +404,7 @@ fixedColumnsLeft: 1, // 需要隐藏的列 hiddenColumns: { - columns: [1, 2], + columns: [1], indicators: true, }, // 控制回车移动 diff --git a/src/views/ContainerManagement/asd.json b/src/views/ContainerManagement/asd.json index d2e8bbbd..1b2bc212 100644 --- a/src/views/ContainerManagement/asd.json +++ b/src/views/ContainerManagement/asd.json @@ -1,47 +1,209 @@ -{ - "code": 0, - "multiCode": "Data_Query_Success", - "count": 1, - "message": "", - "succeeded": true, - "data": [ - { - "id": "1825815950054789120", - "billno": "ZC240820005", - "cntrno": "2", - "ctnCode": "22G0", - "ctnall": "20GP", - "ctnSourceId": null, - "ctnBizStateId": null, - "isOnlineId": 0, - "ctnStateId": null, - "ctnFlowStateId": null, - "ctnOwnerId": null, - "ctnOwner": null, - "rentCustomerId": "", - "rentCustomerName": null, - "rentDirectId": 2, - "rentTypeId": 1, - "bsdate": "2024-08-07 00:00:00", - "feeStartDate": "2024-08-14 00:00:00", - "currency": "HKD", - "dailyRate": 1.0, - "pickupFee": 2.0, - "pickupDate": "2024-08-06 00:00:00", - "dropoffFee": 2.0, - "dropoffDate": "2024-08-14 00:00:00", - "rentalPortid": "1816306937097228288", - "rentalPortCode": "CNTAO", - "rentalPort": "QINGDAO,CHINA", - "pickupPortid": "1795717773662490624", - "pickupPortCode": "1212", - "pickupPort": "Test001", - "dropoffPortid": "1816306937097228288", - "dropoffPortCode": "CNTAO", - "dropoffPort": "QINGDAO,CHINA", - "mblno": "2", - "vesselVoyno": "2" - } - ], - "additionalData": null -} +[ + { + "documentType": 0, + "name": "09031204", + "title": "

09031204[uploading:002715AqwSI-1.jpg]

", + "content": "

09031204

", + "customerName": "09031204", + "receiver": { + "taskMailId": "1830819325448163328", + "isCarrier": true, + "isBooking": true, + "isYard": true, + "isTruck": false, + "isController": true, + "isShipper": false, + "isConsignee": false, + "isShipperCn": false + }, + "sender": { + "taskMailId": "1830819325448163328", + "isOperator": true, + "isVouchingClerk": true, + "isSale": true, + "isCustomerService": false + }, + "cc": { + "taskMailId": "1830819325448163328", + "isOperator": true, + "isVouchingClerk": true, + "isSale": true, + "isCustomerService": false + }, + "attachments": null, + "orgId": "1819557001806614528", + "isShared": false, + "id": "1830819325448163328", + "note": "123123", + "createTime": "2024-09-03 12:05:17", + "createBy": "1819549542463442944", + "updateBy": "1819549542463442944", + "updateTime": "2024-10-10 09:35:28", + "deleted": false, + "deleteTime": null, + "deleteBy": null, + "createUserName": "东胜8测试", + "updateUserName": "东胜8测试", + "deleteUserName": null + }, + { + "documentType": 0, + "name": "09031109", + "title": "

09031109

", + "content": "

09031109

", + "customerName": "09031109", + "receiver": { + "taskMailId": "1830805307715096576", + "isCarrier": true, + "isBooking": true, + "isYard": true, + "isTruck": true, + "isController": true, + "isShipper": false, + "isConsignee": false, + "isShipperCn": false + }, + "sender": { + "taskMailId": "1830805307715096576", + "isOperator": true, + "isVouchingClerk": true, + "isSale": true, + "isCustomerService": true + }, + "cc": { + "taskMailId": "1830805307715096576", + "isOperator": true, + "isVouchingClerk": true, + "isSale": true, + "isCustomerService": true + }, + "attachments": null, + "orgId": "1819557001806614528", + "isShared": false, + "id": "1830805307715096576", + "note": null, + "createTime": "2024-09-03 11:09:35", + "createBy": "1819549542463442944", + "updateBy": "1819549542463442944", + "updateTime": "2024-09-24 17:05:57", + "deleted": false, + "deleteTime": null, + "deleteBy": null, + "createUserName": "东胜8测试", + "updateUserName": "东胜8测试", + "deleteUserName": null + }, + { + "documentType": 0, + "name": null, + "title": "测试邮件标题", + "content": "@{\r\n var item = Model.Primary;\r\n}\r\n\r\n\r\n\r\n

测试邮件-@item.MBLNO@item.CustomerNo

\r\n\r\n
\r\n 预计开船日期：@item.ETD\r\n 预计抵达日期：@item.ETA\r\n
\r\n
\r\n
\r\n 订单创建时间：@item.CreateTime.ToString(\"yyyy年MM月dd日 HH:mm:ss\")\r\n
\r\n\r\n
\r\n
\r\n
", + "customerName": null, + "receiver": null, + "sender": null, + "cc": null, + "attachments": null, + "orgId": "1819557001806614528", + "isShared": false, + "id": "1821103162266882049", + "note": null, + "createTime": "2024-08-07 16:36:43", + "createBy": "1819549542463442944", + "updateBy": null, + "updateTime": null, + "deleted": false, + "deleteTime": null, + "deleteBy": null, + "createUserName": "东胜8测试", + "updateUserName": null, + "deleteUserName": null + }, + { + "documentType": 0, + "name": "入货通知", + "title": "BC-[@Model.Primary.CustomerNo] @Model.Primary.CustomerNum|| @Model.Primary.CntrTotal FM @Model.Primary.LoadPort TO @Model.Primary.DischargePort ETD:@Model.Primary.ETD?.ToString(\"yy.MM.dd\") ETA:@Model.Primary.ETA?.ToString(\"yy.MM.dd\") || @Model.Primary.Carrier || B/L:@Model.Primary.MBLNO", + "content": "@{ var item = Model.Primary; }\r\n\r\n\r\n\r\n本邮件由系统发出，请勿回复原发件人，任何问题请联系您的订单客服/操作沟通处理！\r\n\r\n
\r\n Dear 联系人名\r\n\r\n 您委托我司代理的业务，具体订舱详情如下，请查阅附件中的入货通知：\r\n\r\n Booking Confirmation -@item.CustomerNo||@item.CustomerNum\r\n ===============\r\n 提 单 号：@item.MBLNO\r\n 船名航次：@item.Vessel @item.Voyno\r\n\r\n 起 运 港：@item.LoadPort\r\n 目 的 港：@item.DischargePort\r\n 交 货 地：@item.DeliveryPlace\r\n 箱型箱量：@item.CntrTotal\r\n\r\n 预计开船：@item.ETD\r\n 预计到港：@item.ETA\r\n 截单时间：@item.CloseDocDate?.ToString(\"yyyy-MM-dd HH:mm:ss\")\r\n 截港时间：@item.ClosingDate?.ToString(\"yyyy-MM-dd HH:mm:ss\") 提醒：实际截港/截关时间以码头计划为准；\r\n\r\n 船 公 司：@item.Carrier\r\n 船 代：@item.ShipAgency\r\n Free Time：@item.ApplyCtnRemark\r\n
\r\n 备注：\r\n @item.YardInfo.Remark\r\n
\r\n 重要事项--温馨提醒：\r\n =======================\r\n
    \r\n
  • \r\n 您准备什么时候用箱？用箱前先问场站/堆场有没有箱子，别跑空；\r\n 货物超20吨以上请提醒司机背加重箱，装货时注意毛重+箱皮重不能超过箱门上MAX 最大承载量；\r\n
    • \r\n
  • \r\n 舱单报关是否都由贵司自己负责？如果需要我们安排，请回复邮件告知；\r\n
    • \r\n
  • \r\n 提单样本&VGM表格稍后发您，提单确认件如有更改请标红回传，告知签单方式；\r\n VGM表格请填写完整, 原则上需在截单前2小时发给我们！\r\n
    • \r\n
  • \r\n 截单时请提供准确的HS CODE；\r\n
    • \r\n
\r\n
\r\n\r\n@* 只有目的港为巴西的订单才带下面这两条（是否可以根据船公司不同，可选择不同的内容） *@\r\n@if (item.DischargePortCountry == \"巴西\")\r\n{\r\n
\r\n 巴西货物需在截单的同时提供NCM NO. 和收货人的CNPJ 号码；若您没有，早点跟收货人去要一下吧！\r\n 出口到巴西必须显示木质包装条款，请选择一项并显示在提单品名下方：\r\n
    \r\n
  • WOODEN PACKING: PROCESSED WOOD （类似于三合板、胶合板、复合板的材质，加工木制衍生品）
    • \r\n
  • WOODEN PACKING: TREATED AND CERTIFIED（熏蒸处理过的，有熏蒸证书）
    • \r\n
  • WOODEN PACKING: NOT TREATED AND NOT CERTIFIED（未熏蒸、未处理过的，不被允许出口）
    • \r\n
  • WOODEN PACKING: NOT APPLICABLE (无任何木质包装)
    • \r\n
\r\n
\r\n}\r\n\r\n\r\n 盼复!
\r\n\r\n 此票订单昭阳对接联系人如下，有任何问题请第一时间跟我们取得联系：\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
姓名\t英文名直拨电话手机\tQQEmail分工
邵 芳Candy0532-8068838713375570007\t2853083550candy@sunniness.net销售
王波Andy0532-8068838313687699592\t2853083556opd@sunniness.net客服
董娜娜Winnie0532-8068835915964962712\t2355578923opa@sunniness.net操作
\r\n\r\n\r\n
\r\n Tks + B’rgds\r\n IT ROBERT\r\n SUNNINESS LOGISTICS CO.,LTD.\r\n
\r\n\r\n\r\n
\r\n
\r\n
", + "customerName": null, + "receiver": { + "taskMailId": "1821103162266882002", + "isCarrier": false, + "isBooking": false, + "isYard": true, + "isTruck": false, + "isController": false, + "isShipper": false, + "isConsignee": false, + "isShipperCn": false + }, + "sender": { + "taskMailId": "1821103162266882002", + "isOperator": true, + "isVouchingClerk": false, + "isSale": false, + "isCustomerService": false + }, + "cc": { + "taskMailId": "1821103162266882002", + "isOperator": false, + "isVouchingClerk": false, + "isSale": false, + "isCustomerService": false + }, + "attachments": null, + "orgId": "1819557001806614528", + "isShared": false, + "id": "1821103162266882002", + "note": null, + "createTime": "2024-08-07 16:36:43", + "createBy": "1819549542463442944", + "updateBy": "1819549542463442944", + "updateTime": "2024-09-23 16:04:06", + "deleted": false, + "deleteTime": null, + "deleteBy": null, + "createUserName": "东胜8测试", + "updateUserName": "东胜8测试", + "deleteUserName": null + }, + { + "documentType": 1, + "name": "订舱委托", + "title": "Booking--@Model.Primary.CustomerNo || @Model.Primary.CntrTotal FM @Model.Primary.LoadPort TO @Model.Primary.DischargePort || ETD:@Model.Primary.ETD?.ToString(\"MM-dd\") || @Model.Primary.Carrier || @Model.Primary.CustomerNum", + "content": "@{\r\n var item = Model.Primary;\r\n}\r\n\r\n\r\n\r\n*** Auto Email, please reply to all (delete sender Admin)!If only reply to sender, we will not be able to find and deal with it! ***\r\n\r\nDear @Model.Contacts\r\n\r\n
\r\n RE: BOOKING - JOB NO.\r\n
\r\n\r\n请查看附件中的订舱委托，请2小时内先行回复订舱号给我们，并帮忙催促船东尽快放舱，如下信息同订舱委托一致，便于您查阅！\r\n\r\nCARRIER：@item.Carrier\r\nS/Q：XX\r\nETD : @item.ETD\r\n\r\nPOL: @item.LoadPort\r\nPOD: @item.DischargePort\r\nFPOD: @item.DeliveryPlace\r\nVOL: XX\r\nCommdity: XX（取中文品名）\r\nHS CODE: @item.HSCode\r\nPOD FREE TIME：\r\nREMARK：\r\n(取供应商备注)\r\n\r\n\r\n此票订舱我司对接同事的联系方式如下，任何问题请及时跟我们沟通，谢谢！\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
CN NameNameTel No.Mobile/Wechat/QQEmailPosition
邵 芳Candy0532-8068838713375570007\t2853083550candy@sunniness.netCooperation
魏涛Wilson0532-8068835313969858993\t2853083555ope@sunniness.netOP manager
徐平平Cathy0532-8068835013969662965\t2853083551opg@sunniness.netDocument
\r\n\r\n
\r\n
\r\n @* Tks + B’rgds\r\n Candy SHAO 邵芳 (此处用当票操作的信息)\r\n General Manager | SUNNINESS LOGISTICS CO.,LTD.\r\n TEL: +86-0532-80688387 |MB./We chat: +86-18866622731|QQ:2853083553 | Email:candy@sunniness.net *@\r\n
\r\n
\r\n\r\n@* 此邮件模板是订舱委托推送的邮件模板，在商务订单审核通过后，自动生成，并推送：\r\n1）蓝色是调取系统数据、红色是醒目提醒；\r\n2）订舱委托PDF格式作为附件一起发出\r\n3）邮件发给订舱代理联系人，抄送我司销售/客服和操作/单证；未勾选推送的订舱代理，仅推送我司干系人！ *@\r\n\r\n", + "customerName": null, + "receiver": { + "taskMailId": "1821103162266882001", + "isCarrier": false, + "isBooking": true, + "isYard": false, + "isTruck": false, + "isController": false, + "isShipper": false, + "isConsignee": false, + "isShipperCn": false + }, + "sender": { + "taskMailId": "1821103162266882001", + "isOperator": true, + "isVouchingClerk": false, + "isSale": false, + "isCustomerService": false + }, + "cc": null, + "attachments": null, + "orgId": "1819557001806614528", + "isShared": false, + "id": "1821103162266882001", + "note": null, + "createTime": "2024-08-07 16:36:43", + "createBy": "1819549542463442944", + "updateBy": null, + "updateTime": null, + "deleted": false, + "deleteTime": null, + "deleteBy": null, + "createUserName": "东胜8测试", + "updateUserName": null, + "deleteUserName": null + } +] From a3f2e3830e2b00151afbda92312f704cb8a2d9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Thu, 10 Oct 2024 16:58:36 +0800 Subject: [PATCH 3/3] 10/10 --- .../ContainerManagement/CustFeeDui/TenantAuditStepModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 86f2af2b..85caeea9 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -23,10 +23,10 @@ 从账单删除 - +