箱管 调整

src/views/ContainerManagement/BuyCtn/columns.tsx

@@ -50,12 +50,6 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  {
-    title: '箱型箱量',
-    dataIndex: 'ctntotal',
-    sorter: true,
-    width: 200,
-  },
   {
     title: '已提箱',
     dataIndex: 'pickupCtntotal',
@@ -218,7 +212,7 @@ export const formSchema: FormSchema[] = [
     field: 'oldContainerOwner',
     label: '原箱主',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {

src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue

@@ -811,12 +811,12 @@
       data: 'dropoffDate',
     },
     {
-      title: '提箱港口',
+      title: '还箱港口',
       width: 120,
-      data: 'cntrno',
+      data: 'dropoffPort',
     },
     {
-      title: '还箱港口',
+      title: '提箱港口',
       width: 120,
       data: 'pickupPort',
     },

src/views/ContainerManagement/RentIn/columns.tsx

@@ -394,7 +394,7 @@ export const formSchema: FormSchema[] = [
     field: 'oldContainerOwner',
     label: '原箱主',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {

src/views/ContainerManagement/RentOut/columns.tsx

@@ -403,7 +403,7 @@ export const formSchema: FormSchema[] = [
     field: 'rentCustomerName',
     label: '租箱客户',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {

src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue

@@ -512,6 +512,16 @@
       width: 120,
       data: 'portCode',
     },
+    {
+      title: '提箱港口ID',
+      width: 120,
+      data: 'pickupPortid',
+    },
+    {
+      title: '提箱港口五字码',
+      width: 120,
+      data: 'pickupPortCode',
+    },
     {
       title: '当前状态ID',
       width: 120,
@@ -706,6 +716,21 @@
       format: '0',
       readOnly: true,
     },
+    {
+      title: '提箱港口',
+      width: 120,
+      data: 'pickupPort',
+      type: 'dropdown',
+      // 下拉框数据，可以同步或者异步返回(异步需要process返回)
+      source: async (query, process) => {
+        const res = PortDict.value.length ? PortDict.value : (await GetClientPortSelectList())?.data
+        if (!PortDict.value.length) PortDict.value = res
+        const dict = res.map((res) => {
+          return res.portName
+        })
+        process(dict)
+      },
+    },
     {
       title: '当前港口',
       width: 120,
@@ -720,6 +745,7 @@
         })
         process(dict)
       },
+      readOnly: true,
     },
     // {
     //   title: '场站',
@@ -746,7 +772,7 @@
     fixedColumnsLeft: 1,
     // 需要隐藏的列
     hiddenColumns: {
-      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       indicators: true,
     },
     // 控制回车移动
@@ -775,7 +801,7 @@
           list.value[changes[0][0]]['ctnall'] = dict?.ctnName
           list.value[changes[0][0]]['ctnCode'] = dict?.ediCode
         }
-        if (changes[0][1] === 'port') {
+        if (changes[0][1] === 'port' || changes[0][1] === 'pickupPort') {
           const res = PortDict.value.length
             ? PortDict.value
             : (await GetClientPortSelectList())?.data
@@ -790,6 +816,11 @@
             list.value[changes[0][0]]['portid'] = dict?.id
             list.value[changes[0][0]]['portCode'] = dict?.ediCode
           }
+          if (changes[0][1] === 'pickupPort') {
+            list.value[changes[0][0]]['pickupPort'] = dict?.portName
+            list.value[changes[0][0]]['pickupPortid'] = dict?.id
+            list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode
+          }
         }
         if (changes[0][1] === 'ctnSource') {
           const res = ctnsourceDict.value.length
@@ -944,7 +975,7 @@
     fixedColumnsLeft: 1,
     // 需要隐藏的列
     hiddenColumns: {
-      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       indicators: true,
     },
     // // 控制回车移动

src/views/ContainerManagement/SellCtn/columns.tsx

@@ -154,7 +154,7 @@ export const formSchema: FormSchema[] = [
     field: 'BuyContainerOwner',
     label: '购箱单位',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {