10/10

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<DataResult<CurrentUserViewModel>>({
+    url: Api.ExportExcelByColumn,
+    method: 'post',
+    data,
   })
 }
-
 
 /**
  * 上传api路径

src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue

@@ -23,6 +23,10 @@
                 从账单删除
               </a-button>
             </a-popconfirm>
+            <a-button type="link" class="pl0" @click="derivedExcel">
+              <span class="iconfont icon-Excel"></span>
+              导出Excel
+            </a-button>
           </div>
           <div style="position: relative">
             <input
@@ -176,7 +180,7 @@
     ApiAddCtn,
     ApiCalendarList,
   } from './api'
-  import { GetClientListByCode } from '/@/api/common'
+  import { GetClientListByCode, ExportExcelByColumn } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { notification } = useMessage()
   import { useOptionsStore } from '/@/store/modules/options'
@@ -655,7 +659,64 @@
       }
     },
   }
+  function derivedExcel() {
+    // let ApiData = {
+    //   columnSets: [
+    //     {
+    //       title: '姓名',
+    //       enTitle: 'Name',
+    //       dataIndex: 'USERNAME',
+    //       visible: true,
+    //     },
+    //     {
+    //       title: '科目',
+    //       enTitle: 'CLASSNAME',
+    //       dataIndex: 'CLASSNAME',
+    //       visible: true,
+    //     },
+    //     {
+    //       title: '成绩',
+    //       enTitle: 'CHENGJI',
+    //       dataIndex: 'CHENGJI',
+    //       visible: true,
+    //     },
+    //   ],
+    //   jsonDataStr: '[{"USERNAME":"张三","CLASSNAME":"语文","CHENGJI":"123"}]',
+    // }
+    let ApiData: any = {
+      columnSets: [],
+      jsonDataStr: [],
+    }
+    columns.forEach((item, index) => {
+      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) => {

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
         },

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,
     },
     // 控制回车移动

src/views/ContainerManagement/asd.json

@@ -1,47 +1,209 @@
-{
+[
-  "code": 0,
+  {
-  "multiCode": "Data_Query_Success",
+    "documentType": 0,
-  "count": 1,
+    "name": "09031204",
-  "message": "",
+    "title": "<p>09031204[uploading:002715AqwSI-1.jpg]</p>",
-  "succeeded": true,
+    "content": "<p>09031204</p>",
-  "data": [
+    "customerName": "09031204",
-    {
+    "receiver": {
-      "id": "1825815950054789120",
+      "taskMailId": "1830819325448163328",
-      "billno": "ZC240820005",
+      "isCarrier": true,
-      "cntrno": "2",
+      "isBooking": true,
-      "ctnCode": "22G0",
+      "isYard": true,
-      "ctnall": "20GP",
+      "isTruck": false,
-      "ctnSourceId": null,
+      "isController": true,
-      "ctnBizStateId": null,
+      "isShipper": false,
-      "isOnlineId": 0,
+      "isConsignee": false,
-      "ctnStateId": null,
+      "isShipperCn": false
-      "ctnFlowStateId": null,
+    },
-      "ctnOwnerId": null,
+    "sender": {
-      "ctnOwner": null,
+      "taskMailId": "1830819325448163328",
-      "rentCustomerId": "",
+      "isOperator": true,
-      "rentCustomerName": null,
+      "isVouchingClerk": true,
-      "rentDirectId": 2,
+      "isSale": true,
-      "rentTypeId": 1,
+      "isCustomerService": false
-      "bsdate": "2024-08-07 00:00:00",
+    },
-      "feeStartDate": "2024-08-14 00:00:00",
+    "cc": {
-      "currency": "HKD",
+      "taskMailId": "1830819325448163328",
-      "dailyRate": 1.0,
+      "isOperator": true,
-      "pickupFee": 2.0,
+      "isVouchingClerk": true,
-      "pickupDate": "2024-08-06 00:00:00",
+      "isSale": true,
-      "dropoffFee": 2.0,
+      "isCustomerService": false
-      "dropoffDate": "2024-08-14 00:00:00",
+    },
-      "rentalPortid": "1816306937097228288",
+    "attachments": null,
-      "rentalPortCode": "CNTAO",
+    "orgId": "1819557001806614528",
-      "rentalPort": "QINGDAO,CHINA",
+    "isShared": false,
-      "pickupPortid": "1795717773662490624",
+    "id": "1830819325448163328",
-      "pickupPortCode": "1212",
+    "note": "123123",
-      "pickupPort": "Test001",
+    "createTime": "2024-09-03 12:05:17",
-      "dropoffPortid": "1816306937097228288",
+    "createBy": "1819549542463442944",
-      "dropoffPortCode": "CNTAO",
+    "updateBy": "1819549542463442944",
-      "dropoffPort": "QINGDAO,CHINA",
+    "updateTime": "2024-10-10 09:35:28",
-      "mblno": "2",
+    "deleted": false,
-      "vesselVoyno": "2"
+    "deleteTime": null,
-    }
+    "deleteBy": null,
-  ],
+    "createUserName": "东胜8测试",
-  "additionalData": null
+    "updateUserName": "东胜8测试",
-}
+    "deleteUserName": null
+  },
+  {
+    "documentType": 0,
+    "name": "09031109",
+    "title": "<p>09031109</p>",
+    "content": "<p>09031109</p>",
+    "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<style>\r\n    .parent {\r\n        position: relative;\r\n        height: 300px;\r\n        width: 300px;\r\n    }\r\n\r\n    .child {\r\n        position: absolute;\r\n        bottom: 0;\r\n        right: 0;\r\n        width: 50px;\r\n        height: 50px;\r\n    }\r\n</style>\r\n\r\n<h1>测试邮件-@item.MBLNO<span style=\"padding: 2px\"></span>@item.CustomerNo</h1>\r\n\r\n<div>\r\n    <span>预计开船日期：@item.ETD</span>\r\n    <span>预计抵达日期：@item.ETA</span>\r\n</div>\r\n<hr />\r\n<div>\r\n    <span>订单创建时间：@item.CreateTime.ToString(\"yyyy年MM月dd日 HH:mm:ss\")</span>\r\n</div>\r\n\r\n<div class=\"parent\">\r\n    <div id=\"sign\" class=\"child\"></div>\r\n</div>",
+    "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<style>\r\n    body {\r\n        background-color: navy;\r\n        color: whitesmoke;\r\n    }\r\n\r\n    .auto-msg {\r\n        font-size: 11px;\r\n        color: darkred;\r\n    }\r\n\r\n    .parent {\r\n        position: relative;\r\n        height: 300px;\r\n        width: 300px;\r\n    }\r\n\r\n    .child {\r\n        position: absolute;\r\n        bottom: 0;\r\n        right: 0;\r\n        width: 50px;\r\n        height: 50px;\r\n    }\r\n</style>\r\n\r\n<span class=\"auto-msg\">本邮件由系统发出，请勿回复原发件人，任何问题请联系您的订单客服/操作沟通处理！</span>\r\n\r\n<div class=\"content\">\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    <br />\r\n    备注：\r\n    @item.YardInfo.Remark\r\n    <br />\r\n    重要事项--温馨提醒：\r\n    =======================\r\n    <ul style=\"list-style-type:circle\">\r\n        <li>\r\n            您准备什么时候用箱？用箱前先问场站/堆场有没有箱子，别跑空；\r\n            货物超20吨以上请提醒司机背加重箱，装货时注意毛重+箱皮重不能超过箱门上MAX 最大承载量；\r\n        </li>\r\n        <li>\r\n            舱单报关是否都由贵司自己负责？如果需要我们安排，请回复邮件告知；\r\n        </li>\r\n        <li>\r\n            提单样本&VGM表格稍后发您，提单确认件如有更改请标红回传，告知签单方式；\r\n            VGM表格请填写完整, 原则上需在截单前2小时发给我们！\r\n        </li>\r\n        <li>\r\n            截单时请提供准确的HS CODE；\r\n        </li>\r\n    </ul>\r\n</div>\r\n\r\n@* 只有目的港为巴西的订单才带下面这两条（是否可以根据船公司不同，可选择不同的内容） *@\r\n@if (item.DischargePortCountry == \"巴西\")\r\n{\r\n    <div>\r\n        巴西货物需在截单的同时提供NCM NO. 和收货人的CNPJ 号码；若您没有，早点跟收货人去要一下吧！\r\n        出口到巴西必须显示木质包装条款，请选择一项并显示在提单品名下方：\r\n        <ul>\r\n            <li>WOODEN PACKING: PROCESSED WOOD （类似于三合板、胶合板、复合板的材质，加工木制衍生品）</li>\r\n            <li>WOODEN PACKING: TREATED AND CERTIFIED（熏蒸处理过的，有熏蒸证书）</li>\r\n            <li>WOODEN PACKING: NOT TREATED AND NOT CERTIFIED（未熏蒸、未处理过的，不被允许出口）</li>\r\n            <li>WOODEN PACKING: NOT APPLICABLE (无任何木质包装)</li>\r\n        </ul>\r\n    </div>\r\n}\r\n\r\n<span>\r\n    盼复!<br />\r\n\r\n    此票订单昭阳对接联系人如下，有任何问题请第一时间跟我们取得联系：\r\n</span>\r\n<table>\r\n    <thead>\r\n        <tr>\r\n            <th>姓名\t</th>\r\n            <th>英文名</th>\r\n            <th>直拨电话</th>\r\n            <th>手机\tQQ</th>\r\n            <th>Email</th>\r\n            <th>分工</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n        <tr>\r\n            <td>邵 芳</td>\r\n            <td>Candy</td>\r\n            <td>0532-80688387</td>\r\n            <td>13375570007\t2853083550</td>\r\n            <td>candy@sunniness.net</td>\r\n            <td>销售</td>\r\n        </tr>\r\n        <tr>\r\n            <td>王波</td>\r\n            <td>Andy</td>\r\n            <td>0532-80688383</td>\r\n            <td>13687699592\t2853083556</td>\r\n            <td>opd@sunniness.net</td>\r\n            <td>客服</td>\r\n        </tr>\r\n        <tr>\r\n            <td>董娜娜</td>\r\n            <td>Winnie</td>\r\n            <td>0532-80688359</td>\r\n            <td>15964962712\t2355578923</td>\r\n            <td>opa@sunniness.net</td>\r\n            <td>操作</td>\r\n        </tr>\r\n    </tbody>\r\n</table>\r\n\r\n\r\n<div class=\"footer\">\r\n    Tks + B’rgds\r\n    IT ROBERT\r\n    SUNNINESS LOGISTICS CO.,LTD.\r\n</div>\r\n\r\n\r\n<div class=\"parent\">\r\n    <div id=\"sign\" class=\"child\"></div>\r\n</div>",
+    "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<style>\r\n    .parent {\r\n        position: relative;\r\n        height: 300px;\r\n        width: 300px;\r\n    }\r\n\r\n    .child {\r\n        position: absolute;\r\n        bottom: 0;\r\n        right: 0;\r\n        width: 50px;\r\n        height: 50px;\r\n    }\r\n\r\n    .title {\r\n        background-color: darkblue;\r\n        color: whitesmoke;\r\n        font-size: 20px;\r\n        font-weight: 300;\r\n    }\r\n</style>\r\n\r\n<span>*** 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! ***</span>\r\n\r\nDear @Model.Contacts\r\n\r\n<div class=\"title\">\r\n    RE: BOOKING - JOB NO.\r\n</div>\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<table>\r\n    <thead>\r\n        <tr>\r\n            <th>CN Name</th>\r\n            <th>Name</th>\r\n            <th>Tel No.</th>\r\n            <th>Mobile/Wechat/QQ</th>\r\n            <th>Email</th>\r\n            <th>Position</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n        <tr>\r\n            <td>邵 芳</td>\r\n            <td>Candy</td>\r\n            <td>0532-80688387</td>\r\n            <td>13375570007\t2853083550</td>\r\n            <td>candy@sunniness.net</td>\r\n            <td>Cooperation</td>\r\n        </tr>\r\n        <tr>\r\n            <td>魏涛</td>\r\n            <td>Wilson</td>\r\n            <td>0532-80688353</td>\r\n            <td>13969858993\t2853083555</td>\r\n            <td>ope@sunniness.net</td>\r\n            <td>OP manager</td>\r\n        </tr>\r\n        <tr>\r\n            <td>徐平平</td>\r\n            <td>Cathy</td>\r\n            <td>0532-80688350</td>\r\n            <td>13969662965\t2853083551</td>\r\n            <td>opg@sunniness.net</td>\r\n            <td>Document</td>\r\n        </tr>\r\n    </tbody>\r\n</table>\r\n\r\n<div class=\"parent\">\r\n    <div id=\"sign\" class=\"child\">\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    </div>\r\n</div>\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
+  }
+]