From 70255ce7224584688e21aa71f180a9914379fddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Wed, 15 May 2024 09:06:07 +0800 Subject: [PATCH] 05/15 --- src/styles/index.scss | 10 + src/views/baseinfo/infoclient/columns.tsx | 417 +++++++++--------- src/views/operation/seaexport/columns.tsx | 117 ++++- src/views/operation/seaexport/detail/asd.json | 221 +--------- .../operation/seaexport/detail/index.vue | 2 +- .../seaexport/detail/modules/cargoInfo.vue | 13 +- src/views/system/user/columns.tsx | 39 +- src/views/system/user/index.vue | 5 + 8 files changed, 375 insertions(+), 449 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index 247e241e..a807a6bc 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -69,3 +69,13 @@ code { color: var(--el-color-primary); } +.ant-table-container::after{ + width: 1px !important; + box-shadow: none !important; + background: #F0F0F0; +} +.ant-table-container::before{ + width: 1px !important; + box-shadow: none !important; + background: #F0F0F0; +} \ No newline at end of file diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 3ebe2502..f946a60d 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -944,214 +944,215 @@ export const formSchema2: FormSchema[] = [ defaultValue: '', colProps: { span: 24 }, }, - { - field: 'taxNo', - label: '纳税人识别号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 24 }, - }, - { - field: 'rmbBank', - label: '人民币开户银行', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'rmbAccount', - label: '人民币账号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'rmbOnlineNO', - label: '人民币联机行号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'usdBank', - label: '美元开户银行', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'usdAccount', - label: '美元账号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'usdOnlineNO', - label: '美元联机行号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 8 }, - }, - { - field: 'rmbMaxAmountCredit', - label: '人民币信用最大金额', - required: true, - component: 'InputNumber', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'usdMaxAmountCredit', - label: '美元信用最大金额', - required: true, - component: 'InputNumber', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'maxAmountCredit', - label: '信用最大金额', - required: true, - component: 'InputNumber', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'stlDate', - label: '月结算时间', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'stlFirstHalfDate', - label: '上半月结算时间', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'stlMiddleDate', - label: '下半月结算时间', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'invoiceStlDate', - label: '票结结算时间', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'customAttributes1', - label: '自定义属性1', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'customAttributes2', - label: '自定义属性2', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'stlName', - label: '结算方式编码', - // required: true, - component: 'Select', - colProps: { span: 6 }, - labelWidth: 140, - defaultValue: '', - componentProps: { - options: ClientStlModeList, - allowClear: true, - showSearch: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - }, - }, - { - field: 'usdExchangeRate', - label: '美金汇率', - required: true, - component: 'InputNumber', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'level', - label: '等级', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'auditStatus', - label: '审批状态', - required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'auditTime', - label: '审批时间', - component: 'DatePicker', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'auditNote', - label: '审批意见', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'invoiceBank', - label: '发票银行', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'carrierList', - label: '运输公司列表', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, - { - field: 'ctnType', - label: '集装箱尺寸', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 6 }, - }, + + // { + // field: 'taxNo', + // label: '纳税人识别号', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 24 }, + // }, + // { + // field: 'rmbBank', + // label: '人民币开户银行', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'rmbAccount', + // label: '人民币账号', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'rmbOnlineNO', + // label: '人民币联机行号', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'usdBank', + // label: '美元开户银行', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'usdAccount', + // label: '美元账号', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'usdOnlineNO', + // label: '美元联机行号', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 8 }, + // }, + // { + // field: 'rmbMaxAmountCredit', + // label: '人民币信用最大金额', + // required: true, + // component: 'InputNumber', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'usdMaxAmountCredit', + // label: '美元信用最大金额', + // required: true, + // component: 'InputNumber', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'maxAmountCredit', + // label: '信用最大金额', + // required: true, + // component: 'InputNumber', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'stlDate', + // label: '月结算时间', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'stlFirstHalfDate', + // label: '上半月结算时间', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'stlMiddleDate', + // label: '下半月结算时间', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'invoiceStlDate', + // label: '票结结算时间', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'customAttributes1', + // label: '自定义属性1', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'customAttributes2', + // label: '自定义属性2', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'stlName', + // label: '结算方式编码', + // // required: true, + // component: 'Select', + // colProps: { span: 6 }, + // labelWidth: 140, + // defaultValue: '', + // componentProps: { + // options: ClientStlModeList, + // allowClear: true, + // showSearch: true, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // }, + // }, + // { + // field: 'usdExchangeRate', + // label: '美金汇率', + // required: true, + // component: 'InputNumber', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'level', + // label: '等级', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'auditStatus', + // label: '审批状态', + // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'auditTime', + // label: '审批时间', + // component: 'DatePicker', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'auditNote', + // label: '审批意见', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'invoiceBank', + // label: '发票银行', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'carrierList', + // label: '运输公司列表', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, + // { + // field: 'ctnType', + // label: '集装箱尺寸', + // // required: true, + // component: 'Input', + // defaultValue: '', + // colProps: { span: 6 }, + // }, ] export const form3columns: BasicColumn[] = [ diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index b0ef951f..b445b809 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/src/views/operation/seaexport/columns.tsx @@ -56,7 +56,9 @@ const Fncustomername: any = await GetControllerClientList() if (Fncustomername.succeeded) { ListData.customername = [] Fncustomername.data.forEach((e) => { - ListData.customername.push({ label: e.codeName, value: e.id, ...e }) + console.log(e) + + ListData.customername.push({ label: `${e.codeName}/${e.shortName}`, value: e.id, ...e }) }) } const FnsourceId: any = await GetClientSourceSelectList() @@ -112,7 +114,7 @@ const FnshipAgencyId: any = await GetShipAgencyClientList() if (FnshipAgencyId.succeeded) { ListData.shipAgencyId = [] FnshipAgencyId.data.forEach((e) => { - ListData.shipAgencyId.push({ label: e.shipAgencyIdName, value: e.id }) + ListData.shipAgencyId.push({ label: e.codeName, value: e.id }) }) } const FnsaleId: any = await GetSaleUserList() @@ -133,16 +135,14 @@ const Fnyard: any = await GetYardClientList() if (Fnyard.succeeded) { ListData.yard = [] Fnyard.data.forEach((e) => { - ListData.yard.push({ label: e.name, value: e.id }) + ListData.yard.push({ label: e.codeName, value: e.id }) }) } const Fncustomser: any = await GetCustomClientList() if (Fncustomser.succeeded) { ListData.customser = [] - console.log(Fncustomser.data, 'Fncustomser.data') - Fncustomser.data.forEach((e) => { - ListData.customser.push({ label: e.name, value: e.id }) + ListData.customser.push({ label: e.codeName, value: e.id }) }) } const FnagentId: any = await GetAgentClientList() @@ -307,6 +307,15 @@ export const columns: BasicColumn[] = [ title: '所属分部', dataIndex: 'saleOrgId', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleDeptId.forEach((item) => { + if (item.value == record.saleOrgId) { + RData = item.label + } + }) + return RData + }, }, { title: '委托单位', @@ -360,6 +369,15 @@ export const columns: BasicColumn[] = [ title: '订舱代理', dataIndex: 'forwarderId', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.forwarderId.forEach((item) => { + if (item.value == record.forwarderId) { + RData = item.label + } + }) + return RData + }, }, { dataIndex: 'contractNo', @@ -401,6 +419,15 @@ export const columns: BasicColumn[] = [ title: '船代', dataIndex: 'shipAgencyId', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.shipAgencyId.forEach((item) => { + if (item.value == record.shipAgencyId) { + RData = item.label + } + }) + return RData + }, }, { title: '揽货人', @@ -417,6 +444,15 @@ export const columns: BasicColumn[] = [ title: '操作', dataIndex: 'operatorId', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleId.forEach((item) => { + if (item.value == record.operatorId) { + RData = item.label + } + }) + return RData + }, }, { title: '单证', @@ -428,6 +464,15 @@ export const columns: BasicColumn[] = [ title: '所属部门', dataIndex: 'saleDeptId', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleDeptId.forEach((item) => { + if (item.value == record.saleDeptId) { + RData = item.label + } + }) + return RData + }, }, { dataIndex: 'czRemark', @@ -443,16 +488,43 @@ export const columns: BasicColumn[] = [ dataIndex: 'shipperId', title: '发货人', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleId.forEach((item) => { + if (item.value == record.shipperId) { + RData = item.label + } + }) + return RData + }, }, { dataIndex: 'consigneeId', title: '收货人', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleId.forEach((item) => { + if (item.value == record.consigneeId) { + RData = item.label + } + }) + return RData + }, }, { dataIndex: 'notifyPartyId', title: '通知人', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.saleId.forEach((item) => { + if (item.value == record.notifyPartyId) { + RData = item.label + } + }) + return RData + }, }, // { // title: '收货地代码', @@ -539,6 +611,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'agentId', title: '国外代理', width: 150, + customRender: ({ record }) => { + let RData = '' + ListData.agentId.forEach((item) => { + if (item.value == record.agentId) { + RData = item.label + } + }) + return RData + }, }, { dataIndex: 'agent', @@ -911,7 +992,17 @@ export const searchFormSchema: FormSchema[] = [ options: ListData.customername, showSearch: true, filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + let RData = false + + if (option.codeName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } else if (option.shortName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } else if (option.enShortName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } + + return RData }, }, }, @@ -4072,7 +4163,17 @@ export const BatchModificationFormSchema: FormSchema[] = [ options: ListData.customername, showSearch: true, filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + let RData = false + + if (option.codeName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } else if (option.shortName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } else if (option.enShortName.toLowerCase().indexOf(input.toLowerCase()) >= 0) { + RData = true + } + + return RData }, }, }, diff --git a/src/views/operation/seaexport/detail/asd.json b/src/views/operation/seaexport/detail/asd.json index 105810b5..d2921dcd 100644 --- a/src/views/operation/seaexport/detail/asd.json +++ b/src/views/operation/seaexport/detail/asd.json @@ -1,217 +1,4 @@ -{ - "code": 0, - "multiCode": "Data_Query_Success", - "count": 0, - "message": "查询成功", - "succeeded": true, - "data": { - "id": "1780891904372772864", - "parentId": "0", - "businessStatus": 0, - "billFeeStatus": 0, - "businessStatusName": "", - "billFeeStatusName": "", - "billFeeStatusTime": "1900-01-01 00:00:00", - "feeStatus": 0, - "isBusinessLocking": false, - "isFeeLocking": false, - "businessDate": "2024-04-25 14:53:09", - "accountDate": "1", - "mblno": "WebTest001", - "hblno": "WebTest001", - "customerNo": "WebTest001", - "transNo": "", - "customerId": "0", - "customerName": "", - "blType": "合票主票", - "shipperId": null, - "consigneeId": null, - "notifyPartyId": null, - "agentId": null, - "agent": "WebTest001", - "shipperContent": "", - "consigneeContent": "", - "notifyPartyContent": "", - "agentContent": "", - "yardId": "0", - "yard": "", - "vessel": "", - "vesselId": "0", - "voyno": "", - "etd": "2024-04-23 16:27:18", - "eta": "2024-04-23 16:27:25", - "atd": "2024-04-23 16:27:20", - "ata": null, - "closingDate": "2024-04-23 16:26:58", - "receiptPlace": "卡亚俄", - "receiptPlaceId": "1763399503139966976", - "loadPortId": "1763399503139966976", - "loadPort": "卡亚俄", - "dischargePortId": "1763399503139966976", - "dischargePort": "卡亚俄", - "deliveryPlaceId": "1763399503139966976", - "deliveryPlace": "卡亚俄", - "destinationId": "1763399503139966976", - "destination": "卡亚俄", - "noBill": "", - "copyNoBill": "", - "issueType": "", - "issueDate": "2024-04-23 16:27:40", - "issuePlaceId": "1763399503139966976", - "issuePlace": "卡亚俄", - "blIssueSatus": null, - "prepareAtId": "0", - "prepareAt": "", - "payableAt": "", - "service": "", - "marks": "WEBTEST001", - "cntrSealNo": "", - "noPkgs": "", - "description": "WEBTEST001", - "goodsName": "", - "grossWeight": "", - "measurement": "", - "pkgs": null, - "kindPkgs": "", - "kgs": null, - "cbm": null, - "totalNo": "", - "cntrNo": "", - "cntr1": 0, - "cntr2": 0, - "cntr3": 0, - "cntr4": 0, - "cntr5": 0, - "cntr6": 0, - "cntr7": 0, - "cntr8": 0, - "cntr9": 0, - "cntr10": 0, - "otherCntr": 0, - "teu": 0, - "cntrTotal": "", - "operatorId": "1770718980303097856", - "customerService": "0", - "foreignCustomerService": "0", - "laneId": "1763453587733745664", - "lane": "WebTest001", - "saleId": "1770718980303097856", - "sale": "WebTest001", - "carrierId": "0", - "carrier": "0", - "forwarderId": "0", - "forwarder": "", - "customserId": "0", - "customser": "0", - "truckerId": "0", - "trucker": "0", - "invoiceNo": "", - "cargoId": "", - "dangerClass": "", - "dangerNo": "", - "dangerPage": "", - "dangerLabel": "", - "reeferQuantity": "", - "temperatureUnit": "", - "temperatureSet": "", - "temperatureMin": "", - "temperatureMax": "", - "sourceId": "1763454583448932352", - "sourceDetailId": "1763468441559371776", - "customsNum": 0, - "contractNo": "WebTest001", - "bookingType": "操作录入", - "insuranceer": "", - "insuranceNo": "", - "insuranceAmount": null, - "isVoucher": false, - "voucherNo": "", - "remark": "", - "status1": false, - "status2": false, - "status3": false, - "status4": false, - "status5": false, - "isFumigation": false, - "isStorage": false, - "isLand": false, - "isCustoms": false, - "isInspection": false, - "isBooking": false, - "isAgent": false, - "isHBLNO": false, - "service9": false, - "service10": false, - "doc": "0", - "packingType": "", - "wareHouse": "", - "closeDocDate": "2024-04-23 16:27:00", - "intoPortDocDate": "1900-01-01 00:00:00", - "saleDeptId": "1760142686767157248", - "mblFrt": "", - "stlName": "", - "stlDate": "2024-04-23 15:58:08", - "orderType": "", - "orderNo": "", - "operatorCode": "", - "isOperator": false, - "operatorEmail": "", - "operatorTel": "", - "operatorFax": "", - "financialStaffCode": "true", - "isFinancialStaff": false, - "financialStaffEmail": "", - "financialStaffTel": "", - "financialStaffFax": "", - "sourceCode": "", - "linkMan": "", - "hsCode": "Webtest001", - "ediRemark": "", - "mailProjectId": "0", - "irCode": "", - "serviceContractNo": "WebTest001", - "applyNo": "", - "customNo": "", - "customDate": "2000-01-01 00:00:00", - "enterpriseId": "9999999", - "enterprise": "", - "inspectionNo": "", - "inspectionDate": "2000-01-01 00:00:00", - "tradeTerm": "", - "termDelivery": "", - "clearCustomDate": "1900-01-01 00:00:00", - "insperctService": "", - "shipAgencyId": "0", - "shipAgency": "0", - "humidity": "", - "masterShipperId": null, - "masterConsigneeId": null, - "masterNotifyPartyId": null, - "masterConsigneeContent": "", - "masterNotifyPartyContent": "", - "masterShipperContent": "", - "masterDescription": "", - "isContainerSoc": true, - "tranStatus": "", - "manifestStatus": "", - "isMoreGood": true, - "isPrintReceipt": false, - "vessel2N": "", - "vesselId2N": "0", - "voyno2N": "", - "deliveryDate": "1900-01-01 00:00:00", - "yardATTN": "", - "yardTel": "", - "saleOrgId": "0", - "transport": "", - "transRemark": "", - "preRecord": 0, - "note": "", - "createTime": "2024-04-18 17:31:32", - "closeDocRemark": null, - "bookingRemark": null, - "blIssueStatus": 0, - "billSubmitStatus": 0, - "isBookingYZ": null - } -} + +The req field is required +Error converting value {null} to type 'System.DateTime'. Path 'customDate', line 1, position 1438 +Error converting value {null} to type 'System.DateTime'. Path 'inspectionDate', line 1, position 2933. \ No newline at end of file diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index e528103a..1125568a 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -661,7 +661,7 @@ await RefbasicInfo.value .validateFields() .then((e) => { - console.log(e) + console.log(e, 1111111111111111) basicFrom = true basicObject = e }) diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue index d45ffd95..b216e90c 100644 --- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -1223,11 +1223,12 @@ ...getFieldsValue4(), } } - function validateFields() { - validateFields1() - validateFields2() - validateFields3() - validateFields4() + async function validateFields() { + console.log('validateFields') + await validateFields1() + await validateFields2() + await validateFields3() + await validateFields4() } function updateSchema(data) { updateSchema1(data) @@ -1237,9 +1238,9 @@ } defineExpose({ // RefcargoFrom, - validateFields, getFieldsValue, updateSchema, + validateFields, })