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

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -1010,14 +1010,20 @@ export const detialForm: FormSchema[] = [
     },
   },
   {
-    label: '装货港名称',
-    field: 'portload',
+    label: '',
+    field: 'portLoadCode',
     component: 'Input',
     show: false,
   },
   {
+    label: '',
     field: 'portLoadId',
+    component: 'Input',
+    show: false,
+  },
+  {
     label: '装货港',
+    field: 'portLoad',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -1027,28 +1033,36 @@ export const detialForm: FormSchema[] = [
         api: GetClientPortSelectList,
         resultField: 'data',
         labelField: 'pinYinCode',
-        valueField: 'ediCode',
-        showName: 'ediCode',
+        valueField: 'portName',
+        showName: 'portName',
         immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.portload = obj.portName
+            formModel.portLoadId =  obj.id
+            formModel.portLoadCode = obj.ediCode
           }
-          if (!obj && !e) {
-            formModel.portload = ''
+          if (!e && !obj) {
+            formModel.portLoadId = null
+            formModel.portLoadCode = null
           }
-        },
+        }
       }
-    },
+    }
   },
   {
     label: '',
-    field: 'portDischarge',
+    field: 'portDischargeCode',
     component: 'Input',
     show: false,
   },
   {
+    label: '',
     field: 'portDischargeId',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'portDischarge',
     label: '卸货港',
     component: 'ApiSelect',
     colProps: { span: 4 },
@@ -1057,15 +1071,17 @@ export const detialForm: FormSchema[] = [
         api: GetClientPortSelectList,
         resultField: 'data',
         labelField: 'pinYinCode',
-        valueField: 'ediCode',
-        showName: 'ediCode',
+        showName: 'portName',
+        valueField: 'portName',
         immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.portdischarge = obj.portName
+            formModel.portDischargeId = obj.id
+            formModel.portDischargeCode = obj.ediCode
           }
           if (!obj && !e) {
-            formModel.portdischarge = ''
+            formModel.portDischargeId = ''
+            formModel.portDischargeCode = ''
           }
         },
       }

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -1710,6 +1710,13 @@ export const cargoInfoFormSchema2: FormSchema[] = [
     component: 'Input',
     show: false
   },
+  {
+    label: '',
+    field: 'isPreOrder',
+    component: 'Input',
+    defaultValue: false,
+    show: false
+  },
   {
     field: 'goodsName',
     label: '品名',
@@ -1717,6 +1724,9 @@ export const cargoInfoFormSchema2: FormSchema[] = [
     labelSlot: 'goodsName',
     required: false,
     dynamicDisabled: false,
+    show: ({ values }) => {
+      return !values.isPreOrder
+    },
     defaultValue: null,
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
@@ -1746,6 +1756,9 @@ export const cargoInfoFormSchema2: FormSchema[] = [
     label: 'HS编码',
     field: 'hsCode',
     component: 'Input',
+    show: ({ values }) => {
+      return !values.isPreOrder
+    },
     required: false,
     colProps: { span: 12 },
   },

src/views/operation/seaexport/detail/modules/cargoInfo.vue

@@ -400,6 +400,7 @@
     () => props.details,
     async (nval) => {
       if (Object.keys(nval).length) {
+        nval.isPreOrder = false
         setFieldsValue1({ marks: nval.marks, description: nval.description })
         setFieldsValue2(nval)
         setFieldsValue3(nval)
@@ -635,6 +636,7 @@
   }
   function preOrderInit(val:any) {
   setFieldsValue1({ marks: val.marks, description: val.description })
+  val.isPreOrder = true
   setFieldsValue2(val)
   setFieldsValue3(val)
   if (val.cargoId) cargoId.value = val.cargoId

src/views/operation/seaexport/detail/modules/preOrder.vue

@@ -366,7 +366,6 @@ function FngetPageESeaeEdi() {
             }
           })
           orderList.value = res.data
-          console.log(orderList.value);
         } else {
           //处理接口没数据的情况
           const propsDetail = JSON.parse(JSON.stringify(props.details))
@@ -419,7 +418,6 @@ function FngetPageESeaeEdi() {
             delete item.id
           })
           hotpreOrder.value.hotInstance.loadData(ctnList.value)
-          console.log(propsDetail,111111);
           const data = JSON.parse(JSON.stringify(propsDetail))
           data.mblno = propsDetail.mblno
           data.isPart = false
@@ -592,7 +590,6 @@ const sendLoading = ref(false)
 // 发送
 function sendOrderFun() {
   const SelectArr = [] as any
-  console.log(orderList.value)
   for (let i = 0; i < orderList.value.length; i++) {
     if (orderList.value[i].checked && orderList.value[i].id == 0) {
       createMessage.error('请先保存')
@@ -738,7 +735,7 @@ const columns = [
   },
   {
     title: '箱型',
-    width: 180,
+    width: 120,
     data: 'ctn',
     type: 'dropdown',
     source: async (query, process) => {
@@ -752,17 +749,17 @@ const columns = [
   },
   {
     title: '箱号',
-    width: 180,
+    width: 150,
     data: 'cntrNo',
   },
   {
     title: '封号',
-    width: 180,
+    width: 150,
     data: 'sealNo',
   },
   {
     title: '件数',
-    width: 180,
+    width: 100,
     data: 'pkgs',
   },
   {
@@ -782,14 +779,19 @@ const columns = [
   },
   {
     title: '重量',
-    width: 180,
+    width: 100,
     data: 'kgs',
   },
   {
     title: '尺码',
-    width: 180,
+    width: 100,
     data: 'cbm',
   },
+  {
+    title: 'hs编码',
+    width: 120,
+    data: 'hsCode',
+  },
 ]
 // 表格配置项
 const settings = {