箱管调整 自动对账应付

src/views/ContainerManagement/BaseInfo/index.vue

@@ -34,6 +34,8 @@
           if (item.FieldName == 'cntrno') {
             item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.FieldValue = item.FieldValue.replace(/\n/g, ',')
+            item.FieldValue = item.FieldValue.replace(/\t/g, ',')
+            item.FieldValue = item.FieldValue.replace(/,+/g, ',')
             item.ConditionalType = 15
           }
           if (item.FieldName == 'CM_ctnCode') {

src/views/ContainerManagement/CurrentState/index.vue

@@ -94,6 +94,8 @@
           if (item.FieldName == 'cntrno') {
             item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.FieldValue = item.FieldValue.replace(/\n/g, ',')
+            item.FieldValue = item.FieldValue.replace(/\t/g, ',')
+            item.FieldValue = item.FieldValue.replace(/,+/g, ',')
             item.ConditionalType = 15
           }
           if (item.FieldName == 'CM_ctnCode') {

src/views/ContainerManagement/OfflineAudit/index.vue

@@ -97,6 +97,8 @@
         if (item.FieldName == 'cntrnoall') {
           item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
           item.FieldValue = item.FieldValue.replace(/\n/g, ',')
+          item.FieldValue = item.FieldValue.replace(/\t/g, ',')
+          item.FieldValue = item.FieldValue.replace(/,+/g, ',')
           item.ConditionalType = 15
         }
       })

src/views/ContainerManagement/StateChange/index.vue

@@ -45,6 +45,8 @@
           if (item.FieldName == 'cntrno') {
             item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.FieldValue = item.FieldValue.replace(/\n/g, ',')
+            item.FieldValue = item.FieldValue.replace(/\t/g, ',')
+            item.FieldValue = item.FieldValue.replace(/,+/g, ',')
             item.ConditionalType = 15
           }
         })

src/views/ContainerManagement/dsxxcl/index.vue

@@ -94,7 +94,8 @@
           if (item.FieldName == 'cntrno') {
             item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',')
             item.FieldValue = item.FieldValue.replace(/\n/g, ',')
-
+            item.FieldValue = item.FieldValue.replace(/\t/g, ',')
+            item.FieldValue = item.FieldValue.replace(/,+/g, ',')
             item.ConditionalType = 15
           }
         })

src/views/operation/CheckBillAuto/columns.tsx

@@ -1,14 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
-import { GetAllClientList } from '/@/api/common'
+import { GetSupplierListByCode } from '/@/api/common'
 import { GetOperatorUserList } from '/@/views/operation/seaexport/api/BookingLedger'
-let customerData: any = []
-const res11: API.DataResult = await GetAllClientList()
-if (res11.succeeded) {
-  customerData = []
-  res11.data.forEach((e) => {
-    customerData.push({ label: e.shortName, value: e.id })
-  })
-}
 export const columns: BasicColumn[] = [
   {
     title: '自动对账编号',
@@ -209,289 +201,6 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
 ]
-export const formSchema: FormSchema[] = [
-  {
-    label: '',
-    field: 'id',
-    component: 'Input',
-    defaultValue: '',
-    show: false,
-  },
-  {
-    label: '基础信息',
-    field: '基础信息',
-    component: 'Divider',
-    colProps: { lg: 24, md: 24 },
-  },
-  {
-    field: 'carrierId',
-    label: '',
-    component: 'Input',
-    colProps: { span: 4 },
-    show: false,
-  },
-  {
-    field: 'carrierName',
-    label: '船公司名称',
-    component: 'Input',
-    colProps: { span: 4 },
-    show: false,
-  },
-  {
-    label: '船公司',
-    field: 'carrierCode',
-    component: 'ApiSelect',
-    required: false,
-    defaultValue: null,
-    dynamicDisabled: false,
-    colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetCarrierSelectList,
-        labelField: 'pinYinCode',
-        showName: 'ediCode',
-        valueField: 'ediCode',
-        resultField: 'data',
-        immediate: false,
-        onChange: (e, obj) => {
-          if (e && obj) {
-            console.log(e, obj)
-            formModel.carrierId = obj.id
-            formModel.carrierName = obj.cnShortName
-          }
-          if (!e && !obj) {
-            formModel.carrierId = ''
-            formModel.carrierName = ''
-          }
-        },
-      }
-    },
-  },
-  {
-    field: 'ediName',
-    label: 'EDI类型名称',
-    component: 'Input',
-    colProps: { span: 4 },
-    show: false,
-  },
-  {
-    field: 'ediTypeCode',
-    label: 'EDI类型代码',
-    component: 'Select',
-    colProps: { span: 4 },
-    required: true,
-    componentProps: ({ formModel }) => {
-      if (ediTypeDict.value.length == 0) {
-        getDictOption('edi_type').then((res) => {
-          ediTypeDict.value = res
-        })
-      }
-      return {
-        options: ediTypeDict.value,
-        allowClear: true,
-        showSearch: true,
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          if (obj) {
-            formModel.ediTypeCode = obj.value
-            formModel.ediName = obj.label
-          }
-        },
-      }
-    },
-  },
-
-  {
-    field: 'serverIp',
-    label: '服务器IP',
-    component: 'Input',
-    colProps: { span: 4 },
-    required: true,
-  },
-  {
-    field: 'folderName',
-    label: '文件夹',
-    component: 'Input',
-    colProps: { span: 4 },
-    required: true,
-  },
-  {
-    field: 'userName',
-    label: '用户名',
-    component: 'Input',
-    colProps: { span: 4 },
-    required: true,
-  },
-  {
-    field: 'password',
-    label: '密码',
-    component: 'Input',
-    colProps: { span: 4 },
-    required: true,
-  },
-  {
-    field: 'sendType',
-    label: '发送类型',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'ftpModeActive',
-    label: 'FTP主动模式',
-    component: 'RadioButtonGroup',
-    defaultValue: true,
-    colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '是', value: true },
-        { label: '否', value: false },
-      ],
-    },
-  },
-  {
-    label: '发送方',
-    field: '发送方',
-    component: 'Divider',
-    colProps: { lg: 24, md: 24 },
-  },
-  {
-    field: 'sendName',
-    label: '名称',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendCode',
-    label: '代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendAttn',
-    label: '联系人',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendTel',
-    label: '电话',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendEmail',
-    label: '邮箱',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendCompanyCode',
-    label: '公司代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendSubCompanyCode',
-    label: '部门代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'aliasSendCode',
-    label: '别名代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'sendShipperCode',
-    label: '发货方代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    label: '接收方',
-    field: '接收方',
-    component: 'Divider',
-    colProps: { lg: 24, md: 24 },
-  },
-  {
-    field: 'receiveCode',
-    label: '代码',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'receiveEmail',
-    label: '邮箱',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'receiveSiEmail',
-    label: 'SI邮箱',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'receiveOp',
-    label: '操作',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'receiveSale',
-    label: '销售',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'receiveDept',
-    label: '部门',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    label: '收发通',
-    field: '收发通',
-    component: 'Divider',
-    colProps: { lg: 24, md: 24 },
-  },
-  {
-    field: 'shipperTel',
-    label: '发件人电话',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'consigneeTel',
-    label: '收货人电话',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-  {
-    field: 'notifypartyTel',
-    label: '通知人电话',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
-
-  // {
-  //   field: 'status',
-  //   label: '是否可用',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: 0,
-  //   colProps: { span: 4 },
-  //   componentProps: {
-  //     options: [
-  //       { label: '禁用', value: 1 },
-  //       { label: '启用', value: 0 },
-  //     ],
-  //   },
-  // },
-]
-
 let businessTypeData = [
   { label: '全部', value: 0 },
   { label: '海运出口', value: 1 },
@@ -532,7 +241,7 @@ export const schemas: FormSchema[] = [
     label: '结算人',
     component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
+    componentProps: (a) => {
       return {
         api: GetOperatorUserList,
         labelField: 'pinYinCode',
@@ -543,6 +252,7 @@ export const schemas: FormSchema[] = [
         immediate: false,
         resultField: 'data',
         onChange: (e, obj) => {
+          const { formModel } = a
           if (e && obj) {
             formModel.settlerId = obj.id
             formModel.settlerName = obj.pinYinCode
@@ -563,8 +273,10 @@ export const schemas: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
+      showTime: false,
       allowClear: true,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
     },
   },
   {
@@ -575,8 +287,10 @@ export const schemas: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
+      showTime: false,
       allowClear: true,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
     },
   },
   {
@@ -593,8 +307,10 @@ export const schemas: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
+      showTime: false,
       allowClear: true,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
     },
   },
   {
@@ -645,12 +361,6 @@ export const schemas: FormSchema[] = [
       },
     },
   },
-  {
-    field: 'note',
-    label: '备注',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
   // -------------
   {
     field: 'billName',
@@ -685,21 +395,23 @@ export const schemas: FormSchema[] = [
     field: 'customerName',
     label: '对账客户',
     component: 'ApiSelect',
-    colProps: { span: 4 },
+    colProps: { span: 8 },
-    componentProps: ({ formModel }) => {
+    componentProps: (a) => {
       return {
-        api: GetAllClientList,
+        api: GetSupplierListByCode,
-        labelField: 'shortName',
+        params: { code: '' },
-        valueField: 'id',
+        labelField: 'pinYinCode',
         showName: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
         allowClear: true,
         showSearch: true,
         immediate: false,
-        resultField: 'data',
         onChange: (e, obj) => {
+          const { formModel } = a
           if (e && obj) {
             formModel.customerId = obj.id
-            formModel.customerName = obj.pinYinCode
+            formModel.customerName = obj.shortName
           }
           if (!e && !obj) {
             formModel.customerId = ''
@@ -717,8 +429,10 @@ export const schemas: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
+      showTime: false,
       allowClear: true,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
     },
   },
   {
@@ -872,35 +586,41 @@ export const Editschemas: FormSchema[] = [
     },
   },
   {
-    label: '对账客户Nmae',
+    label: '对账客户',
-    field: 'customerName',
+    field: 'customerId',
     component: 'Input',
     show: false,
   },
   {
+    field: 'customerName',
     label: '对账客户',
-    field: 'customerId',
     component: 'DEdit',
-    required: false,
+    colProps: { span: 8 },
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 4 },
     componentProps: (a) => {
       return {
-        options: customerData,
+        api: GetSupplierListByCode,
+        params: { code: '' },
+        labelField: 'pinYinCode',
+        showName: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
         allowClear: true,
         showSearch: true,
-        filterOption: (input: string, option: any) => {
+        immediate: false,
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
         onChange: (e, obj) => {
+          const { formModel } = a
           if (e && obj) {
-            a.formModel.customerName = obj.label
+            formModel.customerId = obj.id
+            formModel.customerName = obj.shortName
+          }
+          if (!e && !obj) {
+            formModel.customerId = ''
+            formModel.customerName = ''
           }
         },
         onEdit: () => {
-          const { formActionType } = e
+          const { formActionType } = a
-          formActionType ? formActionType.linkageForm(e) : null
+          formActionType ? formActionType.linkageForm(a) : null
         },
       }
     },
@@ -913,17 +633,19 @@ export const Editschemas: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: {
+    componentProps: (e) => {
-      options: billTypeData,
+      return {
-      allowClear: true,
+        options: billTypeData,
-      showSearch: true,
+        allowClear: true,
-      filterOption: (input: string, option: any) => {
+        showSearch: true,
-        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        filterOption: (input: string, option: any) => {
-      },
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      onEdit: () => {
+        },
-        const { formActionType } = e
+        onEdit: () => {
-        formActionType ? formActionType.linkageForm(e) : null
+          const { formActionType } = e
-      },
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
     },
   },
   {
@@ -931,7 +653,7 @@ export const Editschemas: FormSchema[] = [
     field: 'settlerId',
     component: 'DEdit',
     show: false,
-    componentProps: ({ formModel }) => {
+    componentProps: (e) => {
       return {
         onEdit: () => {
           const { formActionType } = e
@@ -945,7 +667,7 @@ export const Editschemas: FormSchema[] = [
     label: '结算人',
     component: 'DEdit',
     colProps: { span: 4 },
-    componentProps: (e) => {
+    componentProps: (a) => {
       return {
         api: GetOperatorUserList,
         labelField: 'pinYinCode',
@@ -956,7 +678,7 @@ export const Editschemas: FormSchema[] = [
         immediate: false,
         resultField: 'data',
         onChange: (e, obj) => {
-          const { formModel } = e
+          const { formModel } = a
           if (e && obj) {
             formModel.settlerId = obj.id
             formModel.settlerName = obj.pinYinCode
@@ -967,8 +689,8 @@ export const Editschemas: FormSchema[] = [
           }
         },
         onEdit: () => {
-          const { formActionType } = e
+          const { formActionType } = a
-          formActionType ? formActionType.linkageForm(e) : null
+          formActionType ? formActionType.linkageForm(a) : null
         },
       }
     },

src/views/operation/CheckBillAuto/detail.vue

@@ -60,6 +60,7 @@
       <div class="bottomBox">
         <div class="bottonLeftBox">
           <BasicTable class="ds-table" @register="registerTable">
+            对账明细
             <template #tableTitle>
               <TableButton :show="{ add: false, del: null }" @del="DelDetail"> </TableButton>
             </template>