Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/store/modules/configOptions.ts

@@ -23,10 +23,17 @@ import {
   GetDispatcherList,
   GetFactorySelectList,
   GetCodeCountryList,
-  GetClientGoodsList
+  GetClientGoodsList,
+  GetYardClientList,
+  GetControllerClientList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
 import { getList } from '/@/views/flowcenter/flowInstances/api'
-import { GetFeeCurrencySelectList, GetClientListByCode, GetCtnSelectList, GetTenantParamSelectList } from '/@/api/common/index'
+import {
+  GetFeeCurrencySelectList,
+  GetClientListByCode,
+  GetCtnSelectList,
+  GetTenantParamSelectList,
+} from '/@/api/common/index'
 import { getClientBankList } from '/@/views/baseinfo/infoclient/api'
 export default {
   // 业务来源
@@ -83,8 +90,8 @@ export default {
       return res.data
     })
   },
-   // 销售
+  // 销售
-   GetSaleUserList: () => {
+  GetSaleUserList: () => {
     return GetSaleUserList().then((res) => {
       return res.data
     })
@@ -190,4 +197,16 @@ export default {
       return res.data
     })
   },
+  // 场站
+  GetYardClientList: () => {
+    return GetYardClientList().then((res) => {
+      return res.data
+    })
+  },
+  // 委托单位
+  GetControllerClientList: () => {
+    return GetControllerClientList().then((res) => {
+      return res.data
+    })
+  },
 }

src/store/modules/options.ts

@@ -28,7 +28,7 @@ export const useOptionsStore = defineStore({
     GetCustomerServiceList: null,
     // 单证
     GetVouchingClerkList: null,
-     // 销售
+    // 销售
     GetSaleUserList: null,
     // 收货地/签单地/预付地点/到付地点/装货港/中转港/卸货港/目的地/交货地
     GetClientPortSelectList: null,
@@ -62,6 +62,10 @@ export const useOptionsStore = defineStore({
     GetTenantParamSelectList: null,
     // 商品
     GetClientGoodsList: null,
+    //场站
+    GetYardClientList: null,
+    //委托单位
+    GetControllerClientList: null,
   }),
   getters: {
     // 通过code获取下拉字典（code)就是接口尾部单词
@@ -79,7 +83,7 @@ export const useOptionsStore = defineStore({
     //异步处理获取下拉字典
     getOptionsByCodeAsync: (store) => (code) => {
       if (store.$state[code] !== null) {
-        return Promise.resolve(store.$state[code]);
+        return Promise.resolve(store.$state[code])
       } else {
         return store.setOptionsByCode(code)
       }

src/views/ContainerManagement/CurrentState/columns.tsx

@@ -1,7 +1,27 @@
+import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList } from '/@/api/common'
 import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger'
+import { useOptionsStore } from '/@/store/modules/options'
+const optionsStore = useOptionsStore()
+// 字典
+import { getDictOption } from '/@/utils/dictUtil'
+// 新旧箱数据
+const usedStateList = [
+  {
+    label: '',
+    value: '',
+  },
+  {
+    label: 'used',
+    value: 'used',
+  },
+  {
+    label: 'new',
+    value: 'new',
+  },
+]
 export const columns: BasicColumn[] = [
   {
     title: '集装箱号',
@@ -16,8 +36,14 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '集装箱类型',
+    title: '是否上线',
-    dataIndex: 'ctnType',
+    dataIndex: 'isOnline',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '变动来源',
+    dataIndex: 'changeSource',
     sorter: true,
     width: 200,
   },
@@ -75,12 +101,6 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
-  {
-    title: '是否上线',
-    dataIndex: 'isOnline',
-    sorter: true,
-    width: 200,
-  },
   {
     title: '空重箱',
     dataIndex: 'isHeavy',
@@ -131,7 +151,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '状态时间',
-    dataIndex: 'stateTime',
+    dataIndex: 'changeTime',
     sorter: true,
     width: 200,
   },
@@ -194,27 +214,70 @@ export const formSchema: FormSchema[] = [
   {
     field: 'isOnline',
     label: '是否上线',
-    component: 'RadioButtonGroup',
+    component: 'ApiSelect',
-    defaultValue: true,
     colProps: { span: 6 },
-    componentProps: {
+    defaultValue: '',
-      options: [
+    componentProps: ({ formModel }) => {
-        { label: '是', value: true },
+      return {
-        { label: '否', value: false },
+        api: () => {
-      ],
+          return new Promise((resolve) => {
+            getDictOption('CM_IsOnlineEnum').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (v, obj) => {
+          formModel.defaultDebitName = obj?.label || ''
+        },
+      }
     },
   },
   {
     field: 'changeSource',
     label: '变动来源',
-    component: 'Input',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('CM_ChangeSource').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (v, obj) => {
+          formModel.defaultDebitName = obj?.label || ''
+        },
+      }
+    },
   },
   {
     field: 'usedState',
     label: '新旧箱',
-    component: 'Input',
+    component: 'Select',
     colProps: { span: 6 },
+    componentProps: {
+      options: usedStateList,
+      allowClear: true,
+      showSearch: true,
+      filterOption: (input: string, option: any) => {
+        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+    },
   },
   {
     field: 'ctnOwner',
@@ -251,15 +314,56 @@ export const formSchema: FormSchema[] = [
   {
     field: 'ctnSource',
     label: '箱来源',
-    component: 'Input',
+    component: 'ApiSelect',
-
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('CM_CtnSource').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (v, obj) => {
+          formModel.defaultDebitName = obj?.label || ''
+        },
+      }
+    },
   },
   {
     field: 'ctnBizState',
     label: '箱业务状态',
-    component: 'InputNumber',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('CM_CtnBizState').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (v, obj) => {
+          formModel.defaultDebitName = obj?.label || ''
+        },
+      }
+    },
   },
   {
     field: 'billno',
@@ -277,8 +381,29 @@ export const formSchema: FormSchema[] = [
   {
     field: 'ctnState',
     label: '箱状态',
-    component: 'Input',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('CM_CtnState').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (v, obj) => {
+          formModel.defaultDebitName = obj?.label || ''
+        },
+      }
+    },
   },
   {
     field: 'ctnBreakState',
@@ -286,24 +411,52 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
   },
-
   {
     field: 'isHeavy',
     label: '空重箱',
-    component: 'Input',
+    component: 'Switch',
+    defaultValue: false,
     colProps: { span: 6 },
+    componentProps: {
+      checkedChildren: '是',
+      unCheckedChildren: '否',
+    },
   },
   {
     field: 'portid',
     label: '当前港口',
-    component: 'Input',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    required: false,
+    componentProps: ({}) => {
+      return {
+        option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+        labelField: 'portName',
+        valueField: 'id',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
   },
   {
     field: 'depot',
     label: '码头或场站',
-    component: 'Input',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    required: false,
+    componentProps: ({}) => {
+      return {
+        option: optionsStore.getOptionsByCode('GetYardClientList'),
+        labelField: 'shortName',
+        valueField: 'id',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
   },
   {
     field: 'vehicleName',
@@ -317,40 +470,74 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
   },
+  // {
+  //   field: 'customerName',
+  //   label: '业务委托单位',
+  //   component: 'Input',
+  //   colProps: { span: 6 },
+  // },
   {
-    field: 'customerName',
     label: '业务委托单位',
-    component: 'Input',
+    field: 'customerName',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 6 },
+    componentProps: ({}) => {
+      return {
+        option: optionsStore.getOptionsByCode('GetControllerClientList'),
+        labelField: 'shortName',
+        valueField: 'codeName',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
   },
   {
     field: 'etd',
     label: 'ETD',
-    component: 'Input',
+    component: 'DatePicker',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: {
+      showTime: true,
+      style: 'width:100%',
+    },
   },
   {
     field: 'eta',
     label: 'ETA',
-    component: 'Input',
+    component: 'DatePicker',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: {
+      showTime: true,
+      style: 'width:100%',
+    },
   },
   {
     field: 'changeTime',
     label: '状态时间',
-    component: 'Input',
+    component: 'DatePicker',
     colProps: { span: 6 },
+    defaultValue: '',
+    componentProps: {
+      showTime: true,
+      style: 'width:100%',
+    },
   },
   {
     field: 'ctnWeight',
     label: '箱皮重',
-    component: 'Input',
+    component: 'InputNumber',
     colProps: { span: 6 },
   },
   {
     field: 'ctnValue_Base',
     label: '箱初期成本',
-    component: 'Input',
+    component: 'InputNumber',
     colProps: { span: 6 },
   },
 ]

src/views/ContainerManagement/CurrentState/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
+    <BasicTable class="ds-table" @register="registerTable">
       <template #tableTitle>
         <!-- :disabled="checkPermissions('op:ctn:add')" -->
         <a-button type="link" @click="handleCreate">
@@ -148,12 +148,6 @@
     ApiChangeList(ApiData).then((res) => {
       console.log(res)
     })
-    // if (!checkPermissions('op:ctn:edit')) {
-    //   openModal(true, {
-    //     record,
-    //     isUpdate: true,
-    //   })
-    // }
   }
   function handleSuccess() {
     reload()

src/views/baseinfo/infoclient/columns.tsx

@@ -325,20 +325,7 @@ export const columns: BasicColumn[] = [
       return RText
     },
   },
-  {
+
-    title: '是否停用',
-    dataIndex: 'isStop',
-    sorter: true,
-    width: 150,
-    customRender: ({ text }) => {
-      if (text == true) {
-        return <Tag color="success">是</Tag>
-      } else if (text == false) {
-        return <Tag color="error">否</Tag>
-      }
-      return text
-    },
-  },
   {
     title: '冷藏费率',
     dataIndex: 'unitPrice',
@@ -406,7 +393,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '是否启用',
+    title: '是否可用',
     dataIndex: 'status',
     sorter: true,
     width: 80,
@@ -432,6 +419,20 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   // {
+  //   title: '是否停用',
+  //   dataIndex: 'isStop',
+  //   sorter: true,
+  //   width: 150,
+  //   customRender: ({ text }) => {
+  //     if (text == true) {
+  //       return <Tag color="success">是</Tag>
+  //     } else if (text == false) {
+  //       return <Tag color="error">否</Tag>
+  //     }
+  //     return text
+  //   },
+  // },
+  // {
   //   title: 'EDI代码2',
   //   dataIndex: 'ediCode2',
   //   sorter: true,
@@ -891,43 +892,21 @@ export const formSchema: FormSchema[] = [
       return !values.isOverdueDeduction
     },
   },
-  // {
+
-  //   field: 'status',
-  //   label: '是否可用',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: 0,
-  //   colProps: { span: 4 },
-  //   componentProps: {
-  //     options: [
-  //       { label: '禁用', value: 1 },
-  //       { label: '启用', value: 0 },
-  //     ],
-  //   },
-  // },
   {
     field: 'status',
     label: '是否可用',
     component: 'Switch',
     colProps: { span: 4 },
+    defaultValue: 0,
     componentProps: {
       checkedChildren: '是',
+      checkedValue: 0,
       unCheckedChildren: '否',
+      unCheckedValue: 1,
     },
   },
 
-  // {
-  //   field: 'isShared',
-  //   label: '是否共享',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: false,
-  //   colProps: { span: 4 },
-  //   componentProps: {
-  //     options: [
-  //       { label: '是', value: true },
-  //       { label: '否', value: false },
-  //     ],
-  //   },
-  // },
   {
     field: 'isShared',
     label: '是否共享',
@@ -1716,17 +1695,15 @@ export const CADformSchema: FormSchema[] = [
   },
   {
     field: 'status',
-    component: 'RadioButtonGroup',
     label: '状态',
-    componentProps: {
+    component: 'Switch',
-      options: [
+    colProps: { span: 6 },
-        { label: '启用', value: 0 },
-        { label: '禁用', value: 1 },
-      ],
-    },
     defaultValue: 0,
-    colProps: {
+    componentProps: {
-      span: 6,
+      checkedChildren: '启用',
+      checkedValue: 0,
+      unCheckedChildren: '禁用',
+      unCheckedValue: 1,
     },
   },
   {

src/views/baseinfo/infoclient/tabs3/index.vue

@@ -64,8 +64,6 @@
     useTable({
       title: '',
       api: async (p) => {
-        console.log(p, 111111111111111111111111)
-
         const res: API.DataResult = await ApiList(p)
         return new Promise((resolve) => {
           resolve({ data: [...res.data], total: res.count })

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -1,4 +1,3 @@
-
 import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { useOptionsStore } from '/@/store/modules/options'
@@ -7,14 +6,16 @@ import { getOptions } from '/@/hooks/dict'
 import { BookingLabelList } from './api'
 const optionsStore = useOptionsStore()
 import {
-  GetCarrierlist, GetClientLanesSelectList,GetClientPortSelectList
+  GetCarrierlist,
+  GetClientLanesSelectList,
+  GetClientPortSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
 // 字典
 import { getDictOption } from '/@/utils/dictUtil'
 import { GetCtnSelectList } from '/@/api/common'
 const FnblType = ref([])
 const FncargoId = ref([])
-getDictOption('bl_type').then(res => {
+getDictOption('bl_type').then((res) => {
   FncargoId.value = res
 })
 //合并单元格
@@ -22,18 +23,17 @@ const sharedOnCell = (_, index) => {
   if (_.isSPan > 1) {
     return {
       rowspan: _.isSPan,
-      colspan: 1
+      colspan: 1,
     }
   }
   if (_.isSPan == 0) {
     return {
       rowspan: _.isSPan,
-      colspan: 1
+      colspan: 1,
     }
   }
-};
+}
-const sharedOnCell1 = (_, index) => {
+const sharedOnCell1 = (_, index) => {}
-};
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'slotBookingNo',
@@ -51,17 +51,17 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '全部',
-          value: '0'
+          value: '0',
         },
         {
           label: '未取消',
-          value: '1'
+          value: '1',
         },
         {
           label: '已取消',
-          value: '2'
+          value: '2',
         },
-      ]
+      ],
     },
     colProps: { span: 4 },
   },
@@ -98,7 +98,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-    }
+    },
   },
   {
     field: 'eta',
@@ -109,7 +109,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-    }
+    },
   },
   {
     field: 'createdUserName',
@@ -146,13 +146,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '有',
-          value: '有'
+          value: '有',
         },
         {
           label: '无',
-          value: '无'
+          value: '无',
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -166,13 +166,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '有',
-          value: '有'
+          value: '有',
         },
         {
           label: '无',
-          value: '无'
+          value: '无',
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -186,13 +186,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '直达',
-          value: 'DIRECT_SHIP'
+          value: 'DIRECT_SHIP',
         },
         {
           label: '中转',
-          value: 'TRANSFER_SHIP'
+          value: 'TRANSFER_SHIP',
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -206,13 +206,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '合约订舱',
-          value: 'CONTRACT_ORDER'
+          value: 'CONTRACT_ORDER',
         },
         {
           label: 'SPOT订舱',
-          value: 'SPOT_ORDER'
+          value: 'SPOT_ORDER',
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -230,12 +230,12 @@ export const searchFormSchema: FormSchema[] = [
       return {
         api: GetCtnSelectList,
         labelField: 'ctnName',
-        mode:"multiple",
+        mode: 'multiple',
         immediate: false,
         valueField: 'ediCode',
-        resultField: 'data'
+        resultField: 'data',
       }
-    }
+    },
   },
   {
     field: 'labelIdArray',
@@ -246,18 +246,16 @@ export const searchFormSchema: FormSchema[] = [
       return {
         api: BookingLabelList,
         labelField: 'name',
-        mode:"multiple",
+        mode: 'multiple',
         immediate: false,
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
-        onChange: (e, obj) => {
+        onChange: (e, obj) => {},
-          
-        },
       }
-    }
+    },
   },
   {
     field: 'loadGuaranteeFlag',
@@ -270,13 +268,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '全部舱保',
-          value: 'FULL'
+          value: 'FULL',
         },
         {
           label: '部分舱保',
-          value: 'PART'
+          value: 'PART',
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -290,13 +288,13 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '拆票',
-          value: 1
+          value: 1,
         },
         {
           label: '合票',
-          value: 2
+          value: 2,
-        }
+        },
-      ]
+      ],
     },
   },
   {
@@ -400,55 +398,55 @@ export const columns: BasicColumn[] = [
     title: '客服',
     align: 'center',
     width: 100,
-    dataIndex: 'custservice'
+    dataIndex: 'custservice',
   },
   {
     title: '操作',
     align: 'center',
     width: 80,
-    dataIndex: 'op'
+    dataIndex: 'op',
   },
   {
     title: '单证',
     align: 'center',
     width: 80,
-    dataIndex: 'doc'
+    dataIndex: 'doc',
   },
   {
     title: '商务',
     align: 'center',
     width: 80,
-    dataIndex: 'business'
+    dataIndex: 'business',
   },
   {
     title: '销售',
     align: 'center',
     width: 100,
-    dataIndex: 'sale'
+    dataIndex: 'sale',
   },
   {
     title: 'SHIPPER',
     align: 'center',
     width: 100,
-    dataIndex: 'shipper'
+    dataIndex: 'shipper',
   },
   {
     title: '品名',
     align: 'center',
     width: 100,
-    dataIndex: 'goodsname'
+    dataIndex: 'goodsname',
   },
   {
     title: '卖价',
     align: 'center',
     width: 100,
-    dataIndex: 'sellingPrice'
+    dataIndex: 'sellingPrice',
   },
   {
     title: '销售日期',
     align: 'center',
     width: 100,
-    dataIndex: 'salE_TIME'
+    dataIndex: 'salE_TIME',
   },
   {
     title: '是否拆合票',
@@ -673,7 +671,7 @@ export const columns: BasicColumn[] = [
     width: 100,
     dataIndex: 'action',
     customCell: sharedOnCell,
-    fixed: 'right'
+    fixed: 'right',
   },
 ]
 
@@ -822,11 +820,9 @@ export const detialForm: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
-        onChange: (e, obj) => {
+        onChange: (e, obj) => {},
-          
-        },
       }
-    }
+    },
   },
   {
     field: 'transferPort1',
@@ -901,7 +897,7 @@ export const detialForm: FormSchema[] = [
           }
         },
       }
-    }
+    },
   },
   {
     field: 'issueType',
@@ -971,7 +967,7 @@ export const detialForm: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: ({formModel}) => {
+    componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -1011,7 +1007,7 @@ export const detialForm: FormSchema[] = [
     label: '卸货港',
     component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: ({formModel}) => {
+    componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -1147,5 +1143,4 @@ export const detialTimeForm: FormSchema[] = [
       format: 'YYYY-MM-DD HH:00',
     },
   },
-
 ]