From 11a6a60b3697803fa5a72d7547a327f0f77fc528 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: Mon, 20 May 2024 17:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=93=81=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infoclient/TenantAuditStepModal.vue | 9 +- src/views/baseinfo/infoclient/abc.json | 144 ++- src/views/baseinfo/infoclient/api.ts | 2 + .../operation/seaexport/api/BookingLedger.js | 25 + src/views/operation/seaexport/asd.json | 20 + src/views/operation/seaexport/columns.tsx | 32 +- .../operation/seaexport/detail/index.vue | 259 ++--- .../seaexport/detail/modules/ediMore.vue | 25 +- .../seaexport/detail/modules/goodsTable.vue | 1035 ++++++++--------- 9 files changed, 787 insertions(+), 764 deletions(-) diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index c13f3f42..10c5e25e 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -175,14 +175,11 @@ res.data.ArrclientTag.push(item) } } else { - console.log(item) clientTag_o.value[item] = res.data.clientTag[item] } }) } - console.log(clientTag_o.value) - await setFieldsValue({ ...res.data, }) @@ -191,10 +188,8 @@ ...res.data, }) activeKey.value = '1' - console.log(res.data.id, 'res.data.clientId', 11111111111111111) - - getClientBankList({ - clientId: res.data.clientId, + await getClientBankList({ + clientId: res.data.clientTag.clientId, }).then((res) => { console.log(res) }) diff --git a/src/views/baseinfo/infoclient/abc.json b/src/views/baseinfo/infoclient/abc.json index f998309b..42202df4 100644 --- a/src/views/baseinfo/infoclient/abc.json +++ b/src/views/baseinfo/infoclient/abc.json @@ -1,30 +1,114 @@ - -The Level field is required -The TaxNo field is required -The CtnType field is required -The FAPCode field is required -The FARCode field is required -The OrderNo field is required -The RMBBank field is required -The StlDate field is required -The StlName field is required -The USDBank field is required -'客户代码' must not be empty -The AuditNote field is required -'客户简称' must not be empty -The BillRises1 field is required -The BillRises2 field is required -The RMBAccount field is required -The USDAccount field is required -The CarrierList field is required -The InvoiceBank field is required -The RMBOnlineNO field is required -The USDOnlineNO field is required -The RMBBillRises field is required -The USDBillRises field is required -The StlMiddleDate field is required -The InvoiceAddrTel field is required -The InvoiceStlDate field is required -The StlFirstHalfDate field is required -The CustomAttributes1 field is required -The CustomAttributes2 field is required. \ No newline at end of file +{ + "code": 0, + "multiCode": "Data_Query_Success", + "count": 0, + "message": "查询成功", + "succeeded": true, + "data": { + "id": "1771001857053954048", + "codeName": "1", + "shortName": "1", + "description": "1", + "name": "", + "enFullName": "1", + "address": "1", + "email": "1", + "web": "1", + "tel": "1", + "fax": "1", + "chief": "1", + "saleId": "1771068747235332096", + "op": "1771068747235332096", + "doc": "1771068747235332096", + "country": "1763023492099477504", + "province": "1", + "city": "1", + "blContent": "1", + "isStop": false, + "billRises1": "1", + "billRises2": "1", + "usdBillRises": "1", + "rmbBillRises": "1", + "rmbBank": "1", + "rmbAccount": "1", + "rmbOnlineNO": "1", + "usdBank": "1", + "usdAccount": "1", + "usdOnlineNO": "1", + "customAttributes1": "1", + "customAttributes2": "1", + "usdMaxAmountCredit": 0.0, + "rmbMaxAmountCredit": 0.0, + "maxAmountCredit": 0.0, + "stlName": "1", + "usdExchangeRate": 1.0, + "stlDate": "1", + "stlFirstHalfDate": "1", + "stlMiddleDate": "1", + "invoiceStlDate": "1", + "level": "1", + "qq": "1", + "msn": "1", + "farCode": "1", + "fapCode": "1", + "unitPrice": "1", + "registrationNo": "1", + "orderNo": "1", + "taxNo": "1", + "ediCode": "1", + "ediCode2": "1", + "ediCode3": "1", + "organizationCode": "1", + "pcorpName": "1", + "inspectionNo": "1", + "auditStatus": 1, + "auditTime": "1899-12-27 06:39:58", + "auditNote": "1", + "feeFRT": "1767427156532662272", + "rcvMode": 1, + "sourceId": "1763454583448932352", + "invoiceBank": "1", + "invoiceAddrTel": "1", + "saleOrgId": "1", + "commissionRate": 0.0, + "proportionRate": 0.0, + "commissionUserId": "0", + "carrierList": "1", + "ctnType": "1", + "customerService": "1771068747235332096", + "enShortName": "1", + "wmsFeeRateType": "2", + "status": 0, + "note": "", + "createTime": "2024-03-22 10:32:01", + "clientTag": { + "id": "1771001857276252160", + "clientId": "1771001857053954048", + "isSpecialApproval": false, + "isCarrier": true, + "isBooking": false, + "isYard": true, + "isTruck": true, + "isController": false, + "isCustom": false, + "isAgent": false, + "isAgentCn": true, + "isExpress": false, + "isAirLines": false, + "isShipper": false, + "isConsignee": false, + "isNotifyParty": false, + "isWareHouse": false, + "isWharf": false, + "isInsurer": false, + "isLeasing": false, + "isTradingAgency": false, + "isOther": false, + "others": "1", + "isShipAgency": false, + "isEnterprise": false, + "note": "", + "createTime": "2024-03-22 10:32:01" + } + } +} diff --git a/src/views/baseinfo/infoclient/api.ts b/src/views/baseinfo/infoclient/api.ts index 9b1e9135..9f0c3594 100644 --- a/src/views/baseinfo/infoclient/api.ts +++ b/src/views/baseinfo/infoclient/api.ts @@ -75,6 +75,8 @@ export function getClientStlModeSelectList(query) { // 客户银行信息 列表 (Auth) export function getClientBankList(parameter) { + console.log(parameter,111111111111111111111); + return request({ url: Api.GetClientBankList, method: 'post', diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index 95a21c9b..bfceda0a 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -49,6 +49,31 @@ export function GetOpCtnList(parameter) { data: parameter, }) } +// 集装箱多品名 服务 列表 (Auth) +export function GetOpCtnDetailList(parameter) { + return request({ + url: '/opApi/OpCtnDetail/GetOpCtnDetailList', + method: 'post', + data: parameter, + }) +} + +// 集装箱多品名 服务 编辑 (Auth) +export function SaveOpCtnDetail(parameter) { + return request({ + url: '/opApi/OpCtnDetail/SaveOpCtnDetail', + method: 'post', + data: parameter, + }) +} +// 集装箱多品名 服务 批量删除 (Auth) +export function BatchDelOpCtnDetail(parameter) { + return request({ + url: '/opApi/OpCtnDetail/BatchDelOpCtnDetail', + method: 'post', + data: parameter, + }) +} // 获取场站下拉列表 (Auth) export function GetYardClientList(parameter) { diff --git a/src/views/operation/seaexport/asd.json b/src/views/operation/seaexport/asd.json index e69de29b..ae4c0308 100644 --- a/src/views/operation/seaexport/asd.json +++ b/src/views/operation/seaexport/asd.json @@ -0,0 +1,20 @@ + +The Level field is required +The TaxNo field is required +The CtnType field is required +The RMBBank field is required +The StlDate field is required +The StlName field is required +The USDBank field is required +The AuditNote field is required +The RMBAccount field is required +The USDAccount field is required +The CarrierList field is required +The InvoiceBank field is required +The RMBOnlineNO field is required +The USDOnlineNO field is required +The StlMiddleDate field is required +The InvoiceStlDate field is required +The StlFirstHalfDate field is required +The CustomAttributes1 field is required +The CustomAttributes2 field is required. \ No newline at end of file diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index ca1acf02..def55fa2 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/src/views/operation/seaexport/columns.tsx @@ -1773,6 +1773,13 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ defaultValue: '', show: false, }, + { + label: '', + field: 'shipper', + component: 'Input', + defaultValue: '', + show: false, + }, { field: 'shipperId', component: 'SelectTextArea', @@ -1781,6 +1788,8 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ return { label: '发货人', onChange: (e) => { + console.log(e) + formModel[`shipper${e.type}`] = e.res }, } @@ -1793,6 +1802,13 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ defaultValue: '', show: false, }, + { + label: '', + field: 'consignee', + component: 'Input', + defaultValue: '', + show: false, + }, { field: 'consigneeId', component: 'SelectTextArea', @@ -1813,6 +1829,13 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ defaultValue: '', show: false, }, + { + label: '', + field: 'notifyParty', + component: 'Input', + defaultValue: '', + show: false, + }, { field: 'notifyPartyId', component: 'SelectTextArea', @@ -1977,9 +2000,16 @@ export const mailingInfoFormSchemaR: FormSchema[] = [ component: '', colProps: { span: 5 }, }, + // { + // label: '第三付款地', + // field: 'thirdPayAt', + // component: 'Input', + // defaultValue: '', + // show: false, + // }, { label: '中转港代码', - field: 'transportid', + field: 'transportCode', component: 'Select', required: false, dynamicDisabled: false, diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 2b49b788..6afec1ff 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -699,7 +699,6 @@ }) .then((res) => { if (route.query.isCopy) { - console.log(res, 123123123) res.data = { ...res.data, id: '', @@ -708,8 +707,6 @@ isFeeLocking: '', } } - console.log(res) - notification.destroy() setDeatilsFun(res, false) appStore.settopDown(false) @@ -781,7 +778,10 @@ ctnList.push({ label: e.name, value: e.value }) }) } - RefgoodsTable.value.getDataSource().forEach((e, index) => { + // list + console.log(RefgoodsTable.value.list, 'ZZZZZZZZZZZZZZZZZZZZZZ') + + RefgoodsTable.value.list.forEach((e, index) => { let ctnCode = '' ctnList.forEach((item: any) => { if (item.label == e.ctn) { @@ -791,47 +791,47 @@ ctnInfo.push({ id: e.id ? e.id : '', bsno: e.bsno ? e.bsno : '', - ctnNum: e.ctnNum, - cntrNo: e.cntrNo, - sealNo: e.sealNo, - kindPkgs: e.kindPkgs, - kgs: e.kgs, - size: e.size, - tareWeight: e.tareWeight, - weightType: e.weightType, - ctnCode: ctnCode, - ctn: e.ctn, - weightKGS: e.weightKGS, - weightDate: e.weightDate, - teu: e.teu, - ctnAll: e.ctnAll, - cbm: e.cbm, - pkgs: e.pkgs, - isTemp: e.isTemp, - goodsName: e.goodsName, - ctnStatus: e.ctnStatus, - weightATTN: e.weightATTN, - weightTel: e.weightTel, - weightSign: e.weightSign, - masterNo: e.masterNo, - trucker: e.trucker, - truckNo: e.truckNo, - truckFee: e.truckFee, - freeStorageDay: e.freeStorageDay, - storageDay: e.storageDay, - storagePrice: e.storagePrice, - storageFee: e.storageFee, - freeCtnDay: e.freeCtnDay, - ctnDay: e.ctnDay, - ctnPrice: e.ctnPrice, - ctnFee: e.ctnFee, - vgmAddr: e.vgmAddr, - vgmEmail: e.vgmEmail, - pickUpTime: e.pickUpTime, - actualArrivalPortTime: e.actualArrivalPortTime, + ctnNum: e.ctnNum | '', + cntrNo: e.cntrNo | '', + sealNo: e.sealNo | '', + kindPkgs: e.kindPkgs | '', + kgs: e.kgs | '', + size: e.size | '', + tareWeight: e.tareWeight | '', + weightType: e.weightType | '', + ctnCode: ctnCode | '', + ctn: e.ctn | '', + weightKGS: e.weightKGS | '', + weightDate: e.weightDate | '', + teu: e.teu | '', + ctnAll: e.ctnAll | '', + cbm: e.cbm | '', + pkgs: e.pkgs | '', + isTemp: e.isTemp | '', + goodsName: e.goodsName | '', + ctnStatus: e.ctnStatus | '', + weightATTN: e.weightATTN | '', + weightTel: e.weightTel | '', + weightSign: e.weightSign | '', + masterNo: e.masterNo | '', + trucker: e.trucker | '', + truckNo: e.truckNo | '', + truckFee: e.truckFee | '', + freeStorageDay: e.freeStorageDay | '', + storageDay: e.storageDay | '', + storagePrice: e.storagePrice | '', + storageFee: e.storageFee | '', + freeCtnDay: e.freeCtnDay | '', + ctnDay: e.ctnDay | '', + ctnPrice: e.ctnPrice | '', + ctnFee: e.ctnFee | '', + vgmAddr: e.vgmAddr | '', + vgmEmail: e.vgmEmail | '', + pickUpTime: e.pickUpTime | '', + actualArrivalPortTime: e.actualArrivalPortTime | '', }) }) - console.log(ctnInfo) + console.log(ctnInfo, 'AAAAAAAAAAAAAAAAAAAAAAAA') let _data = { ...initDetail, ...RefbasicInfo.value.getFieldsValue(), @@ -841,10 +841,15 @@ ...RefediMore.value.getFieldsValue(), ...RefmastetMore.value.getFieldsValue(), ctnInfo, + transportCode: RefmailingInfo.value.getFieldsValueR().transportCode | '', + BookingRemark: RefmailingInfo.value.getFieldsValueR().BookingRemark | '', + CloseDocRemark: RefmailingInfo.value.getFieldsValueR().CloseDocRemark | '', + thirdPayAt: '', } BookingOrderSave(_data) .then((res) => { - if (res.success) { + if (res.succeeded) { + notification.success({ message: '保存成功', duration: 3 }) } }) .catch((err) => { @@ -906,10 +911,10 @@ function updateSchema(data) { console.log(data, 'updateSchema') - // RefbasicInfo.value.updateSchema(data) + RefbasicInfo.value.updateSchema(data) // RefmailingInfo.value.updateSchemaL(data) RefmailingInfo.value.updateSchemaR(data) - // RefcargoInfo.value.updateSchema(data) + RefcargoInfo.value.updateSchema(data) // RefediMore.value.updateSchema(data) // RefmastetMore.value.updateSchema(data) } @@ -1449,7 +1454,7 @@ function handleRefshTable() { RefgoodsTable.value.loadingTable = true GetCtnListRefsh({ orderId: bookingDetails.value.id }).then((res) => { - if (res.success) { + if (res.succeeded) { bookingDetails.value.ctnInputs = res.data RefgoodsTable.value.init() } else { @@ -1756,7 +1761,7 @@ function removeOrderFun() { DeleteBookingOrder(bookingDetails.value.id) .then((res) => { - if (res.success) { + if (res.succeeded) { notification.error({ message: '删除成功', duration: 3 }) const $data = appStore.getneedSavePages delete $data[route.fullPath] @@ -1863,139 +1868,41 @@ } function setDeatilsFun(res, overSet = false) { - // if (!res.data.bookingEDIExt) { - // res.data.bookingEDIExt = bookingEDIExtData - // } - // if (res.data.cargoid == 'R') { - // cargoRules.value['goodsname'][0].required = true - // } - // if (res.data.cargoid != 'R') { - // cargoRules.value['goodsname'][0].required = false - // } - // if (!res.data.extendState) { - // isLockBooking.value = false - // } else { - // isLockBooking.value = res.data.extendState.isLockBooking - // } - - // if (res.data.ctnInputs.length > 0) { - // res.data.ctnInputs.map((item) => { - // if (item.weightype === '累加') { - // item.weighkgs = item.weighkgs - // ? item.weighkgs - // : calc(Number(item['kgs']), Number(item['tareweight']), '+') - // } - // item.pkgs = item.pkgs ? item.pkgs : '' - // item.kgs = item.kgs ? item.kgs : '' - // item.cbm = item.cbm ? item.cbm : '' - // item.tareweight = item.tareweight ? item.tareweight : '' - // item.weighkgs = item.weighkgs ? item.weighkgs : '' - // if (!item.cntrno) { - // item.cntrno = '' - // } - // if (!item.sealno) { - // item.sealno = '' - // } - // if (!item.weighdate) { - // item.weighdate = '' - // } - // }) - // } - // if (res.data.hbList.length > 0) { - // res.data.hbList.map((item, index) => { - // const newBookingEDIExt = { - // ...JSON.parse(JSON.stringify(bookingEDIExtData)), - // ...item.bookingEDIExt, - // } - // item = { - // ...JSON.parse(JSON.stringify(initDetail)), - // ...item, - // ...{ bookingEDIExt: newBookingEDIExt }, - // } - // if (item.ctnInputs.length > 0) { - // item.ctnInputs.map((citem) => { - // citem.pkgs = citem.pkgs ? citem.pkgs : '' - // citem.kgs = citem.kgs ? citem.kgs : '' - // citem.cbm = citem.cbm ? citem.cbm : '' - // citem.tareweight = citem.tareweight ? citem.tareweight : '' - // citem.weighkgs = citem.weighkgs ? citem.weighkgs : '' - // }) - // } - // res.data.hbList[index] = item - // }) - // } - // res.data.feeself = !!res.data.feeself let newData = res.data - // if (route.query.isCopy && !overSet) { - // delete res.data.id - // const copyData = { - // customername: res.data.customername, - // portloadid: res.data.portloadid, - // portload: res.data.portload, - // issueplace: res.data.issueplace, - // prepardat: res.data.prepardat, - // route: res.data.route, - // shippingMethod: res.data.shippingMethod, - // shipper: res.data.shipper, - // consignee: res.data.consignee, - // notifyparty: res.data.notifyparty, - // sale: res.data.sale, - // } - // newData = { ...initDetail, ...copyData } - // } - // const $BookingEDIExt = { - // ...bookingEDIExtData, - // ...res.data.bookingEDIExt, - // } bookingDetails.value = { ...bookingDetails.value, ...newData, - // ...{ bookingEDIExt: $BookingEDIExt }, } + // oldBookingDetails.value = bookingDetails.value + // sendMessageFY() + // if (route.query.isCopy && route.query.copyId) { + // const hisData = { + // bookingDetails: bookingDetails.value, + // excuteRules: excuteRules.value, + // excuteRulesType: excuteRulesType.value, + // isAdd: isAdd.value, + // tabActiveKey: tabActiveKey.value, + // mainOrderActiveKey: mainOrderActiveKey.value, + // // type: type.value, + // isCopy: isCopy.value, + // id: id.value, + // } - oldBookingDetails.value = bookingDetails.value - sendMessageFY() - if (route.query.isCopy && route.query.copyId) { - const hisData = { - bookingDetails: bookingDetails.value, - excuteRules: excuteRules.value, - excuteRulesType: excuteRulesType.value, - isAdd: isAdd.value, - tabActiveKey: tabActiveKey.value, - mainOrderActiveKey: mainOrderActiveKey.value, - // type: type.value, - isCopy: isCopy.value, - id: id.value, - } - // if (Object.keys(that.$refs).includes('RefsedOrder')) { - // const secActive = RefsedOrder.value.$data.editIndex - // hisData.secActive = secActive - // } - historyData.value[`copyMore-${id.value}`] = hisData - } - getFilter() - inPageLoading.value = false - setTimeout(() => { - setTimeout(() => { - checkSaveFun({ type: 'details', hasChange: false }) - }, 600) - detailsLoadOver.value = true - inChildLoading.value = false - notification.success({ message: '加载完成', duration: 3 }) - if (res.data.hbList && res.data.hbList.length > 0) { - Showtabs.value = true - } - // if (!hasHbList.value && bookingDetails.value.hbList.length > 0) { - // RefsedOrder.value.init(bookingDetails.value.hbList) - // hasHbList.value = true - // } else { - // RefsedOrder.value.init([]) - // } - // if (bookingDetails.value.ctnInputs.length > 0) { - // RefgoodsTable.value.init() - // } - }, 1200) - // that.$forceUpdate() + // historyData.value[`copyMore-${id.value}`] = hisData + // } + // getFilter() + // inPageLoading.value = false + // setTimeout(() => { + // setTimeout(() => { + // checkSaveFun({ type: 'details', hasChange: false }) + // }, 600) + // detailsLoadOver.value = true + // inChildLoading.value = false + // notification.success({ message: '加载完成', duration: 3 }) + // if (res.data.hbList && res.data.hbList.length > 0) { + // Showtabs.value = true + // } + // }, 1200) } function sendMessageFY() { const mapFrame = iframe.value @@ -2181,7 +2088,7 @@ bookingId: route.query.id, }) .then((res) => { - if (res.success) { + if (res.succeeded) { if (res.data.statuslog) { res.data.statuslog = res.data.statuslog.reverse() } diff --git a/src/views/operation/seaexport/detail/modules/ediMore.vue b/src/views/operation/seaexport/detail/modules/ediMore.vue index c73954b2..ecabb691 100644 --- a/src/views/operation/seaexport/detail/modules/ediMore.vue +++ b/src/views/operation/seaexport/detail/modules/ediMore.vue @@ -1,5 +1,6 @@