客户对账 调整

src/views/operation/CustomerReconciliation/columns.tsx

@@ -72,7 +72,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'rmbcr',
-    label: '应付RBM',
+    label: '应付RMB',
     component: 'InputNumber',
     colProps: { span: 4 },
     componentProps: () => {
@@ -167,7 +167,7 @@ export const columns: BasicColumn[] = [
   { title: '未收RMB', dataIndex: 'balrmbdr', align: 'left' },
   { title: '应收USD', dataIndex: 'usddr', align: 'left' },
   { title: '未收USD', dataIndex: 'balusddr', align: 'left' },
-  { title: '应付RBM', dataIndex: 'rmbcr', align: 'left' },
+  { title: '应付RMB', dataIndex: 'rmbcr', align: 'left' },
   { title: '未付RMB', dataIndex: 'balrmbcr', align: 'left' },
   { title: '应付USD', dataIndex: 'usdcr', align: 'left' },
   { title: '未付USD', dataIndex: 'balusdcr', align: 'left' },

src/views/operation/CustomerReconciliation/detail/index.vue

@@ -383,7 +383,7 @@
       dataIndex: 'rmbdr',
     },
     // {
-    //   title: '应付RBM',
+    //   title: '应付RMB',
     //   dataIndex: 'rmbcr',
     // },
     {

src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx

@@ -15,7 +15,7 @@ import {
   GetAgentCnClientList,
   GetClientPortSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger.js'
-import { GetClientListByCode } from '/@/api/common'
+import { GetClientListByCode, GetSupplierListByCode } from '/@/api/common'
 import { billTypeData } from '/@/views/operation/CustomerReconciliation/detail/detailColumns'
 export const TFData = [
   { value: true, label: '是' },
@@ -139,26 +139,26 @@ export const schemas: FormSchema[] = [
       options: TFData,
     },
   },
-  {
+  // {
-    label: '结算方式',
+  //   label: '结算方式',
-    field: 'stlName',
+  //   field: 'stlName',
-    component: 'ApiSelect',
+  //   component: 'ApiSelect',
-    required: false,
+  //   required: false,
-    dynamicDisabled: false,
+  //   dynamicDisabled: false,
-    colProps: { span: 4 },
+  //   colProps: { span: 4 },
-    componentProps: () => {
+  //   componentProps: () => {
-      return {
+  //     return {
-        api: GetClientStlModeSelectList,
+  //       api: GetClientStlModeSelectList,
-        immediate: true,
+  //       immediate: true,
-        labelField: 'stlName',
+  //       labelField: 'stlName',
-        valueField: 'id',
+  //       valueField: 'id',
-        resultField: 'data',
+  //       resultField: 'data',
-        filterOption: (input: string, option: any) => {
+  //       filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+  //       },
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
   {
     label: '币别',
     field: 'currency',
@@ -264,34 +264,35 @@ export const schemas: FormSchema[] = [
       }
     },
   },
+  // {
+  //   label: '国外代理',
+  //   field: 'forwarderId',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetSupplierListByCode,
+  //       params: { code: 'agent' },
+  //       labelField: 'shortName',
+  //       valueField: 'id',
+  //       resultField: 'data',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //       onChange: (e, obj) => {
+  //         if (e) {
+  //           formModel.forwarder = obj.label
+  //         } else {
+  //           formModel.forwarder = ''
+  //         }
+  //       },
+  //     }
+  //   },
+  // },
   {
-    label: '国外代理',
+    label: '卸货港',
-    field: 'forwarderId',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
-        valueField: 'id',
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          if (e) {
-            formModel.forwarder = obj.label
-          } else {
-            formModel.forwarder = ''
-          }
-        },
-      }
-    },
-  },
-  {
-    label: '港口(国外)',
     field: 'dischargePortId',
     component: 'ApiSelect',
     required: false,
@@ -320,7 +321,7 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    label: '港口(国内)',
+    label: '装货港',
     field: 'loadPortId',
     component: 'ApiSelect',
     required: false,

src/views/operation/CustomerReconciliation/index.vue

@@ -150,6 +150,7 @@
   import { formatParams } from '/@/hooks/web/common'
   import { useAppStore } from '/@/store/modules/app'
   const appStore = useAppStore()
+  const tbHeight = window.innerHeight - 350
   //   表格
   const [registerTable, { reload, getForm, getPaginationRef, getSelectRows, getRawDataSource }] =
     useTable({
@@ -225,6 +226,8 @@
       canResize: true,
       resizeHeightOffset: 90,
       immediate: true,
+      tableComponent: 'vxe',
+      autoHeight: tbHeight,
       actionColumn: {
         width: 80,
         title: '操作',
@@ -375,7 +378,7 @@
       width: 110,
     },
     {
-      title: '应付RBM',
+      title: '应付RMB',
       dataIndex: 'rmbcr',
       width: 110,
     },