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

src/views/bookingcabin/CabinInventory/columns.tsx

@@ -54,27 +54,19 @@ export const searchFormSchema: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        immediate: false,
-        labelField: 'cnName',
-        valueField: 'id',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
+        onChange: (e, obj) => {
+          
+        }
+      }
     }
-    },
   },
   {
     field: 'carrier',
@@ -88,7 +80,7 @@ export const searchFormSchema: FormSchema[] = [
         api: GetCarrierlist,
         immediate: false,
         labelField: 'shortName',
-        valueField: 'shortName',
+        valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -140,27 +132,21 @@ export const searchFormSchema: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        immediate: false,
-        labelField: 'cnName',
-        valueField: 'id',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        allowClear: true,
+        showSearch: true,
+        labelField: 'pinYinCode',
+        showName: 'ediCode',
+        valueField: 'ediCode',
+        immediate: false,
+        onChange: (e, obj) => {
+        
+        }
+      }
     }
-    },
   },
   {
     field: 'PORTDISCHARGE_COUNTRY_CODE',
@@ -189,85 +175,85 @@ export const columns: BasicColumn[] = [
     title: '订舱抬头',
     align: 'center',
     width: 200,
-    dataIndex: 'bookinG_PARTY'
+    dataIndex: 'bookingParty'
   },
   {
     title: '合约号',
     align: 'center',
     width: 100,
-    dataIndex: 'contracT_NO'
+    dataIndex: 'contractNo'
   },
   {
     title: '订舱方式',
     align: 'center',
     width: 100,
-    dataIndex: 'bookinG_SLOT_TYPE_NAME'
+    dataIndex: 'bookingSlotTypeName'
   },
   {
     title: '总库存',
     align: 'center',
     width: 100,
-    dataIndex: 'totaL_ORDERS'
+    dataIndex: 'totalOrders'
   },
   {
     title: '剩余库存',
     align: 'center',
     width: 100,
-    dataIndex: 'remaiN_CTNS_NUM',
+    dataIndex: 'remainCtnsNum',
   },
   {
     title: '取消库存',
     align: 'center',
     width: 100,
-    dataIndex: 'canceL_NUM'
+    dataIndex: 'cancelNum'
   },
   {
     title: '收货地',
     align: 'center',
     width: 100,
-    dataIndex: 'placereceipt'
+    dataIndex: 'placeReceipt'
   },
   {
     title: '交货地',
     align: 'center',
     width: 100,
-    dataIndex: 'placedelivery'
+    dataIndex: 'placeDelivery'
   },
   {
     title: '装货港',
     align: 'center',
     width: 100,
-    dataIndex: 'portload'
+    dataIndex: 'portLoad'
   },
   {
     title: '卸货港',
     align: 'center',
     width: 100,
-    dataIndex: 'portdischarge'
+    dataIndex: 'portDischarge'
   },
   {
     title: '卸货港国家',
     align: 'center',
     width: 100,
-    dataIndex: 'portdischargE_COUNTRY'
+    dataIndex: 'portDischargeCountry'
   },
   {
     title: '航线',
     align: 'center',
     width: 100,
-    dataIndex: 'lanename'
+    dataIndex: 'laneName'
   },
   {
     title: '箱型箱量',
     align: 'center',
     width: 100,
-    dataIndex: 'ctN_STAT'
+    dataIndex: 'ctnStat'
   },
   {
     title: '剩余箱型箱量',
     align: 'center',
     width: 110,
-    dataIndex: 'remaiN_CTN_STAT'
+    dataIndex: 'remainCtnStat'
   },
   {
     title: 'ETD',

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -80,14 +80,44 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'PORTLOAD',
     label: '装货港',
-    component: 'Input',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetClientPortSelectList,
+        resultField: 'data',
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
+        onChange: (e, obj) => {
+          
+        }
+      }
+    }
   },
   {
     field: 'PORTDISCHARGE',
     label: '卸货港',
-    component: 'Input',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetClientPortSelectList,
+        resultField: 'data',
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
+        onChange: (e, obj) => {
+          
+        }
+      }
+    }
   },
   {
     field: 'etd',
@@ -126,8 +156,23 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'CARRIER',
     label: '船公司',
-    component: 'Input',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetCarrierlist,
+        immediate: false,
+        labelField: 'shortName',
+        valueField: 'id',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {},
+      }
+    },
   },
   {
     field: 'contractNo',
@@ -816,6 +861,7 @@ export const detialForm: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetCarrierlist,
+        immediate: false,
         labelField: 'shortName',
         valueField: 'id',
         resultField: 'data',
@@ -971,22 +1017,12 @@ export const detialForm: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        labelField: 'cnName',
-        valueField: 'ediCode',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
             formModel.portload = obj.portName
@@ -1011,22 +1047,12 @@ export const detialForm: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        labelField: 'cnName',
-        valueField: 'ediCode',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
             formModel.portdischarge = obj.portName

src/views/bookingcabin/ContractnoList/columns.tsx

@@ -83,23 +83,12 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: () => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        immediate: false,
-        labelField: 'cnName',
-        valueField: 'id',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
       }
     },
   },
@@ -162,6 +151,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetCarrierlist,
+        immediate: false,
         labelField: 'shortName',
         valueField: 'id',
         resultField: 'data',
@@ -198,24 +188,14 @@ export const formSchema: FormSchema[] = [
     field: 'podId',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    componentProps: ({formModel}) => {
+    componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            GetClientPortSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.ediCode) item.cnName = item.ediCode + '/' + item.cnName
-              })
-              resolve(res)
-            })
-          })
-        },
-        labelField: 'cnName',
-        valueField: 'id',
+        api: GetClientPortSelectList,
         resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        labelField: 'pinYinCode',
+        valueField: 'ediCode',
+        showName: 'ediCode',
+        immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
             formModel.podCode = obj.ediCode
@@ -225,9 +205,9 @@ export const formSchema: FormSchema[] = [
             formModel.podCode = ''
             formModel.podName = ''
           }
-        },
         }
-    },
+      }
+    }
   },
   {
     label: '航线港代码',

src/views/bookingcabin/cabinBooking/columns.tsx

@@ -236,9 +236,9 @@ export const searchFormSchema: FormSchema[] = [
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
       }
-      }
-    }
+    },
   },
   {
     label: '　',

src/views/bookingcabin/generation/index.vue

@@ -53,6 +53,7 @@ import { BasicModal, useModalInner } from '/@/components/Modal'
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { getAvailableCtnsBySlot, CreateBookingOrder, GetEnableProjectDictTreeList,CreateBookingAndSlot } from './api'
 import { useMessage } from '/@/hooks/web/useMessage'
+import { getOptions } from '/@/hooks/dict'
 const { createMessage } = useMessage()
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { GetControllerClientList, GetSaleUserList, GetCustomerServiceList, GetVouchingClerkList } from '/@/views/operation/seaexport/api/BookingLedger'
@@ -127,16 +128,17 @@ const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
+        allowClear: true,
+        showSearch: true,
         api: () => {
           return new Promise((resolve) => {
-            GetControllerClientList().then((res) => {
-              resolve(res)
-            })
+            const arr = getOptions('controller')
+            resolve(arr)
           })
         },
-        immediate: false,
-        labelField: 'shortName',
+        labelField: 'name',
         valueField: 'id',
+        showName: 'shortName',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0